diff --git a/src/assets/css/numrule.css b/src/assets/css/numrule.css new file mode 100644 index 0000000..b621d10 --- /dev/null +++ b/src/assets/css/numrule.css @@ -0,0 +1,5 @@ +.numrule input { + appearance: textField!important; + -webkit-appearance: textField!important; + background-color: aliceblue; +} \ No newline at end of file diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 322c205..2bf4c4d 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -210,25 +210,26 @@ export default { }, 10000) }else { if(process.env.NODE_ENV === "development") { - // this.intervalJudge = setInterval(() => { - // const data = { - // id: parseInt(sessionStorage.getItem('assessmentId')), - // token: parseInt(sessionStorage.getItem('token')) - // } - // checkTest(data).then(data => { - // const { data: { data: { status } } } = data - // if(status !== 1) { - // this.popContainer = true - // clearInterval(this.intervalJudge) - // this.$message({ - // showClose: true, - // message: '考核已结束', - // type: 'success' - // }); - // }else { - // } - // }) - // }, 4000) + this.intervalJudge = setInterval(() => { + const data = { + id: parseInt(sessionStorage.getItem('assessmentId')), + token: parseInt(sessionStorage.getItem('token')) + } + checkTest(data).then(data => { + const { data: { data: { status } } } = data + if(status !== 1) { + this.popContainer = true + clearInterval(this.intervalJudge) + this.Submit(false) + this.$message({ + showClose: true, + message: '考试已结束，试卷已自动提交', + type: 'success' + }); + }else { + } + }) + }, 4000) }else { this.intervalJudge = setInterval(() => { const data = { @@ -240,9 +241,11 @@ export default { if(status !== 1) { this.popContainer = true clearInterval(this.intervalJudge) + // 提交 + this.Submit(false) this.$message({ showClose: true, - message: '考核已结束', + message: '考试已结束，试卷已自动提交', type: 'success' }); }else { @@ -517,11 +520,11 @@ export default { //测试服 // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId //本地 - // if(process.env.NODE_ENV === "development") { - // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId - // }else { - // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId - // } + if(process.env.NODE_ENV === "development") { + location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId + }else { + location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId + } // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId } }).catch((error)=>{ @@ -538,20 +541,25 @@ export default { this.startCountFn(); }, //提交 - Submit() { - this.$confirm("此操作将视为结束考试, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - center: true - }).then(() => { - this.sureSubmit() - }).catch(() => { - this.$message({ - type: "info", - message: "已取消提交" + Submit(judge=true) { + if(judge) { + this.$confirm("此操作将视为结束考试, 是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + center: true + }).then(() => { + this.sureSubmit() + }).catch(() => { + this.$message({ + type: "info", + message: "已取消提交" + }); }); - }); + }else { + this.sureSubmit() + } + }, sureSubmit(){ this.actEndTime = new Date().getTime(); diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue index e69de29..963c545 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue @@ -0,0 +1,157 @@ +// 存款 + + + + + \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash/index.vue b/src/pages/manage/list/ImportantCash/controlCash/index.vue index da062b2..d6f3af6 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/index.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/index.vue @@ -18,7 +18,7 @@ - + + + \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue new file mode 100644 index 0000000..95b6364 --- /dev/null +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue new file mode 100644 index 0000000..c8607d4 --- /dev/null +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue @@ -0,0 +1,162 @@ +// 存款 + + + + + \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue new file mode 100644 index 0000000..95b6364 --- /dev/null +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/pages/manage/list/ImportantCash/controlCash2/index.vue b/src/pages/manage/list/ImportantCash/controlCash2/index.vue new file mode 100644 index 0000000..a33b2a4 --- /dev/null +++ b/src/pages/manage/list/ImportantCash/controlCash2/index.vue @@ -0,0 +1,194 @@ + + + + + + diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue new file mode 100644 index 0000000..4250b4a --- /dev/null +++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue @@ -0,0 +1,172 @@ + + + + + + diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index 4fb10a2..32962a5 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -10,63 +10,17 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - 提交 + 提交
- - -
-
提交
-
-
-

本业务需要授权

-
-
- 取 消 - 确 定 -
- @@ -77,27 +31,20 @@ export default { components:{}, data() { return { - text:'存款',/* 顶部文字 */ + text:'网点日终轧帐',/* 顶部文字 */ form:{ - - }, - second:[// 二级卡数组 - - ], - options:[], - visible:false, - options:[], - activeIndex:'1', - second:[// 二级卡数组 - - ], + username: '', + password: '' + } } }, created() { }, methods: { - + submitIt() { + console.log('test') + } } }; @@ -130,44 +77,15 @@ export default { .body{ margin-top: 50px; overflow: auto; - .idCard{ - border-radius: 5px; - background: #CFDDFF; - text-align: center; - height: 40px; - line-height: 40px; - font-size: 18px; - color: #6191FF; - } - .add{ - position: relative; - &::after{ - content: ''; - display: block; - position: absolute; - right: 3%; - top: -4%; - border: 1px dashed #CFDDFF; - width: 88%; - height: 268px; - } - .addBtn{ - position: absolute; - left: 0; - top: 50%; - transform: translate(50%,-50%); - font-size: 22px; - } - } } .submitBtn{ - position: relative; + position: absolute; width: 300px; font-size: 18px; height: 68px; margin-top: 50px; border-radius: 10px; - bottom: 10px; + bottom: 100px; left: 50%; transform: translate(-50%,-0%); } @@ -197,4 +115,8 @@ export default { } } } + + /deep/.el-input input { + width: 420px; + } diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue index 4fb10a2..bce3726 100644 --- a/src/pages/manage/list/dayEnd/tellerCash.vue +++ b/src/pages/manage/list/dayEnd/tellerCash.vue @@ -6,91 +6,94 @@

{{text}}

-
- - - - - - - - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + 提交
- -
-
提交
-
-
-

本业务需要授权

-
-
- 取 消 - 确 定 -
- + \ No newline at end of file diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/manage/navbar/index.vue b/src/pages/manage/navbar/index.vue index e0e7cbb..b824080 100644 --- a/src/pages/manage/navbar/index.vue +++ b/src/pages/manage/navbar/index.vue @@ -116,6 +116,20 @@ export default { icon: 'menu-icon icon-index', index: '/index/list3', title: '账户服务', + children:[ + { + index:"/counter/list/manage/servicesAccount-passwordChange", + title:'密码修改' + }, + { + index:"/counter/list/manage/servicesAccount-passwordLost", + title:'密码挂失' + }, + { + index:"/counter/list/manage/servicesAccount-relieveLost", + title:'挂失解挂' + } + ] }, { icon: 'menu-icon icon-index', @@ -134,15 +148,15 @@ export default { children:[ { index:"/counter/list/manage/importantCash-cashRecipients", - title:'柜员现金扎帐' + title:'现金管理' }, { - index:"/counter/list/manage/dayEnd-tellerCertificate", - title:'柜员凭证扎帐' + index:"/counter/list/manage/importantCash-cashRecipients2", + title:'凭证管理' }, { - index:"/counter/list/manage/dayEnd-branchDayEnd", - title:'网点日终扎帐' + index:"/counter/list/manage/importantCash-cashRecipients3", + title:'支票管理' } ] }, diff --git a/src/router/modules/counter.js b/src/router/modules/counter.js index ed0e733..1d726eb 100644 --- a/src/router/modules/counter.js +++ b/src/router/modules/counter.js @@ -96,6 +96,24 @@ export default { }, // 账户服务 + { + name: `${pre}servicesPasswordChange`, + path: `servicesAccount-passwordChange`, + component: () => import('@/pages/manage/list/servicesAccount/passwordChange.vue'), + meta: { title: '密码修改' }, + }, + { + name: `${pre}servicesPasswordLost`, + path: `servicesAccount-passwordLost`, + component: () => import('@/pages/manage/list/servicesAccount/passwordLost.vue'), + meta: { title: '密码挂失' }, + }, + { + name: `${pre}servicesRelieveLost`, + path: `servicesAccount-relieveLost`, + component: () => import('@/pages/manage/list/servicesAccount/relieveLost.vue'), + meta: { title: '挂失解挂' }, + }, // 同城交互 @@ -109,15 +127,15 @@ export default { meta: { title: '重空现金管理' }, }, { - name: `${pre}importantCash`, - path: `importantCash-cashRecipients`, - component: () => import('@/pages/manage/list/ImportantCash/controlCash/index.vue'), + name: `${pre}importantCash2`, + path: `importantCash-cashRecipients2`, + component: () => import('@/pages/manage/list/ImportantCash/controlCash2/index.vue'), meta: { title: '重空现金凭证管理' }, }, { - name: `${pre}importantCash`, - path: `importantCash-cashRecipients`, - component: () => import('@/pages/manage/list/ImportantCash/controlCash/index.vue'), + name: `${pre}importantCash3`, + path: `importantCash-cashRecipients3`, + component: () => import('@/pages/manage/list/ImportantCash/controlCash3/index.vue'), meta: { title: '重空现金支票管理' }, }, // 日终管理