diff --git a/src/components/case/index.vue b/src/components/case/index.vue index dbed95a..5f50898 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -354,6 +354,20 @@ export default { ...mapMutations({ initState: 'system/initState' }), + clearStore() { + // 清空缓存 + let token = sessionStorage.getItem('token') + let cid = sessionStorage.getItem('cid') + let systemId = sessionStorage.getItem('systemId') + let projectId = sessionStorage.getItem('projectId') + sessionStorage.clear() + sessionStorage.setItem('token', token) + sessionStorage.setItem('cid', cid) + sessionStorage.setItem('systemId', systemId) + sessionStorage.setItem('projectId', projectId) + // 初始化vuex中的state + this.initState(); + }, closePane(){ this.closePaneJudge = false this.lockIt = false @@ -470,7 +484,8 @@ export default { selectProjects(params){ getProjectDetail(params).then((data)=>{ if(data.status == 200){ - this.lockIt = false + + this.globalTimer = ""; let stopTime = sessionStorage.getItem('timestamp') let timestamp = +stopTime; @@ -500,6 +515,15 @@ export default { }, //选择好题目 selectProject(){ + // 和重新开始区别开,不再问是否再试一次 + this.lockIt = false + this.clearStore() + deleteCache().then((data)=>{ + + }).catch(() => { + + }) + let params = { "projectId":this.projectId, } @@ -523,9 +547,9 @@ export default { // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId // 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 + // location.href = 'http://39.108.250.202/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 + location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId } }).catch((error)=>{ }) @@ -587,11 +611,8 @@ export default { this.loading = true; submit(params).then((data)=>{ if(data.status == 200){ - // 清空缓存 - let token = sessionStorage.getItem('token') - let cid = sessionStorage.getItem('cid') - let systemId = sessionStorage.getItem('systemId') - let projectId = sessionStorage.getItem('projectId') + this.clearStore() + let firstLoad = null let firstLoad2 = null if(sessionStorage.getItem('firstLoad')) { @@ -600,11 +621,7 @@ export default { if(sessionStorage.getItem('firstLoad2')) { firstLoad2 = sessionStorage.getItem('firstLoad2') } - sessionStorage.clear() - sessionStorage.setItem('token', token) - sessionStorage.setItem('cid', cid) - sessionStorage.setItem('systemId', systemId) - sessionStorage.setItem('projectId', projectId) + this.lockIt = true if(firstLoad) { sessionStorage.setItem('firstLoad', firstLoad) @@ -612,8 +629,8 @@ export default { if(firstLoad2) { sessionStorage.setItem('firstLoad2', firstLoad2) } - // 初始化vuex中的state - this.initState(); + + let datas= data.data.retMap.scoreInfo; let formList = [] sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) @@ -728,22 +745,15 @@ export default { } }, reload() { + this.clearStore() let token = sessionStorage.getItem('token') let cid = sessionStorage.getItem('cid') let systemId = sessionStorage.getItem('systemId') let projectId = sessionStorage.getItem('projectId') - sessionStorage.clear() - sessionStorage.setItem('token', token) - sessionStorage.setItem('cid', cid) - sessionStorage.setItem('systemId', systemId) - sessionStorage.setItem('projectId', projectId) - let formList = [] sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) sessionStorage.setItem('accountVoucher', JSON.stringify(formList)) sessionStorage.setItem('accountPasswordAll', '') - // 初始化vuex中的state - this.initState(); let params = { "projectId":projectId, } @@ -769,9 +779,9 @@ export default { // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId // 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 + // location.href = 'http://39.108.250.202/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 + location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId }, //重新开始 // reload() { diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index f762d9a..ab2aa23 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -9,9 +9,9 @@ class="apple" :close-on-click-modal="true" :show-close="false" - custom-class="2xl:w-3/5 xl:w-4/5 lg:w-full bg-transparent" + custom-class="2xl:w-3/5 xl:w-4/5 lg:w-full bgNone" > -
+
提示
@@ -584,5 +584,10 @@ export default { // left: 50%; // transform: translateX(-25%); // } - + /deep/.bgNone { + background-color: transparent; + } + /deep/.myFull { + width: 100%; + } \ No newline at end of file diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 715e333..30b4637 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -47,8 +47,8 @@ -
- +
+
@@ -82,8 +82,8 @@ -
- +
+

资料

@@ -2293,7 +2293,8 @@ export default { font-size: 18px; width: 100px; height: 100px; - cursor: pointer + cursor: pointer; + z-index: 100; } .man { // 人 @@ -2345,6 +2346,7 @@ export default { top: 56vh; left: 62vw; width: 6vw; + z-index: 900; } .currency-detector { top: 62vh; diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index c0deae7..e6faccd 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -166,8 +166,8 @@ export default { } .name{ position: absolute; - top: 43%; - left: -15%; + top: 23%; + left: 20%; @include nameTip; } } diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 096de45..759ff76 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -2289,6 +2289,7 @@ export default { }, initState(state) { state.businessSelect = { ...myInitState } + state.businessKey = '' }, setShowBusiness(state, isShow) { state.showBusiness = isShow