From 457a039bd4c1cd2f3c44ea761926ca4012680e2d Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 14 Jul 2023 18:26:23 +0800 Subject: [PATCH] fix --- src/App.vue | 10 ++- src/api/api.js | 1 + src/components/backButton/index.vue | 42 ++++++------ src/components/breadcrumb/index.vue | 86 ++++++++++++------------- src/components/case/index.vue | 37 ++++++----- src/components/selectBusiness/index.vue | 3 +- src/layouts/header/index.vue | 5 +- src/pages/index/list/index.vue | 10 +++ src/pages/report/index.vue | 28 -------- src/store/modules/system.js | 2 +- 10 files changed, 108 insertions(+), 116 deletions(-) diff --git a/src/App.vue b/src/App.vue index 4411f19..4e63065 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,6 +15,7 @@ import util from '@/libs/util'; import selectBusiness from '@/components/selectBusiness' import TipDialog from '@/components/tipDialog' import { mapState, mapMutations } from 'vuex' +import Bus from '@/libs/bus' export default { name: 'App', components: { @@ -54,7 +55,7 @@ export default { }, watch: { showIt: { - handler (newVal) { + handler (newVal) { console.log("🚀 ~ file: App.vue:58 ~ handler ~ newVal:", newVal, this.businessKey, sessionStorage.getItem('submited')) if (!newVal && !this.businessKey && !sessionStorage.getItem('submited')) { this.setShowBusiness(true) @@ -62,7 +63,6 @@ export default { if (!newVal) { // 如果未选择业务，则关闭后继续弹出弹框 if (!this.businessKey && !sessionStorage.getItem('submited')) { - console.log("🚀 ~ file: App.vue:65 ~ handler ~ submited:", sessionStorage.getItem('submited')) this.$nextTick(() => { this.setShowBusiness(true) }) } else { // this.setTipsOperate('您正在进行' + this.businessKey + ',加油！'); @@ -75,11 +75,15 @@ export default { immediate: true } }, + mounted () { + Bus.$on('setShowIt', data => { + this.showIt = data + }) + }, computed: { ...mapState({ businessKey: state => state.system.businessKey, showBusiness: state => state.system.showBusiness, - businessKey: state => state.system.businessKey }) }, } diff --git a/src/api/api.js b/src/api/api.js index bf99bbf..0f808f3 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -7,6 +7,7 @@ let host = `${location.origin}/` if (dev) { // 本地 host = 'http://121.37.12.51/' // 中台测试服 + // host = 'https://www.occupationlab.com/' // 正式服 // host = 'http://192.168.31.151:9000/' // 榕 // host = 'http://192.168.31.116:9000/' // 赓 } diff --git a/src/components/backButton/index.vue b/src/components/backButton/index.vue index 5953cc6..f342022 100644 --- a/src/components/backButton/index.vue +++ b/src/components/backButton/index.vue @@ -1,33 +1,35 @@ \ No newline at end of file diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue index dd3d251..56e22f8 100644 --- a/src/components/breadcrumb/index.vue +++ b/src/components/breadcrumb/index.vue @@ -3,15 +3,12 @@
@@ -21,51 +18,50 @@ \ No newline at end of file diff --git a/src/components/case/index.vue b/src/components/case/index.vue index 791c2b2..b2872b8 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -200,6 +200,7 @@ import Setting from '@/setting' import { getProjectBySystemId, getProjectDetail, submit, getQueryCache, deleteCache, checkTest, checkTest2 } from "@/api/http.js"; import { mapMutations } from 'vuex' import { async } from 'q'; +import Bus from '@/libs/bus' export default { props: { sendSync: { @@ -214,10 +215,6 @@ export default { type: Number, default: null }, - codeId: { - type: Number, - default: 0 - }, showIt: { type: Boolean, required: true @@ -235,7 +232,6 @@ export default { grade: "00", exampleData: "", codeid: "", - codeIds: [], judgmentPointsIds: [], text: "", isStart: false, @@ -318,6 +314,9 @@ export default { }) }, 4000) } + Bus.$on('setSubmited', data => { + this.popContainer = data + }) }, watch: { countVal: { @@ -365,11 +364,9 @@ export default { let token = sessionStorage.getItem('token') || this.getQueryVariable('token') let cid = sessionStorage.getItem('cid') || this.getQueryVariable('cid') let systemId = sessionStorage.getItem('systemId') || this.getQueryVariable('systemId') - let projectId + let projectId = this.getQueryVariable('projectId') if (sessionStorage.getItem('projectId')) { projectId = sessionStorage.getItem('projectId') - } else { - projectId = this.getQueryVariable('projectId') } console.log('mounted', projectId) let assessmentId = sessionStorage.getItem('assessmentId') || this.getQueryVariable('assessmentId') @@ -378,6 +375,7 @@ export default { let teamId = sessionStorage.getItem('teamId') || this.getQueryVariable('teamId') let classId = sessionStorage.getItem('classId') || this.getQueryVariable('classId') let stopTime = sessionStorage.getItem('stopTime') || this.getQueryVariable('stopTime') + let mallId = sessionStorage.getItem('mallId') || this.getQueryVariable('mallId') let timestamp = +stopTime; if (timestamp != null) { } else { @@ -399,6 +397,7 @@ export default { this.stageId = stageId this.teamId = teamId this.classId = classId + this.mallId = mallId } let tokens = sessionStorage.getItem('token') if (tokens || token) { @@ -408,7 +407,6 @@ export default { 2 : 0 this.assessmentId && this.projectId && this.checkVer() - this.codeId && this.codeIds.push(this.codeId) if (JSON.parse(assessmentId != null && assessmentId != '' && assessmentId != 'null' || this.competitionId)) { this.selectProjects({ projectId @@ -417,9 +415,11 @@ export default { this.getData() } } + console.log(2222, this.showIt) }, methods: { ...mapMutations({ + setBusinessKey: 'system/setBusinessKey', initState: 'system/initState', setShowBusiness: 'system/setShowBusiness', }), @@ -440,6 +440,7 @@ export default { sessionStorage.setItem('cid', cid) sessionStorage.setItem('systemId', systemId) sessionStorage.setItem('projectId', projectId) + sessionStorage.setItem('firstLoad2', true) if (assessmentId) { sessionStorage.setItem('assessmentId', assessmentId) } @@ -499,6 +500,7 @@ export default { "systemId": sessionStorage.getItem('systemId'), "cId": sessionStorage.getItem('cid'), "permissions": 0, + mallId: this.mallId } getProjectBySystemId(params).then((data) => { if (data.status == 200) { @@ -657,6 +659,7 @@ export default { sessionStorage.setItem('accountPasswordAll', '') sessionStorage.setItem('projectId', this.projectId) sessionStorage.setItem('submited', 0) + sessionStorage.setItem('firstLoad2', true) getProjectDetail(params).then((data) => { if (data.status == 200) { const { systemId, projectId } = data.data.projectManage @@ -751,12 +754,14 @@ export default { competitionId: this.competitionId, stageId: this.stageId, teamId: this.teamId, + mallId: this.mallId } this.loading = true; submit(params).then((data) => { console.log(4, data) if (data.status == 200) { - this.clearStore() + sessionStorage.setItem('firstLoad2', true) + // this.clearStore() const { retMap } = data.data this.reportId = retMap.reportId let firstLoad = null @@ -906,7 +911,7 @@ export default { sessionStorage.setItem('ruleReqs', JSON.stringify(formList)) sessionStorage.setItem('accountVoucher', JSON.stringify(formList)) sessionStorage.setItem('accountPasswordAll', '') - sessionStorage.setItem('submited', 0) + this.setBusinessKey('') let params = { "projectId": projectId, } @@ -947,11 +952,11 @@ export default { }, toggleCase () { if (this.submitType) return - if (!this.lockIt) { - this.$emit('update:showIt', !this.showIt) - } else { - this.closePaneJudge = true - } + // if (!this.lockIt) { + this.$emit('update:showIt', !this.showIt) + // } else { + // this.closePaneJudge = true + // } // this.caseVisible = !this.caseVisible }, diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue index 6526ac9..9105309 100644 --- a/src/components/selectBusiness/index.vue +++ b/src/components/selectBusiness/index.vue @@ -50,6 +50,7 @@ export default { // default: '本业务需要授权' }, mounted () { + console.log('business', this.getBusinessSelectList) if (this.businessKey) { // 如果上次保存有 那么直接赋值 this.takeCheck = this.businessKey @@ -164,7 +165,7 @@ export default { // sessionStorage.setItem('systemData', systemData) - sessionStorage.setItem('businessKey', this.$store.state.system.businessKey) + sessionStorage.setItem('businessKey', this.takeCheck) }, }, diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index d4a9478..54b1b9c 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -30,7 +30,7 @@ export default { }; }, mounted () { - this.$route.query.manager && Cookie.set('manager', 1) + this.$route.query.manager ? Cookie.set('manager', 1) : Cookie.remove('manager') }, methods: { toIndex () { @@ -53,8 +53,9 @@ export default { href += `ass/list` } else { const cid = sessionStorage.getItem('cid') - href += `station/preview?courseId=${cid}&curriculumName=银行项目` + href += `station/preview?courseId=${cid}&curriculumName=银行项目&mallId=${this.$route.query.mallId}` } + sessionStorage.clear() location.href = href }, }, diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 6656931..a138002 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -65,6 +65,7 @@