Forráskód Böngészése

疑点筛查跳转时,menu信息添加name。

DESKTOP-6LTVLN7\Liumouren 2 éve
szülő
commit
3678aa18c5

+ 1 - 1
src/components/layout/MenuCard.vue

@@ -196,7 +196,7 @@ export default {
       if (this.menuData != undefined && this.menuData.index != undefined && this.menuData.title != undefined) {
         this.$store.commit("changeLeftMenuTitle", this.menuData.title);
         if (this.menuData.menuIndex != undefined && this.menuData.subMenuIndex != undefined) {
-          this.$store.commit("changeBackMenu", { index: this.menuData.menuIndex, subIndex: this.menuData.subMenuIndex });
+          this.$store.commit("changeBackMenu", { index: this.menuData.menuIndex, subIndex: this.menuData.subMenuIndex ,name: this.menuData.menuName ? this.menuData.menuName : "" });
         }
       }
       if (this.menuData != undefined && this.menuData.gotoPageInfo != undefined) {

+ 4 - 4
src/components/map/BasemapChange.vue

@@ -73,7 +73,7 @@ export default {
       return this.$store.state.baseMapRight;
     },
     menuChange() {
-      return this.$store.state.navSelect.name;
+      return this.$store.state.navSelect;
     },
     baseMapType() {
       return this.$store.state.baseMapType;
@@ -88,15 +88,15 @@ export default {
     },
     menuChange: {
       handler(val) {
-        // console.log(val, "切换底图组件 -- 监听当前菜单");
-        if (val === "镇域专题") {
+        if (val.name === "镇域专题") {
           this.$store.state.baseMapRight = 40;
-        } else if (val === "土地资源") {
+        } else if (val.name === "土地资源") {
           this.$store.state.baseMapRight = 5;
         } else {
           this.$store.state.baseMapRight = 23;
         }
       },
+      deep: true,
       immediate: true,
     },
     baseMapType(val) {

+ 1 - 0
src/views/ComprehensiveAnalysis.vue

@@ -483,6 +483,7 @@ export default {
         this.$store.commit("changeNavSelect", {
           index: this.$store.state.backMenu.index,
           subIndex: this.$store.state.backMenu.subIndex,
+          name: this.$store.state.backMenu.name ? this.$store.state.backMenu.name : ""
         });
       }
     },

+ 5 - 1
src/views/HomeView.vue

@@ -149,7 +149,7 @@
       </MenuCard>
     </div>
     <!-- 全流程管理 4 -->
-    <div id="stepsBox" v-if="$ifMenu('4', '')">
+    <div id="stepsBox" v-show="$ifMenu('4', '')">
       <WholeProcessManagement />
     </div>
     <!-- 底部菜单 2 -- 疑点筛查 -->
@@ -343,6 +343,7 @@ export default {
             imageUrl: "/static/images/2.png",
             menuIndex: "2",
             subMenuIndex: "1",
+            menuName:"土地资源",
             position: "left",
             gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
           },
@@ -355,6 +356,7 @@ export default {
             imageUrl: "/static/images/3.png",
             menuIndex: "2",
             subMenuIndex: "1",
+            menuName:"土地资源",
             position: "left",
             gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
           },
@@ -367,6 +369,7 @@ export default {
             imageUrl: "/static/images/1.png",
             menuIndex: "2",
             subMenuIndex: "1",
+            menuName:"土地资源",
             position: "left",
             gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
           },
@@ -379,6 +382,7 @@ export default {
             imageUrl: "/static/images/4.png",
             menuIndex: "2",
             subMenuIndex: "1",
+            menuName:"土地资源",
             position: "left",
             gotoPageInfo: { index: "3", subIndex: "", name: "综合分析" }
           }