From bd2e3406145b1a7782f8d9ee81896328c5c45411 Mon Sep 17 00:00:00 2001 From: gongdi <410827992@qq.com> Date: Thu, 17 Nov 2022 17:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E5=AD=A6=E6=A0=A1=E5=85=AB?= =?UTF-8?q?=E5=A4=A7=E4=B8=AD=E5=BF=83=20=E5=BE=B7=E8=82=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/centerCommonInfo.vue | 1 - .../screenAdaptation/common/commonInfo.vue | 1 - .../screenAdaptation/common/imgPreview.vue | 2 - .../pages/adminCenter/AccessSubsystem.vue | 6 +++ .../pages/adminCenter/workbench.vue | 2 +- .../homePages/menuTop/personMsgModal.vue | 1 - .../headmasterManage.vue | 4 -- .../pages/secondPages/top.vue | 41 ++++++++++++++++++- .../store/modules/userStore.js | 6 +++ 9 files changed, 52 insertions(+), 12 deletions(-) diff --git a/src/views/screenAdaptation/common/centerCommonInfo.vue b/src/views/screenAdaptation/common/centerCommonInfo.vue index 5ab66a8..1dc021e 100644 --- a/src/views/screenAdaptation/common/centerCommonInfo.vue +++ b/src/views/screenAdaptation/common/centerCommonInfo.vue @@ -94,7 +94,6 @@ this.showPanel = newData; }, infoObj: function (newData) { - console.log("infoObj变化:", newData) this.infoTitle = newData.title; this.infoArr = newData.infoArr; this.contentHtml = newData.content; diff --git a/src/views/screenAdaptation/common/commonInfo.vue b/src/views/screenAdaptation/common/commonInfo.vue index ae5a8a0..e32abcf 100644 --- a/src/views/screenAdaptation/common/commonInfo.vue +++ b/src/views/screenAdaptation/common/commonInfo.vue @@ -91,7 +91,6 @@ this.showPanel = newData; }, infoObj: function (newData) { - console.log("infoObj变化:", newData) this.infoTitle = newData.title; this.infoArr = newData.infoArr; this.contentHtml = newData.content; diff --git a/src/views/screenAdaptation/common/imgPreview.vue b/src/views/screenAdaptation/common/imgPreview.vue index 17d4935..a54132e 100644 --- a/src/views/screenAdaptation/common/imgPreview.vue +++ b/src/views/screenAdaptation/common/imgPreview.vue @@ -40,8 +40,6 @@ this.img.key = this.img.key.replace(/[\\]/g, ''); return this.BaseConfig.url_path_down + this.img.key; }else if(this.img.url && this.img.url !== ""){ - console.log("imgUrl:",this.BaseConfig.url_path_down) - console.log("imgUrl:",this.BaseConfig.url_path_down + this.img.url) return this.BaseConfig.url_path_down + this.img.url; } } else { diff --git a/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue b/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue index 37bb873..fe4b053 100644 --- a/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue +++ b/src/views/screenAdaptation/pages/adminCenter/AccessSubsystem.vue @@ -36,6 +36,11 @@ } }, beforeRouteEnter(to, from, next) { + //to.query.oneLevel = 'newsInformation_two'; + //store存储query到本地 防止页面刷新后 query丢失问题 + next(vm => { + vm.$store.commit('userStore/setQueryStore', to.query); + }) if (to.query.oneLevel) { oneLevel = to.query.oneLevel; } else { @@ -51,6 +56,7 @@ } else { type = ''; } + next(); }, diff --git a/src/views/screenAdaptation/pages/adminCenter/workbench.vue b/src/views/screenAdaptation/pages/adminCenter/workbench.vue index c1357d9..efeea6f 100644 --- a/src/views/screenAdaptation/pages/adminCenter/workbench.vue +++ b/src/views/screenAdaptation/pages/adminCenter/workbench.vue @@ -87,7 +87,7 @@ }, mounted(){ this.getLayoutInfo(); - this.$bus.on("accessSubsystem", this.onAccessSubsystem); + //this.$bus.on("accessSubsystem", this.onAccessSubsystem); this.$bus.on("ModuleAndLayoutChange", this.layoutChange); this.$bus.on("getDesktopTodoNumbers",this.getDesktopTodoNumbers); //this.$bus.on("showApp", this.onShowApp); diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue b/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue index a76d076..a9dc14a 100644 --- a/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue +++ b/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue @@ -166,7 +166,6 @@ method: InterConfig.getModifyPhoto.method, isTestLogin: InterConfig.getModifyPhoto.isTestLogin, }], (result) => { - console.log('获取证件照', result)//" " if (result[0].data.code === 2000 && result[0].data.id_photo_json !== "") { this.modifyPhotoObj = JSON.parse(result[0].data.id_photo_json) } diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue index fb6cc37..78d0d44 100644 --- a/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue +++ b/src/views/screenAdaptation/pages/moralEducationCenter/studentClassTeacherManage/headmasterManage.vue @@ -305,7 +305,6 @@ params: param, method: "post", }], (result) => { - console.log("队伍建设：",result) this.spinning = false; if(result[0].data.success){ let res = result[0].data.result; @@ -378,7 +377,6 @@ let arr = JSON.parse(res); if(arr && arr.length > 0){ this.headMasterTrainData.push(...arr) - console.log("班主任培训数据",this.headMasterTrainData) for(let i = 0,len = this.headMasterTrainData.length;i < len;i ++){ let json = this.headMasterTrainData[i].cover_json; if(json && json !== ""){ @@ -427,7 +425,6 @@ if(arr && arr.length > 0){ if(arr && arr.length > 0){ this.titleData.push(...arr); - console.log("this.titleData:",this.titleData) this.excellent_id = this.titleData[0].excellent_id if(this.excellent_id !== ""){ this.getMasterBextData2()//班主任评优2 @@ -466,7 +463,6 @@ let res = result[0].data.result; if (res && res !== "") { let arr = JSON.parse(res); - console.log("班主任评优数据：",arr) if (arr && arr.length > 0) { if (arr && arr.length > 0) { this.bestHeadMaster1.push(...arr); diff --git a/src/views/screenAdaptation/pages/secondPages/top.vue b/src/views/screenAdaptation/pages/secondPages/top.vue index 1159e9e..553c232 100644 --- a/src/views/screenAdaptation/pages/secondPages/top.vue +++ b/src/views/screenAdaptation/pages/secondPages/top.vue @@ -238,7 +238,6 @@ }, //配置更多应用 changeSystemData: function (config) { - console.log("$bus.emit:",config) this.systemData = config; }, //版面设置信息 @@ -301,7 +300,45 @@ }, onAccessSubsystem: function (systemData) { this.$refs.systemListRef.clicked = false; - this.$bus.emit("accessSubsystem", systemData); + //this.$bus.emit("accessSubsystem", systemData); + + let params = { + purview_code: systemData.purview_code, + showOtherOneLevel: + systemData.show_oneLevel === true + ? "showOtherOneMenu" + : "hideOtherOneMenu", + }; + let qurey = {}; + let queryStore = this.$store.state.userStore.query; + console.log("queryStore:",queryStore) +// if(queryStore){ +// qurey = queryStore; +// } + if ( + systemData.menu_name && + Array.isArray(systemData.menu_name) && + systemData.menu_name.length > 0 + ) { + if (systemData.menu_name[0] && systemData.menu_name[0] !== "") { + qurey.oneLevel = systemData.menu_name[0]; + } + + if (systemData.menu_name[1] && systemData.menu_name[1] !== "") { + qurey.twoLevel = systemData.menu_name[1]; + } + + if (systemData.menu_name[2] && systemData.menu_name[1] !== "") { + qurey.bussinessType = systemData.menu_name[2]; + } + } + this.$router.push({ + name: "accessSubsystem", + params: params, + query: qurey, + }); + + }, //跳转综合服务平台管理中心 servicePlatform: function (systemData) { diff --git a/src/views/screenAdaptation/store/modules/userStore.js b/src/views/screenAdaptation/store/modules/userStore.js index e4eef44..44cfab2 100644 --- a/src/views/screenAdaptation/store/modules/userStore.js +++ b/src/views/screenAdaptation/store/modules/userStore.js @@ -9,6 +9,7 @@ export default { showLoginBox: false,//是否弹出登录框 theme: "systemTheme",//主题， crmStore:null, + query:null, }, getter: { user: state => state.user, @@ -19,6 +20,7 @@ export default { showLoginBox: state => state.showLoginBox, theme: state => state.theme, crmStore: state => state.crmStore, + query: state => state.query, }, mutations: { setUser (state, user) { @@ -45,6 +47,9 @@ export default { setCrmStore (state, crm) { state.crmStore = crm; }, + setQueryStore (state, query) { + state.query = query; + }, clearUser (state) { state.user = null; state.roles = null; @@ -54,6 +59,7 @@ export default { state.showLoginBox = false; state.theme = "systemTheme"; state.crmStore = null; + state.query = null; } } } \ No newline at end of file