小区页面重置

src/assets/styles/index.scss

@@ -203,9 +203,6 @@ aside {
     color: #fff;
   }
 
-  .el-badge__content.is-fixed {
-    z-index: 10;
-  }
   .el-dialog {
     background: transparent;
   }
@@ -249,6 +246,9 @@ aside {
     justify-content: center;
   }
 }
+.el-badge__content.is-fixed {
+  z-index: 500 !important;
+}
 .taicang-dialog-small {
   width: 850px !important;
   .dialog-main {

src/components/NavigationBar/index.vue

@@ -19,7 +19,7 @@
         <div class="sub-title" :text="subTitle">{{ subTitle }}</div>
       </div>
       <div class="navigation-right">
-        <div class="reset" v-show="showRight"></div>
+        <div class="reset" v-show="showRight" @click="reset()"></div>
 
         <el-button
           type="text"
@@ -119,7 +119,9 @@ export default {
       this.title = title;
       this.open = true;
     },
-
+    reset() {
+      this.$emit("reset");
+    },
     goSteam() {
       this.$router.push("/system/user");
     },
@@ -198,6 +200,7 @@ export default {
     flex-direction: row-reverse;
     align-items: flex-start;
     .reset {
+      cursor: pointer;
       height: 41px;
       width: 58px;
       background: url("~@/assets/images/ui/reset.png");

src/store/getters.js

@@ -32,5 +32,6 @@ const getters = {
   houseItem: (state) => state.xiaoqu.houseItem,
   refreshBuild: (state) => state.xiaoqu.refreshBuild,
   personNum: (state) => state.xiaoqu.personNum,
+  resetBtn: (state) => state.xiaoqu.reset,
 };
 export default getters;

src/store/modules/xiaoqu.js

@@ -1,26 +1,25 @@
 import { listDept } from "@/api/system/dept.js";
 import { listBuilding } from "@/api/taicangpop/building.js";
+
 const xiaoqu = {
   state: {
     //页面接口参数
     queryParmas: {},
-    mapParmas: {
+    mapParmas: {},
-      sd: false,
-      networkName: undefined,
-    },
     netWorkintroduce: {},
     panel: {},
     houseItem: {},
     refreshBuild: 1,
-    personNum: {
+    personNum: {},
-      zz: 0,
+    reset: false,
-      cz: 0,
-    },
   },
   mutations: {
     SET_PERSON_NUM: (state, data) => {
       state.personNum = data;
     },
+    SET_RESET: (state, boole) => {
+      state.reset = boole;
+    },
     SET_REFRESH: (state, refresh) => {
       state.refreshBuild = refresh;
     },
@@ -87,6 +86,10 @@ const xiaoqu = {
         isx: undefined,
         isj: undefined,
       };
+      state.mapParmas = {
+        sd: false,
+        networkName: undefined,
+      };
       state.houseItem = {};
       state.refreshBuild = 1;
       state.personNum = {

src/views/components/xiaoqu/building.vue

@@ -216,7 +216,7 @@ export default {
   .building-house-container {
     padding-top: 85px;
     position: relative;
-    //min-width: 135px;
+    min-width: 300px;
     // max-width: 700px;
     // overflow-x: auto;
     // overflow-y: hidden;
@@ -226,8 +226,8 @@ export default {
     background-size: cover;
     .building-name {
       position: absolute;
-      left: 100px;
+      left: 90px;
-      top: 25px;
+      top: 30px;
       min-width: 170px;
       height: 32px;
       text-align: center;

src/views/components/xiaoqu/house.vue

@@ -437,7 +437,10 @@ export default {
   watch: {
     houseItem: {
       handler(val) {
-        if (!val.id) return;
+        if (!val.id) {
+          this.show = false;
+          return;
+        }
         this.getPersonList();
       },
       deep: true,

src/views/components/xiaoqu/map/index.vue

@@ -20,6 +20,7 @@ export default {
   computed: {
     ...mapGetters(["mapParmas"]),
   },
+
   data() {
     const basePathUrl = window.basePathUrl || "";
     return {

src/views/components/xiaoqu/mapSearchBox.vue

@@ -42,7 +42,11 @@
       <!-- disabled -->
     </el-checkbox-group>
 
-    <el-checkbox label="三维图层" @change="handleMapLayer"></el-checkbox>
+    <el-checkbox
+      v-model="model"
+      label="三维图层"
+      @change="handleMapLayer"
+    ></el-checkbox>
     <el-checkbox
       v-show="queryParamsXiaoqu.xiaoquId == 267"
       label="进入商铺系统"
@@ -58,11 +62,13 @@ import { mapGetters } from "vuex";
 export default {
   dicts: ["b_color_type"],
   computed: {
-    ...mapGetters(["mapParmas", "queryParamsXiaoqu"]),
+    ...mapGetters(["mapParmas", "queryParamsXiaoqu", "resetBtn"]),
   },
+
   data() {
     return {
       checkList: [],
+      model: false,
       networkOption: [],
       multipleList: [
         { key: "type", label: "户籍", value: 1 },
@@ -86,7 +92,28 @@ export default {
   created() {
     this.getNetworkList();
   },
+  watch: {
+    resetBtn(newValue, oldValue) {
+      if (newValue) {
+        this.handleReset();
+        console.log("重置");
+      }
+    },
+  },
   methods: {
+    handleReset() {
+      this.model = false;
+      this.checkList = [];
+      this.queryParmas = {
+        parentid: undefined,
+        color: undefined,
+        type: undefined,
+        isd: undefined,
+        isk: undefined,
+        isx: undefined,
+        isj: undefined,
+      };
+    },
     goShopPath() {
       this.$router.push({
         path: "/shop",

src/views/xiaoqu.vue

@@ -3,6 +3,7 @@
     <NavigationBar
       :mainTitle="xiaoquIntroduce.deptName + '人口数据管理系统'"
       :showStreet="false"
+      @reset="clickReset"
     ></NavigationBar>
     <mapSearchBox />
     <mars-map ref="map" :xiaoquId="queryParamsXiaoqu.xiaoquId"></mars-map>
@@ -51,6 +52,7 @@ import {
   building,
   house,
 } from "@/views/components/index.js";
+import { set } from "nprogress";
 export default {
   data() {
     return {};
@@ -74,17 +76,27 @@ export default {
     ...mapGetters(["xiaoquIntroduce", "queryParamsXiaoqu"]),
   },
   created() {
-    this.$store.commit("RESET_QUERY"); //重置参数
+    this.pageCreated();
-    let id = this.$route.query.xiaoquId;
-    this.$store.commit("CHANGE_QUERY", { xiaoquId: parseInt(id) }); //存储全局参数
-    this.$store.commit("SET_QUERY_PARAMS", {
-      xiaoquId: parseInt(id),
-    });
-    this.$store.dispatch("GetYjtotal", {
-      xiaoquId: id,
-    }); //预警总数
   },
   methods: {
+    pageCreated() {
+      this.$store.commit("RESET_QUERY"); //重置参数
+      let id = this.$route.query.xiaoquId;
+      this.$store.commit("CHANGE_QUERY", { xiaoquId: parseInt(id) }); //存储全局参数
+      this.$store.commit("SET_QUERY_PARAMS", {
+        xiaoquId: parseInt(id),
+      });
+      this.$store.dispatch("GetYjtotal", {
+        xiaoquId: id,
+      }); //预警总数
+    },
+    clickReset() {
+      this.$store.commit("SET_RESET", true);
+      this.pageCreated();
+      setTimeout(() => {
+        this.$store.commit("SET_RESET", false);
+      }, 1500);
+    },
     filterTitle() {
       return !this.queryParamsXiaoqu.parentid &&
         !this.queryParamsXiaoqu.buildingId