diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 1c54b7d..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 396f5e4..bb63e7c 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -232,17 +232,39 @@ export default { } }, mounted() { - this.projectPermissions = this.projectId ? 1 : 0 - if(this.projectId){ - this.getQueryProject(); - }else{ - this.getProjects(); - } - this.assessmentId && this.projectId && this.checkVer() - this.codeId && this.codeIds.push(this.codeId) - this.getData() + let token = this.getQueryVariable('token') + let cid = this.getQueryVariable('cid') + let systemId = this.getQueryVariable('systemId') + if (token != null){ + sessionStorage.setItem('token', token) + sessionStorage.setItem('cid', cid) + sessionStorage.setItem('systemId', systemId) + } + let tokens = sessionStorage.getItem('token') + if(tokens){ + this.projectPermissions = this.projectId ? 1 : 0 + if(this.projectId){ + this.getQueryProject(); + }else{ + this.getProjects(); + } + this.assessmentId && this.projectId && this.checkVer() + this.codeId && this.codeIds.push(this.codeId) + this.getData() + } }, methods: { + getQueryVariable(name) { + var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') + if( window.location.href.split('?')[1]){ + var r = window.location.href.split('?')[1].match(reg) + if (r != null){ + return (r[2]) + }else{ + return null + } + } + }, //获取项目列表 getData(){ let params = { @@ -250,14 +272,15 @@ export default { } getProjectBySystemId(params).then((data)=>{ if(data.status == 200){ - this.topicList = data.data.projects + this.topicList = data.data.projects; + this.projectId = this.topicList[0].projectId; + this.selectProject() } }).catch((error)=>{ }) }, //选择好题目 selectProject(){ - // for () let params = { projectId:this.projectId, } @@ -267,6 +290,7 @@ export default { this.projectName = data.data.projectName this.projectManage = data.data.projectManage; this.requires = data.data.projectJudgmentVos; + location.href = 'http://39.108.250.202/banksystem/#/index/list' } }).catch((error)=>{ }) @@ -317,11 +341,13 @@ export default { } submit(params).then((data)=>{ if(data.status == 200){ - let datas= data.data.retMap.scoreInfo - console.log() - let formList = [] - sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) + let datas= data.data.retMap.scoreInfo; + let formList = [] + sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) + sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formList)) + sessionStorage.setItem('formDataAccountPassword', '') let list = this.requires + this.grade = data.data.totalScore for (var j=0;j{ }) this.getClearTime(); - - //提交代码与判分点进行判断 - // this.$post(this.api.Submit, { - // // projectPermissions: 0, - // createTime: this.startTime, - // endTime: this.stopTime, - // projectId: this.projectId, - // projectPermissions: this.projectPermissions, - // // assessmentId: 1, - // assessmentId: this.assessmentId ? this.assessmentId : '', - // codeIds: this.codeIds, - // judgmentPointsIds: this.judgmentPointsIds, - // // studentId: 54, - // studentId: this.studentId, - // record: { - // courseId: 1, - // // courseId: this.courseId, - // projectId: this.projectId, - // createTime: this.startTime, - // endTime: this.stopTime, - // startTime: this.entryTime - // } - // }).then(res => { - // this.isSubmit = true - // // newmain.$emit("isSubmit", this.isSubmit); - // this.tableData = res.message - // //计算总分 - // var s = 0; - // this.tableData.forEach(element => { - // this.test = element.score; - // s += this.test; - // this.grade = s; - // }); - // }) - // .catch(err => {}); }).catch(() => { this.$message({ type: "info", @@ -433,8 +424,6 @@ export default { } }); }, - - // 倒计时 timeFormat(param) { return param < 10 ? "0" + param : param; diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index cc1250f..cbca4e3 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -2,7 +2,7 @@
- + @@ -225,14 +225,14 @@ export default { manageVisible: false, // 显示系统录入 checkList: [],// 物品栏选中 elseBoxCheck:[],/* 所有其他可从物品栏拖拽物品进入的弹框 */ - //身份证扫描仪//审核资料//验钞机 + //身份证扫描仪//审核资料//验钞机//选择重要空白凭证 auditGoodsShelf:[ {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, ], - //系统录入//选择重要空白凭证 + //系统录入 //选择普通空白凭证 systemInputGoodsShelf:[ {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, @@ -240,7 +240,7 @@ export default { {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, ], - //打印资料 //选择普通空白凭证 //客户签字 + //打印资料 //客户签字 //印章盒 printoutGoodsShelf:[ {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, @@ -249,6 +249,12 @@ export default { {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, {name:'存款凭条', src:require('@/assets/img/goods/ckpt.png'), id:17}, ], + //钱箱 + cashboxGoodsShelf:[ + {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, + {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, + ], // 总盒子里面的东西 goodsShelfTotalData:[], // goods:[/* 物品栏物品 */ @@ -445,30 +451,30 @@ export default { }); }, methods: { - getQueryVariable(name) { - var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') - if( window.location.href.split('?')[1]){ - var r = window.location.href.split('?')[1].match(reg) - if (r != null){ - return (r[2]) - }else{ - return null - } - } - }, + // getQueryVariable(name) { + // var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') + // if( window.location.href.split('?')[1]){ + // var r = window.location.href.split('?')[1].match(reg) + // if (r != null){ + // return (r[2]) + // }else{ + // return null + // } + // } + // }, toggleGoods() { this.showGoods = !this.showGoods; }, showData(type,nbm) {/* 展示弹窗-type为弹窗标题文字 */ this.nbm = nbm - if(type == '重要空白凭证箱'){ - this.goodsShelfTotalData = this.systemInputGoodsShelf - }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料'){ + if(type == '普通凭证箱' || type == '系统'){ + this.goodsShelfTotalData = this.systemInputGoodsShelf + }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱'){ this.goodsShelfTotalData = this.auditGoodsShelf - }else if(type == '普通凭证箱' || type == '打印机'){ - this.goodsShelfTotalData = this.printoutGoodsShelf - }else if(type == '普通凭证箱'){ + }else if(type == '打印机' || type == '客户签字' || type == '印章盒'){ this.goodsShelfTotalData = this.printoutGoodsShelf + }else if(type == '钱箱'){ + this.goodsShelfTotalData = this.cashboxGoodsShelf } this.$store.commit('system/changePop',{show:true,text:type}) }, @@ -580,8 +586,6 @@ export default { formDataAccountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('formDataAccountPassword', formDataAccountPassword) } - - } } this.toggleGoods() @@ -606,71 +610,77 @@ export default { }else{ if (this.receptionList.length >0){ this.$message.success(`${this.popText}操作成功！`) - if (this.nbm == 1){ - let formList = [] - let ruleReqs = sessionStorage.getItem('ruleReqs') - if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []} - for (var i=0;i