diff --git a/src/api/api.js b/src/api/api.js index 260783f..bf99bbf 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -8,7 +8,7 @@ if (dev) { // 本地 host = 'http://121.37.12.51/' // 中台测试服 // host = 'http://192.168.31.151:9000/' // 榕 - // host = 'http://192.168.31.137:9000/' // 赓 + // host = 'http://192.168.31.116:9000/' // 赓 } // 创建axios实例 const service = axios.create({ diff --git a/src/api/http.js b/src/api/http.js index 567b97c..8f405ba 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -27,6 +27,12 @@ export const getOperation= (params) => { export const deleteCache= () => { return get( '/bank/bank/deleteCache') } +export const exportBankExperimentReport= (params) => { + return post( '/occupationlab/occupationlab/achievement/exportBankExperimentReport',params) +} +export const updateReport= (params) => { + return post( '/occupationlab/occupationlab/achievement/updateReport',params) +} // 学生查看考核状态 export const checkTest= (params) => { return get( '/occupationlab/occupationlab/assessment/getDetailById', {...params}) diff --git a/src/assets/img/point.png b/src/assets/img/point.png new file mode 100644 index 0000000..6f6692f Binary files /dev/null and b/src/assets/img/point.png differ diff --git a/src/assets/img/report1.png b/src/assets/img/report1.png new file mode 100644 index 0000000..5849896 Binary files /dev/null and b/src/assets/img/report1.png differ diff --git a/src/assets/img/report2.png b/src/assets/img/report2.png new file mode 100644 index 0000000..323c0dc Binary files /dev/null and b/src/assets/img/report2.png differ diff --git a/src/assets/img/report3.png b/src/assets/img/report3.png new file mode 100644 index 0000000..51a142d Binary files /dev/null and b/src/assets/img/report3.png differ diff --git a/src/assets/img/report4.png b/src/assets/img/report4.png new file mode 100644 index 0000000..196b2da Binary files /dev/null and b/src/assets/img/report4.png differ diff --git a/src/assets/img/report5.png b/src/assets/img/report5.png new file mode 100644 index 0000000..f49ce2a Binary files /dev/null and b/src/assets/img/report5.png differ diff --git a/src/assets/svg/financial.svg b/src/assets/svg/financial.svg index b2e766c..4858ac5 100644 --- a/src/assets/svg/financial.svg +++ b/src/assets/svg/financial.svg @@ -1,9 +1,9 @@ - 大堂经理 / 理财业务 + 大堂经理 / 其他业务 Created with Sketch. - + diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue new file mode 100644 index 0000000..dd3d251 --- /dev/null +++ b/src/components/breadcrumb/index.vue @@ -0,0 +1,71 @@ +
+ + + +
+ + + + \ No newline at end of file diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 84c0c76..f9d8c8e 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -34,6 +34,7 @@
+ 重新开始 @@ -225,6 +226,9 @@ export default { assessmentId: "", classId:'', projectPermissions: 0, //项目权限(0、练习 1、考核 2、竞赛) + competitionId: '', + stageId: '', + teamId: '', isSubmit: false, entryTime: util.formatDate('yyyy-MM-dd hh:mm:ss'), startTime: '', @@ -236,14 +240,15 @@ export default { projectManage:{}, requires:[], projectName:'', - loading:false, - sss:1, - popContainer:false, - timestamp:'', + loading:false, + sss:1, + popContainer:false, + timestamp:'', + curSystemId: '', + reportId: '' } }, created() { - let assessmentId = this.getQueryVariable('assessmentId') sessionStorage.setItem('assessmentId',assessmentId) this.assessmentId = assessmentId @@ -320,6 +325,9 @@ export default { let systemId = this.getQueryVariable('systemId') let projectId = this.getQueryVariable('projectId') let assessmentId = this.getQueryVariable('assessmentId') + let competitionId = this.getQueryVariable('competitionId') + let stageId = this.getQueryVariable('stageId') + let teamId = this.getQueryVariable('teamId') let classId = this.getQueryVariable('classId') let stopTime = this.getQueryVariable('stopTime') let timestamp = +stopTime; @@ -334,16 +342,26 @@ export default { sessionStorage.setItem('timestamp', timestamp) sessionStorage.setItem('projectId', projectId) sessionStorage.setItem('assessmentId', assessmentId) + sessionStorage.setItem('competitionId', competitionId) + sessionStorage.setItem('stageId', stageId) + sessionStorage.setItem('teamId', teamId) sessionStorage.setItem('classId', classId) this.assessmentId = assessmentId + this.competitionId = competitionId + this.stageId = stageId + this.teamId = teamId this.classId = classId } let tokens = sessionStorage.getItem('token') if(tokens || token){ - this.projectPermissions = this.assessmentId ? 1 : 0 + this.projectPermissions = this.assessmentId ? + 1 : + this.competitionId ? + 2 : + 0 this.assessmentId && this.projectId && this.checkVer() this.codeId && this.codeIds.push(this.codeId) - if (assessmentId !=null && assessmentId != '' && assessmentId !='null'){ + if (assessmentId !=null && assessmentId != '' && assessmentId !='null' || this.competitionId){ let params = { "projectId":projectId, } @@ -355,7 +373,8 @@ export default { }, methods: { ...mapMutations({ - initState: 'system/initState' + initState: 'system/initState', + setShowBusiness: 'system/setShowBusiness', }), clearStore() { // // 清空缓存 @@ -550,6 +569,7 @@ export default { this.sss = 1; this.hintOpen = data.data.projectManage.hintOpen; this.countDown(timestamp); + this.curSystemId = data.data.projectManage.systemId let assessmentId = this.getQueryVariable('assessmentId') if(assessmentId != null && assessmentId != '' && assessmentId != 'null'){ //获取当前时间 @@ -631,6 +651,13 @@ export default { this.sss = 1 this.startCountFn(); }, + // 查看实验报告 + toReport() { + // this.lockIt = false + this.setShowBusiness(false) + this.$emit('update:showIt', !this.showIt) + this.$router.push(`/index/report?reportId=${this.reportId}`) + }, //提交 Submit() { this.$confirm('此操作将视为结束考试, 是否继续?', '提示', { @@ -638,8 +665,7 @@ export default { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }).then(() => { - + }).then(res => { this.sureSubmit(true) }).catch(() => { this.$message({ @@ -659,7 +685,6 @@ export default { for (var i=0;i{ + console.log(4, data) if(data.status == 200){ this.clearStore() - + const { retMap } = data.data + this.reportId = retMap.reportId let firstLoad = null let firstLoad2 = null if(sessionStorage.getItem('firstLoad')) { @@ -698,13 +728,13 @@ export default { } - let datas= data.data.retMap.scoreInfo; + let datas= retMap.scoreInfo; let formList = [] sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) sessionStorage.setItem('accountVoucher', JSON.stringify(formList)) sessionStorage.setItem('accountPasswordAll', '') let list = this.requires - this.grade = data.data.retMap.totalScore + this.grade = retMap.totalScore for (var j=0;j
  • -

    理财业务

    +

    其他业务

    • -->
    @@ -158,7 +158,7 @@

    - 请单击选中复印材料、双击可放大预览 -

      -
      +

    • {{ item.name }}

      • -

      {{ item.copyState?'已复印': '待复印' }}

      +

      {{ item.copyState?'已复印': ' ' }}

    @@ -184,7 +184,7 @@

    - 请单击选中复印材料、双击可放大预览 -

      -
      +

    • {{ item.name }}

      • -

      {{ item.returnState? '已取回': '待取回' }}

      +

      {{ item.returnState ? '已取回': (item.copy ? '复印件' : '') }}

    @@ -230,7 +230,7 @@ @@ -263,7 +263,7 @@ export default { { key: 400, name: '现金业务', img: require('@/assets/svg/cash.svg') }, { key: 401, name: '个人非现金业务', img: require('@/assets/svg/non-cash.svg') }, { key: 402, name: '公司业务', img: require('@/assets/svg/company.svg') }, - { key: 403, name: '理财业务', img: require('@/assets/svg/financial.svg') } + { key: 403, name: '其他业务', img: require('@/assets/svg/financial.svg') } ], elImg: [ { img: require('@/assets/img/goods/accountApplyBook.jpg'), name: '开户申请书', key: 405 }, @@ -279,11 +279,10 @@ export default { { img: require('@/assets/img/goods/银行承兑协议.png'), name: '境外汇款申请书', key: 415 }, ], elImg2: [ - { img: require('@/assets/img/goods/accountApplyBook.jpg'), name: '开户申请书', key: 405, copyState: false, returnState: false }, { img: require('@/assets/img/idCard-sm.png'), name: '身份证', key: 13, copyState: false, returnState: false }, - ], + elImg3: [], listLi1 : [ {checked: 1, click: 1, src: require('@/assets/img/goods/accountApplyBook.jpg'), title: '开户申请书'}, {checked: 2, click: 2, src: require('@/assets/img/idCard-copy-sm.png'), title: '密码挂失申请书'}, @@ -442,6 +441,7 @@ export default { formList.push({"answerId":item.key,"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',286,416,' + item.key, "type": ""}) } }) + console.log(333, this.elImg3) const params= { parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',286, 416', lcJudgmentRuleReq:formList, @@ -454,6 +454,12 @@ export default { this.elImg2.map(item => { if(this.checkList.findIndex(item2 => item2 === item.key ) !== -1) { item.copyState = true + this.elImg3.push(item) + const copyItem = JSON.parse(JSON.stringify(item)) + copyItem.copy = true + if (copyItem.key == 405) copyItem.key = 589 + if (copyItem.key == 13) copyItem.key = 23 + this.elImg3.push(copyItem) } }) this.checkList = [] @@ -488,7 +494,7 @@ export default { for(let i=0; i { + this.elImg3.map(item=> { if(item.returnState) { formList.push({"answerId":item.key,"emptyOne": "", "emptyTwo": '', "operationIds": '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',286,553,' + item.key, "type": ""}) } @@ -502,7 +508,7 @@ export default { addOperation(params).then((data)=>{ // ... this.recaptionVisible = false - this.elImg2.map(item => { + this.elImg3.map(item => { if(this.checkList.findIndex(item2 => item2 === item.key ) !== -1) { item.returnState = true } diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue index 58053a3..96fa9b1 100644 --- a/src/pages/manage/list/acceptanceDraft/invoice.vue +++ b/src/pages/manage/list/acceptanceDraft/invoice.vue @@ -168,6 +168,13 @@ export default { trigger: 'blur' } ], + billType: [ + { + required: true, + message: '请选择票据类型', + trigger: 'blur' + } + ], ApplicantDocuments: [ { required: true, diff --git a/src/pages/report/index.vue b/src/pages/report/index.vue new file mode 100644 index 0000000..0cb7531 --- /dev/null +++ b/src/pages/report/index.vue @@ -0,0 +1,404 @@ + + + + + \ No newline at end of file diff --git a/src/router/modules/index.js b/src/router/modules/index.js index 23c9ff3..af60a33 100644 --- a/src/router/modules/index.js +++ b/src/router/modules/index.js @@ -20,5 +20,11 @@ export default { component: () => import('@/pages/index/list'), meta: { title: '首页' } }, + { + name: `${pre}report`, + path: `report`, + component: () => import('@/pages/report'), + meta: { title: '实验报告' } + }, ] }; diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 3e59369..d4979c7 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -13,6 +13,7 @@ const allGoods = { 439: {name:'预留印鉴卡',src:require('@/assets/img/goods/预留印鉴卡.png'),id:439}, 412: {name:'转账支票',src:require('@/assets/img/goods/sy-zzzp.png'),id:412}, 584: {name:'银行承兑汇票',src:require('@/assets/img/goods/银行承兑汇票.png'),id:584}, + 587: {name:'银行承兑协议',src:require('@/assets/img/goods/银行承兑协议.png'),id:587}, 582: {name:'银行承兑汇票一联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:582}, 581: {name:'银行承兑汇票二联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:581}, 580: {name:'银行承兑汇票三联（解讫通知）',src:require('@/assets/img/goods/银行承兑汇票.png'),id:580}, @@ -1310,7 +1311,7 @@ const myInitState = { '业务三十二': { // 银行承兑汇票签发 id: 577, name: '银行承兑汇票签发', - data: [ 13, 584 ], // + data: [ 13, 587 ], // needs: [ ], isStamp: { // '业务专用章': [ 411 ] @@ -2505,9 +2506,9 @@ export default { } }, '业务三十二': { // 银行承兑汇票签发 - id: 577, + id: 5771, name: '银行承兑汇票签发', - data: [ 13, 584 ], // + data: [ 13, 587 ], // needs: [ ], isStamp: { // '业务专用章': [ 411 ] @@ -2978,7 +2979,6 @@ export default { // 调试容错采用if-else const arr = [] if(state.businessKey !== '') { - console.log("🚀 ~ file: system.js ~ line 2979 ~ goods2 ~ state.businessKey",state, state.businessKey,state.businessSelect[state.businessKey]) for(const item of state.businessSelect[state.businessKey].data) { arr.push(allGoods[item]) }