diff --git a/src/components/case/index.vue b/src/components/case/index.vue index ddb92d9..7469343 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -187,99 +187,69 @@ export default { } }, created() { - const { query: { token, assessmentId } } = this.$route - sessionStorage.setItem('assessmentId', assessmentId) - sessionStorage.setItem('token', token) - if(process.env.NODE_ENV === "development") { - this.intervalJudge = setInterval(() => { - const data = { - id: parseInt(sessionStorage.getItem('assessmentId')), - token: parseInt(sessionStorage.getItem('token')) - } - // 获取教师端最新项目 - let params = { + const test = this.getQueryVariable('test') + if(test) { + // 获取老师新加的项目 + setInterval(() => { + let params = { "systemId":sessionStorage.getItem('systemId'), "cId":sessionStorage.getItem('cid'), "permissions":0, - } - getProjectBySystemId(params).then((data)=>{ - if(data.status == 200){ - //获取当前时间 - if(data.data.projects.length !== this.topicList.length) { + } + getProjectBySystemId(params).then((data)=>{ + if(data.status == 200){ + if(this.topicList.length !== data.data.projects.length) { this.topicList = data.data.projects - this.selectProjects({ - projectId: this.topicList[0].projectId - }) - - if(this.topicList.length > 0){ - this.gotuQueryVariable() + if(!this.topicList.some(item => item.projectId===this.projectId)) { + this.selectProjects({projectId: this.topicList[0].projectId}) } - this.getQueryCaches() } - } - }).catch((error)=>{ - }) - - - 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 { } + }).catch((error)=>{ }) - }, 4000) + }, 10000) }else { - this.intervalJudge = setInterval(() => { - const data = { - id: parseInt(sessionStorage.getItem('assessmentId')), - token: parseInt(sessionStorage.getItem('token')) - } - // 获取教师端最新项目 - let params = { - "systemId":sessionStorage.getItem('systemId'), - "cId":sessionStorage.getItem('cid'), - "permissions":0, - } - getProjectBySystemId(params).then((data)=>{ - if(data.status == 200){ - //获取当前时间 - if(data.data.projects.length !== this.topicList.length) { - this.topicList = data.data.projects - this.selectProjects({ - projectId: this.topicList[0].projectId - }) - - if(this.topicList.length > 0){ - this.gotuQueryVariable() - } - this.getQueryCaches() + 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) + }else { + this.intervalJudge = setInterval(() => { + const data = { + id: parseInt(sessionStorage.getItem('assessmentId')), + token: parseInt(sessionStorage.getItem('token')) } - }).catch((error)=>{ - }) - - - 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) + 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) + } } }, watch: { @@ -357,18 +327,34 @@ export default { this.classId = classId } let tokens = sessionStorage.getItem('token') - if(tokens || token){ - this.projectPermissions = this.projectId ? 1 : 0 - this.assessmentId && this.projectId && this.checkVer() - this.codeId && this.codeIds.push(this.codeId) - if (projectId !=null && projectId != '' && projectId !='null'){ - let params = { - "projectId":projectId, - } - this.selectProjects(params) - }else{ - this.getData() + if(this.getQueryVariable('test')) { + let params = { + "systemId":sessionStorage.getItem('systemId'), + "cId":sessionStorage.getItem('cid'), + "permissions":0, + } + getProjectBySystemId(params).then((data)=>{ + if(data.status == 200){ + //获取当前时间 + this.topicList = data.data.projects + this.selectProjects({projectId: this.topicList[0].projectId}) } + }).catch((error)=>{ + }) + }else { + if(tokens || token){ + this.projectPermissions = this.projectId ? 1 : 0 + this.assessmentId && this.projectId && this.checkVer() + this.codeId && this.codeIds.push(this.codeId) + if (projectId !=null && projectId != '' && projectId !='null'){ + let params = { + "projectId":projectId, + } + this.selectProjects(params) + }else{ + this.getData() + } + } } }, methods: { @@ -401,7 +387,6 @@ export default { this.topicList.push(data.data.projects[i]) } } - if(this.topicList.length > 0){ this.selectProjects({ projectId: this.topicList[0].projectId @@ -528,10 +513,15 @@ export default { this.projectManage = data.data.projectManage; this.requires = data.data.projectJudgmentVos; //线上 - location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId + //测试服 // 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 + // } // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId } }).catch((error)=>{ diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index ae00245..dd7f360 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -574,7 +574,9 @@ export default { }) } this.showGoods = true - this.$store.commit('system/changePop',{show:true,text:type}) + if(type !== '系统') { + this.$store.commit('system/changePop',{show:true,text:type}) + } }, checkData(item) {/* 选中物品 */ let _this = this @@ -647,7 +649,6 @@ export default { this.checkList = []; }, showManage() {// 展示系统管理 - this.showGoods = true this.manageVisible = true; this.$router.push('/counter/list/manage/consumerClient'); }, diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index e69de29..4fb10a2 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -0,0 +1,200 @@ +// 存款 + + + + + diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue index e69de29..4fb10a2 100644 --- a/src/pages/manage/list/dayEnd/tellerCash.vue +++ b/src/pages/manage/list/dayEnd/tellerCash.vue @@ -0,0 +1,200 @@ +// 存款 + + + + + diff --git a/src/pages/manage/list/dayEnd/tellerCertificate.vue b/src/pages/manage/list/dayEnd/tellerCertificate.vue index e69de29..2f0f349 100644 --- a/src/pages/manage/list/dayEnd/tellerCertificate.vue +++ b/src/pages/manage/list/dayEnd/tellerCertificate.vue @@ -0,0 +1,199 @@ +// 存款 + + + + +