diff --git a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/graphicSystem/graphicSystem.vue b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/graphicSystem/graphicSystem.vue index 3b82c91..0b49445 100644 --- a/src/views/screenAdaptation/pages/adminCenter/servicePlatform/graphicSystem/graphicSystem.vue +++ b/src/views/screenAdaptation/pages/adminCenter/servicePlatform/graphicSystem/graphicSystem.vue @@ -20,7 +20,7 @@
*正文:
-
+
@@ -178,6 +178,9 @@ border-right: 0 !important; } } + .li-right-editor{ + min-height: 20rem; + } } .button-row-style { width: 50%; diff --git a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuItem.vue b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuItem.vue index 7c26c18..c589aaa 100644 --- a/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuItem.vue +++ b/src/views/screenAdaptation/pages/homePages/threeDimensionalSchoolModel/menuItem.vue @@ -33,7 +33,7 @@ }, watch: { $route: { - handler(val, oldval){ + handler: function (val, oldval) { if (val.path === '/partyCenter/party') { this.isPartyPage = true; } else { @@ -41,6 +41,7 @@ } this.changeMenu(); }, + deep: true } }, props: { @@ -50,37 +51,43 @@ } }, mounted(){ - this.changeMenu(); + let path = this.$route.path; + if (path === '/partyCenter/party') { + this.isPartyPage = true; + } else { + this.isPartyPage = false; + } + this.changeMenu(); }, methods: { menuClick: function () { this.$emit("menuClick", this.menu) }, - changeMenu:function () { + changeMenu: function () { switch (this.$props.menu.name) { case "partyCenterPage": - this.imgUrl = this.isPartyPage?this.partyRedImg:this.partyImg; + this.imgUrl = this.isPartyPage ? this.partyRedImg : this.partyImg; break; case "adminCenterPage": - this.imgUrl = this.isPartyPage?this.adminRedImg:this.adminImg; + this.imgUrl = this.isPartyPage ? this.adminRedImg : this.adminImg; break; case "safeCenterPage": - this.imgUrl = this.isPartyPage?this.safeRedImg:this.safeImg; + this.imgUrl = this.isPartyPage ? this.safeRedImg : this.safeImg; break; case "teachingCenterPage": - this.imgUrl = this.isPartyPage?this.teachingRedImg:this.teachingImg; + this.imgUrl = this.isPartyPage ? this.teachingRedImg : this.teachingImg; break; case "moralEducationCenterPage": - this.imgUrl = this.isPartyPage?this.deyuRedImg:this.deyuImg; + this.imgUrl = this.isPartyPage ? this.deyuRedImg : this.deyuImg; break; case "teacherAdminCenterPage": - this.imgUrl = this.isPartyPage?this.teacherRedImg:this.teacherImg; + this.imgUrl = this.isPartyPage ? this.teacherRedImg : this.teacherImg; break; case "monitorCenterPage": - this.imgUrl = this.isPartyPage?this.dataRedImg:this.dataImg; + this.imgUrl = this.isPartyPage ? this.dataRedImg : this.dataImg; break; case "serviceCenterPage": - this.imgUrl = this.isPartyPage?this.serviceRedImg:this.serviceImg; + this.imgUrl = this.isPartyPage ? this.serviceRedImg : this.serviceImg; break; default: break; diff --git a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue index 5503ba3..ab2fd6f 100644 --- a/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue +++ b/src/views/screenAdaptation/pages/partyCenter/brandCreation.vue @@ -37,7 +37,7 @@
- +

diff --git a/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue b/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue index da30dd2..4c4d781 100644 --- a/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue +++ b/src/views/screenAdaptation/pages/partyCenter/teamBuildingStyle.vue @@ -16,7 +16,7 @@

- +

diff --git a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue index 8804971..3283b70 100644 --- a/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue +++ b/src/views/screenAdaptation/pages/partyCenter/teamHelp.vue @@ -4,7 +4,7 @@

- +

diff --git a/src/views/screenAdaptation/pages/secondPages/top.vue b/src/views/screenAdaptation/pages/secondPages/top.vue index 8d1dcaf..b885442 100644 --- a/src/views/screenAdaptation/pages/secondPages/top.vue +++ b/src/views/screenAdaptation/pages/secondPages/top.vue @@ -102,14 +102,15 @@ watch: { $route: { handler(val, oldval){ + console.log("val:",val) this.emitRouteChange(val.path); - if (val.path === '/partyCenter/party') { - this.topImgUrl = topImgPartyBuild - this.isPartyCenter = true - } else { - this.topImgUrl = topImg01 - this.isPartyCenter = false - } +// if (val.path === '/partyCenter/party') { +// this.topImgUrl = topImgPartyBuild +// this.isPartyCenter = true +// } else { +// this.topImgUrl = topImg01 +// this.isPartyCenter = false +// } }, // 深度观察监听 deep: true, @@ -137,6 +138,7 @@ methods: { getHref(){ this.href = window.location.hash + console.log(this.$route.path) if (this.href === '#/partyCenter/party') { this.topImgUrl = topImgPartyBuild this.isPartyCenter = true @@ -196,10 +198,12 @@ } }, changeBackImg: function (path) { - if (this.href === '#/partyCenter/party') { + if (path === '/partyCenter/party') { this.topImgUrl = topImgPartyBuild - this.isPartyCenter = true + this.isPartyCenter = true; + this.showWorkBenchButton = false; } else { + this.isPartyCenter = false; if (path.indexOf("workBench") > 0) { //工作台 if (path === "/workBench/application") { diff --git a/src/views/screenAdaptation/utils/imgPreloaderList.js b/src/views/screenAdaptation/utils/imgPreloaderList.js index 0b8fd80..5d6f0d0 100644 --- a/src/views/screenAdaptation/utils/imgPreloaderList.js +++ b/src/views/screenAdaptation/utils/imgPreloaderList.js @@ -4,5 +4,21 @@ export default [ require('../assets/images/secondPageTop01.png'), require('../assets/images/secondPageTop02.png'), - require('../assets/images/topImgPartyBuild.png') + require('../assets/images/topImgPartyBuild.png'), + require('../assets/images/partyImage/party-building.png'), + require('../assets/images/partyImage/party-building-red.png'), + require('../assets/images/partyImage/admin.png'), + require('../assets/images/partyImage/admin-red.png'), + require('../assets/images/partyImage/safe.png'), + require('../assets/images/partyImage/safe-red.png'), + require('../assets/images/partyImage/teaching.png'), + require('../assets/images/partyImage/teaching-red.png'), + require('../assets/images/partyImage/de-yu.png'), + require('../assets/images/partyImage/de-yu-red.png'), + require('../assets/images/partyImage/teacher.png'), + require('../assets/images/partyImage/teacher-red.png'), + require('../assets/images/partyImage/data.png'), + require('../assets/images/partyImage/data-red.png'), + require('../assets/images/partyImage/service.png'), + require('../assets/images/partyImage/service-red.png'), ];