From 55b3c74b68725ff5d78fb57bd0ba12a31551f521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Fri, 25 Oct 2024 16:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E6=90=9C=E7=B4=A2=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |  2 +-
 src/components/NavigationBar/logCentre.vue    | 43 ++++++++++------
 src/components/NavigationBar/peopleCentre.vue |  4 +-
 .../NavigationBar/recycleCentre.vue           | 49 +++++++++++++------
 .../NavigationBar/warningCentre.vue           | 42 ++++++++++------
 5 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 72e838e..689c073 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -221,7 +221,7 @@ aside {
     margin-top: 6.5vh !important;
   }
   .dialog-main {
-    min-height: 700px;
+    min-height: 650px;
     display: flex;
     flex-direction: column;
     background: #031c3c;
diff --git a/src/components/NavigationBar/logCentre.vue b/src/components/NavigationBar/logCentre.vue
index 61c3fcf..6829256 100644
--- a/src/components/NavigationBar/logCentre.vue
+++ b/src/components/NavigationBar/logCentre.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="search-container">
-    <div class="option-rows">
+    <div class="option-rows" v-if="show_shequ_xiaoqu">
       <el-select
         @change="changeSelect($event, 'xiaoquList')"
         v-model="queryParams.shequId"
@@ -67,18 +67,18 @@
       >
         <el-option
           v-for="item in buildingList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.buildingId"
+          :label="item.buildingName"
+          :value="item.buildingId"
         >
         </el-option>
       </el-select>
       <el-select v-model="queryParams.houseid" placeholder="选择住户" clearable>
         <el-option
           v-for="item in houseList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.houseId"
+          :label="item.houseName"
+          :value="item.houseId"
         >
         </el-option>
       </el-select>
@@ -220,7 +220,7 @@
 <script>
 import { getLog, exportLog } from "@/api/home/index.js"; //回收
 import { handleTreeId } from "@/utils/findTreeId.js";
-import { treeselect } from "@/api/system/dept"; //部门
+import { treeselect, getsszxBh } from "@/api/system/dept"; //部门
 import { mapGetters } from "vuex";
 import ColorCell from "@/components/ColorCell";
 
@@ -228,7 +228,7 @@ export default {
   // dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "queryParamsIndex"]),
+    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu"]),
   },
   filters: {
     filterType(target) {
@@ -244,7 +244,7 @@ export default {
   data() {
     return {
       loading: true,
-
+      show_shequ_xiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       tabList: [
@@ -315,8 +315,8 @@ export default {
       ],
     };
   },
-  mounted() {
-    this.queryParams.shequId = this.queryParamsIndex.shequId;
+  created() {
+    // this.queryParams.shequId = this.queryParamsIndex.shequId;
 
     this.getDeptList();
   },
@@ -334,11 +334,18 @@ export default {
     async getDeptList() {
       let result = await treeselect();
       this.deptList = result.data[0].children;
+      this.$nextTick(() => {
+        if (this.$route.path == "/xiaoqu") {
+          this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
+          this.changeSelect(this.queryParams.xiaoquId, "netList");
+          this.show_shequ_xiaoqu = false;
+        }
+      });
     },
     /**
      * 级联筛选
      */
-    changeSelect(e, key) {
+    async changeSelect(e, key) {
       let list = [];
       let index = this.objList.findIndex((item) => item.key == key);
       if (index > -1) {
@@ -347,7 +354,15 @@ export default {
       list.map((item) => {
         this.queryParams[item.value] = undefined;
       });
-      this[key] = handleTreeId(e, this.deptList);
+      if (key == "buildingList" || key == "houseList") {
+        let res = await getsszxBh({
+          deptId: this.queryParams.yuanid,
+          buildingId: this.queryParams.buildingId,
+        });
+        this[key] = res.data;
+      } else {
+        this[key] = handleTreeId(e, this.deptList);
+      }
     },
 
     /**
diff --git a/src/components/NavigationBar/peopleCentre.vue b/src/components/NavigationBar/peopleCentre.vue
index 59faf45..f503f37 100644
--- a/src/components/NavigationBar/peopleCentre.vue
+++ b/src/components/NavigationBar/peopleCentre.vue
@@ -224,7 +224,7 @@ export default {
   },
   data() {
     return {
-      show_shequ_xiaoqu: false,
+      show_shequ_xiaoqu: true,
       show_net: false,
       loading: true,
       currentIndex: 0,
@@ -291,7 +291,7 @@ export default {
       ],
     };
   },
-  mounted() {
+  created() {
     // this.show_shequ_xiaoqu = this.$auth.hasRoleOr(["admin", "leader"]); //超级管理员 - 领导
     // this.show_net = this.$auth.authRoleNet("network"); //网格员
 
diff --git a/src/components/NavigationBar/recycleCentre.vue b/src/components/NavigationBar/recycleCentre.vue
index 5835f0a..ecf3e25 100644
--- a/src/components/NavigationBar/recycleCentre.vue
+++ b/src/components/NavigationBar/recycleCentre.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="search-container">
-    <div class="option-rows">
+    <div class="option-rows" v-if="show_shequ_xiaoqu">
       <el-select
         @change="changeSelect($event, 'xiaoquList')"
         v-model="queryParams.shequId"
@@ -67,18 +67,18 @@
       >
         <el-option
           v-for="item in buildingList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.buildingId"
+          :label="item.buildingName"
+          :value="item.buildingId"
         >
         </el-option>
       </el-select>
       <el-select v-model="queryParams.houseid" placeholder="选择住户" clearable>
         <el-option
           v-for="item in houseList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.houseId"
+          :label="item.houseName"
+          :value="item.houseId"
         >
         </el-option>
       </el-select>
@@ -223,19 +223,24 @@ import {
 } from "@/api/home/index.js"; //回收
 import { addPerson } from "@/api/taicangpop/person";
 import { handleTreeId } from "@/utils/findTreeId.js";
-import { treeselect } from "@/api/system/dept"; //部门
+import { treeselect, getsszxBh } from "@/api/system/dept"; //部门
 import { mapGetters } from "vuex";
 import ColorCell from "@/components/ColorCell";
 export default {
   dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "userId", "queryParamsIndex"]),
+    ...mapGetters([
+      "leftColor",
+      "rightTopColor",
+      "userId",
+      "queryParamsXiaoqu",
+    ]),
   },
   data() {
     return {
       loading: true,
-
+      show_shequ_xiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       // tabList: [
@@ -301,8 +306,8 @@ export default {
       ],
     };
   },
-  mounted() {
-    this.queryParams.shequId = this.queryParamsIndex.shequId;
+  created() {
+    // this.queryParams.shequId = this.queryParamsIndex.shequId;
     this.getDeptList();
   },
   methods: {
@@ -340,12 +345,18 @@ export default {
     async getDeptList() {
       let result = await treeselect();
       this.deptList = result.data[0].children;
-      // console.log(result);
+      this.$nextTick(() => {
+        if (this.$route.path == "/xiaoqu") {
+          this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
+          this.changeSelect(this.queryParams.xiaoquId, "netList");
+          this.show_shequ_xiaoqu = false;
+        }
+      });
     },
     /**
      * 级联筛选
      */
-    changeSelect(e, key) {
+    async changeSelect(e, key) {
       let list = [];
       let index = this.objList.findIndex((item) => item.key == key);
       if (index > -1) {
@@ -354,7 +365,15 @@ export default {
       list.map((item) => {
         this.queryParams[item.value] = undefined;
       });
-      this[key] = handleTreeId(e, this.deptList);
+      if (key == "buildingList" || key == "houseList") {
+        let res = await getsszxBh({
+          deptId: this.queryParams.yuanid,
+          buildingId: this.queryParams.buildingId,
+        });
+        this[key] = res.data;
+      } else {
+        this[key] = handleTreeId(e, this.deptList);
+      }
     },
 
     /**
diff --git a/src/components/NavigationBar/warningCentre.vue b/src/components/NavigationBar/warningCentre.vue
index 2e10f2d..0c7ac95 100644
--- a/src/components/NavigationBar/warningCentre.vue
+++ b/src/components/NavigationBar/warningCentre.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="search-container">
-    <div class="option-rows">
+    <div class="option-rows" v-if="show_shequ_xiaoqu">
       <el-select
         @change="changeSelect($event, 'xiaoquList')"
         v-model="queryParams.shequId"
@@ -67,18 +67,18 @@
       >
         <el-option
           v-for="item in buildingList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.buildingId"
+          :label="item.buildingName"
+          :value="item.buildingId"
         >
         </el-option>
       </el-select>
       <el-select v-model="queryParams.houseid" placeholder="选择住户" clearable>
         <el-option
           v-for="item in houseList"
-          :key="item.id"
-          :label="item.label"
-          :value="item.id"
+          :key="item.houseId"
+          :label="item.houseName"
+          :value="item.houseId"
         >
         </el-option>
       </el-select>
@@ -215,7 +215,7 @@
 <script>
 import { getWarningList } from "@/api/home/index.js"; //预警
 import { handleTreeId } from "@/utils/findTreeId.js";
-import { treeselect } from "@/api/system/dept"; //部门
+import { treeselect, getsszxBh } from "@/api/system/dept"; //部门
 import { mapGetters } from "vuex";
 import ColorCell from "@/components/ColorCell";
 import { exportyujing } from "@/api/home/index.js"; //预警
@@ -223,12 +223,12 @@ export default {
   dicts: ["b_color_type"],
   components: { ColorCell },
   computed: {
-    ...mapGetters(["leftColor", "rightTopColor", "queryParamsIndex"]),
+    ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu"]),
   },
   data() {
     return {
       loading: true,
-
+      show_shequ_xiaoqu: true,
       currentIndex: 0,
       credentialnoType: 0,
       tabList: [
@@ -294,8 +294,7 @@ export default {
       ],
     };
   },
-  mounted() {
-    this.queryParams.shequId = this.queryParamsIndex.shequId;
+  created() {
     this.getDeptList();
   },
   methods: {
@@ -304,11 +303,18 @@ export default {
       let result = await treeselect();
       this.deptList = result.data[0].children;
       // console.log(result);
+      this.$nextTick(() => {
+        if (this.$route.path == "/xiaoqu") {
+          this.queryParams.xiaoquId = this.queryParamsXiaoqu.xiaoquId;
+          this.changeSelect(this.queryParams.xiaoquId, "netList");
+          this.show_shequ_xiaoqu = false;
+        }
+      });
     },
     /**
      * 级联筛选
      */
-    changeSelect(e, key) {
+    async changeSelect(e, key) {
       let list = [];
       let index = this.objList.findIndex((item) => item.key == key);
       if (index > -1) {
@@ -317,7 +323,15 @@ export default {
       list.map((item) => {
         this.queryParams[item.value] = undefined;
       });
-      this[key] = handleTreeId(e, this.deptList);
+      if (key == "buildingList" || key == "houseList") {
+        let res = await getsszxBh({
+          deptId: this.queryParams.yuanid,
+          buildingId: this.queryParams.buildingId,
+        });
+        this[key] = res.data;
+      } else {
+        this[key] = handleTreeId(e, this.deptList);
+      }
     },
 
     /**