diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..1c54b7d Binary files /dev/null and b/dist.zip differ diff --git a/src/api/api.js b/src/api/api.js index ccda07c..95597c7 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,10 +2,10 @@ import axios from 'axios'; import router from '../router'; // 创建axios实例 const service = axios.create({ - baseURL: "http://39.108.250.202:9000/", // 中台测试服 + // baseURL: "http://39.108.250.202:9000/", // 中台测试服 // baseURL: "http://192.168.31.137:9000/", // 赓 // baseURL: "http://192.168.31.151:9000/", // 榕 - // baseURL: "http://192.168.31.125:9000/", // 坤 + baseURL: "http://192.168.31.125:9000/", // 坤 // baseURL: 'http://39.108.250.202:9000', timeout: 30000 // 请求超时时间 }) diff --git a/src/assets/img/goods/accountApplyBook.jpg b/src/assets/img/goods/accountApplyBook.jpg new file mode 100644 index 0000000..5993aa7 Binary files /dev/null and b/src/assets/img/goods/accountApplyBook.jpg differ diff --git a/src/assets/img/goods/bankCard.png b/src/assets/img/goods/bankCard.png new file mode 100644 index 0000000..5fd827e Binary files /dev/null and b/src/assets/img/goods/bankCard.png differ diff --git a/src/assets/img/goods/copies.jpg b/src/assets/img/goods/copies.jpg new file mode 100644 index 0000000..870b763 Binary files /dev/null and b/src/assets/img/goods/copies.jpg differ diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 3a07c6d..b278eeb 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -301,10 +301,9 @@ export default { let cid = sessionStorage.getItem('cid') let params = { "accountId": 0, - "assessmentId": 0, "classId": 0, "className":0, - "curriculumId":cid, + "curriculumId":+cid, "endTime": this.actEndTime, "lcId": lcld, "projectId": this.projectId, @@ -319,10 +318,11 @@ 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)) - for (var i=0;i{ }) this.getClearTime(); diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index ec496b7..79cb1e4 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -238,7 +238,7 @@ export default { {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}, - {name:'银行卡', src:require('@/assets/img/goods/ckpt.png'), id:16}, + {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, ], //打印资料 //选择普通空白凭证 //客户签字 printoutGoodsShelf:[ @@ -246,7 +246,7 @@ export default { {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}, - {name:'银行卡', src:require('@/assets/img/goods/ckpt.png'), id:16}, + {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, {name:'存款凭条', src:require('@/assets/img/goods/ckpt.png'), id:17}, ], // 总盒子里面的东西 @@ -254,7 +254,7 @@ export default { // goods:[/* 物品栏物品 */ // ], popArr:[/* 弹窗展示的物品 */ - {name:'银行卡',src:require('@/assets/img/seal/paid.png'),id:16}, + {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19}, {name:'预留印签卡',src:require('@/assets/img/seal/paid.png'),id:'预留印签卡'}, {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'}, @@ -285,7 +285,7 @@ export default { {name:'转讫章',src:require('@/assets/img/seal/Transfer.png'),id:'转讫章'}, ], importanceArr:[/* 重要空白凭证 */ - {name:'银行卡',src:require('@/assets/img/seal/paid.png'),id:16}, + {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19}, {name:'预留印签卡',src:require('@/assets/img/seal/paid.png'),id:'预留印签卡'}, {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'}, @@ -450,32 +450,33 @@ export default { getQueryVariable(variable) { var query = window.location.href; var vars = query.split("?"); - for (var i=1;i .wrap { - position: relative; - width: 100%; - height: calc(100vh - 68px); - overflow: hidden; - background:url("../../../assets/img/integrated-counter-bg.png"); .sth { position: absolute; &.cp { @@ -644,6 +641,14 @@ export default { // 1920 @media screen and (min-width: 1920px) { + .wrap { + width: 100%; + position: relative; + //width: 100%; + height: calc(100vh - 68px); + overflow: hidden; + background:url("../../../assets/img/integrated-counter-bg.png"); + } .counter { top: 116px; left: 357px; @@ -746,6 +751,14 @@ export default { } // 1440-1550 @media screen and (max-width: 1550px) { + .wrap { + width: 1550px; + position: relative; + //width: 100%; + height: calc(100vh - 68px); + overflow: hidden; + background:url("../../../assets/img/integrated-counter-bg.png"); + } .counter { top: 35%; left: 10%; @@ -757,7 +770,6 @@ export default { left: 716px; width: 690px; } - .employee { // 柜员 // top: 57%; @@ -848,16 +860,24 @@ export default { } // 1550-1919 @media screen and (min-width: 1550px) and (max-width: 1919px) { + .wrap{ + width: 1550px; + position: relative; + //width: 100%; + height: calc(100vh - 68px); + overflow: hidden; + background:url("../../../assets/img/integrated-counter-bg.png"); + } .counter { - top: 33%; + top: 30%; left: 8%; height: 63vh; } .glass { // 玻璃窗 - top: 185px; - left: 716px; - width: 690px; + top: 135px; + left: 514px; + width: 507px; } .employee { @@ -865,20 +885,19 @@ export default { // top: 57%; // left: 42%; // width: 23%; - top: 617px; - left: 610px; - width: 333px; + top: 374px; + left: 400px; + width: 283px; position: relative; } .employeeText { // 资料文字 position: absolute; - top: 739px; - left: 925px; + top: 482px; + left: 655px; color: #000; transform: rotateZ(38deg) scale3d(1, 1, 1) skew(-19deg, -9deg); - font-size: 18px; - + font-size: 18px; width: 100px; text-align: center; height: 100px; @@ -888,68 +907,68 @@ export default { } .man { // 人 - top: 278px; - left: 1075px; - width: 267px; + top: 191px; + left: 846px; + width: 199px; } .money-box { // 钱箱 - top: 628px; - left: 195px; - width: 164px; + top: 436px; + left: 170px; + width: 129px; } .important { // 重空箱 - top: 606px; - left: 312px; - width: 149px; + top: 434px; + left: 241px; + width: 118px; } .voucher-box { // 普通箱 - top: 474px; - left: 429px; - width: 134px; + top: 327px; + left: 327px; + width: 112px; } .summons { // 传票栏 - top: 496px; - left: 548px; + top: 341px; + left: 389px; width: 112px; } .computer { - top: 381px; - left: 654px; - width: 170px; + top: 257px; + left: 504px; + width: 148px; } .card-machine { - top: 583px; - left: 800px; - width: 100px; + top: 434px; + left: 624px; + width: 66px; } .idCard-scanner { - top: 640px; - left: 867px; - width: 100px; + top: 472px; + left: 666px; + width: 46px; } .seal-box { - top: 667px; - left: 966px; - width: 86px; + top: 500px; + left: 742px; + width: 50px; } .currency-detector { - top: 676px; - left: 1036px; - width: 142px; + top: 478px; + left: 772px; + width: 117px; } .printer { - top: 747px; - left: 1162px; - width: 187px; + top: 519px; + left: 844px; + width: 149px; } .cipher-machine { - top: 551px; - left: 977px; - width: 122px; + top: 391px; + left: 711px; + width: 79px; } } .goods {