diff --git a/src/App.vue b/src/App.vue index b6aa9b9ea..d0911b674 100644 --- a/src/App.vue +++ b/src/App.vue @@ -225,109 +225,109 @@ export default { } }, mounted() { - this.setTheme(this.getTheme) - //实现对字符码的截获，keypress中屏蔽了这些功能按键 - document.onkeypress = this.banBackSpace - //对功能按键的获取 - document.onkeydown = this.banBackSpace - this.visibilitychangeFn = (e) => { //这个方法是监测浏览器窗口发生变化的时候执行 - // 切换到当前页面 - if (document.hidden == false) { - const userInfoModifyTime = this.userInfoModifyTime - const userInfoModifyTimeInLocalStorage = localStorage.getItem('userInfoModifyTime') - - // 用户未切换 不执行任何操作 - if (userInfoModifyTime === userInfoModifyTimeInLocalStorage) { - return - } - - if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') { - this.$store.dispatch('syncStorageData') - - const currentPage = this.$route.name - if (currentPage === 'Login') { - return - } - this.currentMinute = 3 - this.loading && this.loading.close() - this.loading = this.$loading({ - lock: true, - // text: 'Loading', - // spinner: 'el-icon-loading', - // background: 'rgba(0, 0, 0, 0.7)' - }); - this.messageForLogin && this.messageForLogin.close() - this.messageForLogin = this.$message({ - message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`, - type: 'warning' - }) - - - this.intervalForLogin = setInterval(() => { - if (this.currentMinute === 0) { - clearInterval(this.intervalForLogin) - this.loading.close() - - this.$router.push('/login') - console.log('切换到登录页面', currentPage) - } - this.currentMinute-- - this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面` - }, 0) - - } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') { - this.$store.dispatch('syncStorageData') - - console.log('用户信息已更改，同步数据') - - this.currentMinute = 3 - - this.loading && this.loading.close() - this.loading = this.$loading({ - lock: true, - // text: 'Loading', - // spinner: 'el-icon-loading', - // background: 'rgba(0, 0, 0, 0.7)' - }); - - this.messageForHome && this.messageForHome.close() - this.messageForHome = this.$message({ - message: `用户已切换，${this.currentMinute}秒后将跳转到用户首页`, - type: 'warning' - }) - this.intervalForHome = setInterval(() => { - if (this.currentMinute === 0) { - clearInterval(this.intervalForHome) - this.loading.close() - - this.$router.push({ - path: '/redirect', - query: '/home2' - }) - } - this.currentMinute-- - this.messageForHome.message = `用户已切换，${this.currentMinute}秒后将跳转到用户首页` - }, 1000) - - // const route = this.$router.resolve('/home') - // this.$router.push({ - // path: '/redirect', - // query: '/home' - // }) - // location.reload(); - } - - } - } - document.addEventListener('visibilitychange', this.visibilitychangeFn); + // this.setTheme(this.getTheme) + // //实现对字符码的截获，keypress中屏蔽了这些功能按键 + // document.onkeypress = this.banBackSpace + // //对功能按键的获取 + // document.onkeydown = this.banBackSpace + // this.visibilitychangeFn = (e) => { //这个方法是监测浏览器窗口发生变化的时候执行 + // // 切换到当前页面 + // if (document.hidden == false) { + // const userInfoModifyTime = this.userInfoModifyTime + // const userInfoModifyTimeInLocalStorage = localStorage.getItem('userInfoModifyTime') + // + // // 用户未切换 不执行任何操作 + // if (userInfoModifyTime === userInfoModifyTimeInLocalStorage) { + // return + // } + // + // if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') { + // this.$store.dispatch('syncStorageData') + // + // const currentPage = this.$route.name + // if (currentPage === 'Login') { + // return + // } + // this.currentMinute = 3 + // this.loading && this.loading.close() + // this.loading = this.$loading({ + // lock: true, + // // text: 'Loading', + // // spinner: 'el-icon-loading', + // // background: 'rgba(0, 0, 0, 0.7)' + // }); + // this.messageForLogin && this.messageForLogin.close() + // this.messageForLogin = this.$message({ + // message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`, + // type: 'warning' + // }) + // + // + // this.intervalForLogin = setInterval(() => { + // if (this.currentMinute === 0) { + // clearInterval(this.intervalForLogin) + // this.loading.close() + // + // this.$router.push('/login') + // console.log('切换到登录页面', currentPage) + // } + // this.currentMinute-- + // this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面` + // }, 0) + // + // } else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') { + // this.$store.dispatch('syncStorageData') + // + // console.log('用户信息已更改，同步数据') + // + // this.currentMinute = 3 + // + // this.loading && this.loading.close() + // this.loading = this.$loading({ + // lock: true, + // // text: 'Loading', + // // spinner: 'el-icon-loading', + // // background: 'rgba(0, 0, 0, 0.7)' + // }); + // + // this.messageForHome && this.messageForHome.close() + // this.messageForHome = this.$message({ + // message: `用户已切换，${this.currentMinute}秒后将跳转到用户首页`, + // type: 'warning' + // }) + // this.intervalForHome = setInterval(() => { + // if (this.currentMinute === 0) { + // clearInterval(this.intervalForHome) + // this.loading.close() + // + // this.$router.push({ + // path: '/redirect', + // query: '/home2' + // }) + // } + // this.currentMinute-- + // this.messageForHome.message = `用户已切换，${this.currentMinute}秒后将跳转到用户首页` + // }, 1000) + // + // // const route = this.$router.resolve('/home') + // // this.$router.push({ + // // path: '/redirect', + // // query: '/home' + // // }) + // // location.reload(); + // } + // + // } + // } + // document.addEventListener('visibilitychange', this.visibilitychangeFn); }, beforeDestroy() { - document.onkeypress = null - document.onkeydown = null - document.removeEventListener('visibilitychange', this.visibilitychangeFn) - clearInterval(this.intervalForLogin) - clearInterval(this.intervalForHome) + // document.onkeypress = null + // document.onkeydown = null + // document.removeEventListener('visibilitychange', this.visibilitychangeFn) + // clearInterval(this.intervalForLogin) + // clearInterval(this.intervalForHome) } } diff --git a/src/main.js b/src/main.js index 803cf9d99..aeddc2492 100644 --- a/src/main.js +++ b/src/main.js @@ -71,6 +71,10 @@ router.beforeEach(function (to, from, next) { return } + if(webLoginType === 'idm' && toName === 'Login'){ + window.location.href = ssoLoginUrlDev + } + let fromName = from.name let token = store.state.token let path = to.path; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b6cdc0327..d32931ae4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -970,7 +970,7 @@ .bzjdStep3 { .itemsTextBox { min-height: 300px; - max-height: 500px; + max-height: 835px; overflow: auto; line-height: 20px; /deep/ td { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index 4d0be0df1..d8f886a62 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -316,7 +316,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue index cff1b8221..d24a98a89 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue @@ -898,7 +898,7 @@ export default { form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.LXDList,this.FSDList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index b4a745973..a622f08c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -178,6 +178,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; return { @@ -307,7 +309,7 @@ export default { handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { if(val === '1'){ - if (this.bpnId === undefined) { + if (this.bpnId === undefined || this.bpnId === "") { this.getFsFile() } } @@ -385,7 +387,6 @@ export default { this.choiceZRRList(type, title, id) }, formCancel (form, list1,list2,list3,list4,list5,list6,list7) { - console.log(form) this.qbfsForm = form this.FBGBUSSFileList = list1 this.LSBBBUSSFileList = list2 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 299341e8c..8069a53e0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -178,6 +178,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; const validateFsOnlineFile = async (rule, value, callback) => { @@ -192,6 +194,8 @@ export default { callback(new Error('请先在线编辑,再提交流程！')) } } + }else { + callback(new Error('请先在线编辑,再提交流程！')) } }; return { @@ -316,7 +320,7 @@ export default { this.qbfsForm.QCRBUSS=nameList; this.formKey++ } - if(data !== undefined && data && data.length > 0){ + if(data && data.length > 0){ const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") this.qbfsForm.QCDWID = institutionIdList diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index c5dc2f3ab..43cdc71f1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -617,15 +617,15 @@ export default { }, //流程提交 handleSubmit() { - if(this.$route.query.prcNum === undefined){ + if(this.$route.query.prcNum === undefined || this.$route.query.type == '2'){ this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.$refs['roleForm'].validate((valid) => { if (valid) { - if (this.$route.query.type === 2) { + if (this.$route.query.type == '2') { this.isSubmit = true this.standardSearch.commentText = this.commentText - var json = Object.assign(this.standardSearch, this.roleForm) + var json = Object.assign( this.roleForm,this.standardSearch) this.$http.post('lawss/activiti/completeTaskNew', { taskIds: this.$route.query.taskIds, userId : this.$store.getters.userInfo.userId, @@ -647,7 +647,7 @@ export default { } else { this.isSubmit = true this.standardSearch.commentText = this.commentText - var json = Object.assign(this.standardSearch, this.roleForm) + var json = Object.assign(this.roleForm, this.standardSearch) this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index ed432e8f9..dd221e1d9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -133,7 +133,7 @@