合并songzhen分支代码

src/components/Tree/nodeWrap.vue

@@ -134,11 +134,13 @@ export default {
 
     getHomeTypes(id) {
       this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${"1495582904602800129"}`).then((res) => {
-        const { code, data } = res.data;
+        const { code, msg, data } = res.data;
         if (code === 0) {
           const newItem = data[0];
           const itemNumOne = Object.keys(newItem).filter((key) => newItem[key] === 1);
           this.homeTypeArr = itemNumOne;
+        } else {
+          this.$message.error(msg);
         }
       });
     },

src/views/dataBoard/cpts/map/index.vue

@@ -281,13 +281,13 @@ export default {
       if (mapType != "qq") {
         myMap = new Map({
           center: iniCenter,
-          mapStyle: 'amap://styles/darkblue',
+          mapStyle: "amap://styles/darkblue",
           zoom: 18,
         });
       } else {
         myMap = new GaodeMap({
           //   pitch: this.pitch,
-          mapStyle: 'amap://styles/darkblue',
+          mapStyle: "amap://styles/darkblue",
           // style: styleConfig.style,
           center: iniCenter,
           token: "fc14b42e0ca18387866d68ebd4f150c1",
@@ -521,6 +521,7 @@ export default {
         });
       });
       polygonLayer.on("click", (e) => {
+        console.log("e", e);
         this.$emit("clickAgency", e.feature.properties);
       });
 
@@ -850,7 +851,7 @@ export default {
     z-index: 100;
   }
   /deep/ .l7-popup-content {
-    background: rgba(#020340, 0.58);
+    background: rgba(#fff, 1);
     box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1);
   }
   /deep/ .l7-popup-close-button {

src/views/dataBoard/organizational/dangTree/index.vue

@@ -68,21 +68,19 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http
-        .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
-        .then((res) => {
-          const {
-            data: { code, data },
-          } = res;
-          if (code === 0) {
-            this.nodeConfig = data[0];
-            this.getDataPLevel(data);
-            this.loading = false;
-          }
-        })
-        .catch(() => {
+      this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+        const {
+          data: { code, msg, data },
+        } = res;
+        if (code === 0) {
+          this.nodeConfig = data[0];
+          this.getDataPLevel(data);
           this.loading = false;
-        });
+        } else {
+          this.loading = false;
+          this.$message.error(msg);
+        }
+      });
     },
 
     getTitleNameMapFun(i) {

src/views/dataBoard/organizational/gridTree/index.vue

@@ -72,21 +72,19 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http
-        .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
-        .then((res) => {
-          const {
-            data: { code, data },
-          } = res;
-          if (code === 0) {
-            this.nodeConfig = data[0];
-            this.getDataPLevel(data);
-            this.loading = false;
-          }
-        })
-        .catch(() => {
+      this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+        const {
+          data: { code, msg, data },
+        } = res;
+        if (code === 0) {
+          this.nodeConfig = data[0];
+          this.getDataPLevel(data);
           this.loading = false;
-        });
+        } else {
+          this.loading = false;
+          this.$message.error(msg);
+        }
+      });
     },
 
     getTitleNameMapFun(i) {

src/views/dataBoard/organizational/jwTree/index.vue

@@ -74,21 +74,19 @@ export default {
     //获取树状结构
     getTreeData() {
       this.loading = true;
-      this.$http
-        .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
-        .then((res) => {
-          const {
-            data: { code, data },
-          } = res;
-          if (code === 0) {
-            this.nodeConfig = data[0];
-            this.getDataPLevel(data);
-            this.loading = false;
-          }
-        })
-        .catch(() => {
+      this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => {
+        const {
+          data: { code, msg, data },
+        } = res;
+        if (code === 0) {
+          this.nodeConfig = data[0];
+          this.getDataPLevel(data);
           this.loading = false;
-        });
+        } else {
+          this.loading = false;
+          this.$message.error(msg);
+        }
+      });
     },
 
     getTitleNameMapFun(i) {

src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue

@@ -191,32 +191,28 @@ export default {
 
     getDetailsData(id) {
       this.loading = true;
-      this.$http
-        .post("/governance/icEvent/detail", { icEventId: id })
-        .then((res) => {
-          const { code, data } = res.data;
-          if (code === 0) {
-            this.item = data;
-          }
-        })
-        .catch((res) => {
+      this.$http.post("/governance/icEvent/detail", { icEventId: id }).then((res) => {
+        const { code, data, msg } = res.data;
+        if (code === 0) {
+          this.item = data;
+        } else {
           this.loading = false;
-        });
+          this.$message.error(msg);
+        }
+      });
     },
 
     getProcessData(id) {
-      this.$http
-        .post("/governance/icEvent/process", { icEventId: id })
-        .then((res) => {
-          const { code, data } = res.data;
-          if (code === 0) {
-            this.activities = data;
-            this.loading = false;
-          }
-        })
-        .catch((err) => {
+      this.$http.post("/governance/icEvent/process", { icEventId: id }).then((res) => {
+        const { code, data, msg } = res.data;
+        if (code === 0) {
+          this.activities = data;
+          this.loading = false;
+        } else {
           this.loading = false;
-        });
+          this.$message.error(msg);
+        }
+      });
     },
 
     // /governance/icEvent/detail

src/views/dataBoard/organizational/microgrid/index.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="list" :loading="loading">
+      <el-table :data="list" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
         <el-table-column label="序号" type="index" width="80" />
         <!-- 上报事件 -->
         <template v-if="otherTabel === 'sbsj'">
@@ -108,7 +108,7 @@ export default {
       breadcrumbList: [
         {
           path: "/organizational/gridTree",
-          name: "组织架构",
+          name: "网格架构",
         },
         {
           path: "",
@@ -178,16 +178,19 @@ export default {
     },
     close(flag) {
       this.showDialog = flag;
+      this.rowId = null;
     },
     closeEvent(flag) {
       this.showDialogEvent = flag;
+      this.rowId = null;
     },
     closeSaft(flag) {
       this.showDialogSaft = flag;
+      this.rowId = null;
     },
     handleView(row) {
       this.rowId = row.id;
-      if (this.itemNav === 1) {
+      if (this.itemNav === 1 || this.itemNav === 2) {
         this.showDialogEvent = true;
       }
       if (this.itemNav === 3) {