楼栋图例/修复城北社区四个搜索中心没有条件过滤

src/assets/styles/map.scss

@@ -413,3 +413,6 @@
     font-size: 14px;
   }
 }
+.popperclass {
+  background: transparent !important;
+}

src/components/NavigationBar/index.vue

@@ -137,11 +137,12 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(["name", "yjTotal"]),
+    ...mapGetters(["name", "yjTotal", "dept"]),
     handlerBtn() {
       return (
         this.$route.name == "xiaoqu" &&
-        this.$auth.hasRoleOr(["admin", "leader"])
+        (this.$auth.hasRoleOr(["admin", "leader"]) ||
+          (this.$auth.hasRoleOr(["xiaoqu"]) && this.dept.xiaoquId == 238))
       );
     },
   },

src/components/NavigationBar/logCentre.vue

@@ -6,6 +6,7 @@
         v-model="queryParams.shequId"
         placeholder="选择社区"
         clearable
+        v-show="deptXiaoqu"
       >
         <el-option
           v-for="item in deptList"
@@ -279,7 +280,7 @@ export default {
   // dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu"]),
+    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu", "dept"]),
   },
   filters: {
     filterType(target) {
@@ -298,6 +299,7 @@ export default {
       infoData: {},
       loading: true,
       show_shequ_xiaoqu: true,
+      deptXiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       tabList: [
@@ -400,6 +402,10 @@ export default {
           this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
           this.changeSelect(this.queryParams.xiaoquId, "netList");
           this.show_shequ_xiaoqu = false;
+        } else if (this.$route.query.deptId) {
+          this.queryParams.shequId = this.dept.xiaoquId;
+          this.deptXiaoqu = false;
+          this.changeSelect(this.queryParams.shequId, "xiaoquList");
         }
       });
     },
@@ -494,7 +500,9 @@ export default {
       this.timer = "";
       this.queryParams.mark = "";
       this.queryParams.type = undefined;
-      this.queryParams.shequId = undefined;
+      this.queryParams.shequId = this.deptXiaoqu
+        ? undefined
+        : this.dept.xiaoquId;
       this.queryParams.xiaoquId =
         this.$route.path == "/xiaoqu"
           ? this.queryParamsXiaoqu.xiaoquId

src/components/NavigationBar/peopleCentre.vue

@@ -6,6 +6,7 @@
         v-model="queryParams.shequId"
         placeholder="选择社区"
         clearable
+        v-show="deptXiaoqu"
       >
         <el-option
           v-for="item in deptList"
@@ -283,13 +284,14 @@ export default {
   dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu"]),
+    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu", "dept"]),
   },
   data() {
     return {
       openInfo: false,
       infoData: {},
       show_shequ_xiaoqu: true,
+      deptXiaoqu: true,
       show_net: false,
       loading: true,
       currentIndex: 0,
@@ -301,9 +303,9 @@ export default {
       ],
       optionList: [
         { name: "完整身份证号", value: 0 },
-        // { name: "省级(前2位)", value: 1 },
+        { name: "省级(前2位)", value: 1 },
-        // { name: "市级(前4位)", value: 2 },
+        { name: "市级(前4位)", value: 2 },
-        // { name: "县级(前6位)", value: 3 },
+        { name: "县级(前6位)", value: 3 },
       ],
       isCheck: [],
       isList: [
@@ -387,6 +389,10 @@ export default {
           this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
           this.changeSelect(this.queryParams.xiaoquId, "netList");
           this.show_shequ_xiaoqu = false;
+        } else if (this.$route.query.deptId) {
+          this.queryParams.shequId = this.dept.xiaoquId;
+          this.deptXiaoqu = false;
+          this.changeSelect(this.queryParams.shequId, "xiaoquList");
         }
       });
     },
@@ -488,7 +494,9 @@ export default {
       this.keyWord = "";
       this.credentialnoType = 0;
       this.queryParams.type = undefined;
-      this.queryParams.shequId = undefined;
+      this.queryParams.shequId = this.deptXiaoqu
+        ? undefined
+        : this.dept.xiaoquId;
       this.queryParams.xiaoquId =
         this.$route.path == "/xiaoqu"
           ? this.queryParamsXiaoqu.xiaoquId

src/components/NavigationBar/recycleCentre.vue

@@ -6,6 +6,7 @@
         v-model="queryParams.shequId"
         placeholder="选择社区"
         clearable
+        v-show="deptXiaoqu"
       >
         <el-option
           v-for="item in deptList"
@@ -289,6 +290,7 @@ export default {
       "rightTopColor",
       "userId",
       "queryParamsXiaoqu",
+      "dept",
     ]),
   },
   data() {
@@ -297,6 +299,7 @@ export default {
       infoData: {},
       loading: true,
       show_shequ_xiaoqu: true,
+      deptXiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       // tabList: [
@@ -411,6 +414,10 @@ export default {
           this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
           this.changeSelect(this.queryParams.xiaoquId, "netList");
           this.show_shequ_xiaoqu = false;
+        } else if (this.$route.query.deptId) {
+          this.queryParams.shequId = this.dept.xiaoquId;
+          this.deptXiaoqu = false;
+          this.changeSelect(this.queryParams.shequId, "xiaoquList");
         }
       });
     },
@@ -504,7 +511,9 @@ export default {
       this.credentialnoType = 0;
       this.queryParams.mark = "";
       // this.queryParams.type = undefined;
-      this.queryParams.shequId = undefined;
+      this.queryParams.shequId = this.deptXiaoqu
+        ? undefined
+        : this.dept.xiaoquId;
       this.queryParams.xiaoquId =
         this.$route.path == "/xiaoqu"
           ? this.queryParamsXiaoqu.xiaoquId

src/components/NavigationBar/warningCentre.vue

@@ -6,6 +6,7 @@
         v-model="queryParams.shequId"
         placeholder="选择社区"
         clearable
+        v-show="deptXiaoqu"
       >
         <el-option
           v-for="item in deptList"
@@ -284,7 +285,7 @@ export default {
   dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu"]),
+    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu", "dept"]),
   },
   data() {
     return {
@@ -292,6 +293,7 @@ export default {
       infoData: {},
       loading: true,
       show_shequ_xiaoqu: true,
+      deptXiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       tabList: [
@@ -382,6 +384,10 @@ export default {
           this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
           this.changeSelect(this.queryParams.xiaoquId, "netList");
           this.show_shequ_xiaoqu = false;
+        } else if (this.$route.query.deptId) {
+          this.queryParams.shequId = this.dept.xiaoquId;
+          this.deptXiaoqu = false;
+          this.changeSelect(this.queryParams.shequId, "xiaoquList");
         }
       });
     },
@@ -475,7 +481,9 @@ export default {
       this.credentialnoType = 0;
       this.queryParams.mark = "";
       // this.queryParams.type = undefined;
-      this.queryParams.shequId = undefined;
+      this.queryParams.shequId = this.deptXiaoqu
+        ? undefined
+        : this.dept.xiaoquId;
       this.queryParams.xiaoquId =
         this.$route.path == "/xiaoqu"
           ? this.queryParamsXiaoqu.xiaoquId

src/components/imageButton/index.vue

@@ -40,4 +40,7 @@ export default {
 .mini {
   padding: 2px 11px 4px 11px;
 }
+.medium {
+  padding: 4px 16px 6px 16px;
+}
 </style>

src/views/components/foldPaneBottom/index.vue

@@ -11,6 +11,19 @@
           alt=""
         />
       </div>
+      <div class="fold-buttom">
+        <!-- @handlerClcik="lookSocialSecurity(item.id)" -->
+        <el-tooltip
+          placement="left-start"
+          popper-class="popperclass"
+          :visible-arrow="false"
+        >
+          <div slot="content" class="legend-img"></div>
+          <imageButton size="medium" v-show="queryParamsXiaoqu.buildingId"
+            >查看图例</imageButton
+          >
+        </el-tooltip>
+      </div>
       <div :class="['panel-main', { collapsed: panel.bottomPanel }]">
         <slot></slot>
       </div>
@@ -25,7 +38,7 @@ export default {
     return {};
   },
   computed: {
-    ...mapGetters(["panel"]),
+    ...mapGetters(["panel", "queryParamsXiaoqu"]),
   },
 
   created() {},
@@ -61,6 +74,12 @@ export default {
         width: 100%;
       }
     }
+    .fold-buttom {
+      position: absolute;
+      top: 6px;
+      right: 10px;
+    }
+
     .panel-main {
       position: relative;
       width: 100%;
@@ -76,4 +95,11 @@ export default {
     }
   }
 }
+
+.legend-img {
+  height: 500px;
+  width: 400px;
+  background: url("~@/assets/images/ui/legend.png");
+  background-size: 100% 100%;
+}
 </style>

src/views/components/xiaoqu/bottomList.vue

@@ -134,9 +134,9 @@ export default {
     "queryParamsXiaoqu.type"(newValue, oldValue) {
       this.handleChange();
     },
-    // "queryParamsXiaoqu.buildingId"(newValue, oldValue) {
+    "queryParamsXiaoqu.buildingId"(newValue, oldValue) {
-    //   this.handleChange();
+      this.handleChange();
-    // },
+    },
   },
   created() {
     this.handleChange();
@@ -154,7 +154,7 @@ export default {
     handleChange(newValue) {
       this.reset();
       this.queryParams = { ...this.queryParams, ...this.queryParamsXiaoqu };
-      this.queryParams.buildingId = undefined;
+      // this.queryParams.buildingId = undefined;
       // this.queryParams.deptId = undefined;
       this.disabled = false;
       this.load();