Merge branch 'jw_feature_songzhen' of http://120.46.222.128:10021/elink-star/epmet-work-pc into jw_feature_dev

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

@@ -707,12 +707,13 @@ export default {
       }
     },
 
-    async getInfo() {
+    async getInfo(val) {
       const url = "resident_info";
       this.loading = true;
       const { data, code, msg } = await requestPostBi(url, {
         queryParam: {
-          resident_id: 1001001,
+          resident_id: val,
+          // 1001001
         },
       });
       if (code === 0) {
@@ -809,7 +810,6 @@ export default {
             { type: "operate", list: ["查看"] },
           ];
         });
-
       } else {
         this.$message.error(msg);
       }

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

@@ -1,9 +1,9 @@
 <template>
   <Dialog title="事件详情" @close="handleClose">
     <template>
-      <div class="eventWrap" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
+      <div class="eventWrap">
         <el-row :gutter="32">
-          <el-col :span="13" style="padding-left: 40px">
+          <el-col :span="13" style="padding-left: 40px" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
             <div class="leftEvent">
               <div class="eventDetails">事件详情</div>
               <div class="eventItem">
@@ -54,7 +54,7 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="11">
+          <el-col :span="11" v-loading="loading1" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
             <div class="rightEvent m-info">
               <div class="eventDetails">办理进展</div>
               <!-- <el-timeline class="timeline" :reverse="true">
@@ -157,6 +157,7 @@ export default {
     return {
       item: {},
       loading: false,
+      loading1: false,
       activities: [],
     };
   },
@@ -195,6 +196,7 @@ export default {
         const { code, data, msg } = res.data;
         if (code === 0) {
           this.item = data;
+          this.loading = false;
         } else {
           this.loading = false;
           this.$message.error(msg);
@@ -207,16 +209,13 @@ export default {
         const { code, data, msg } = res.data;
         if (code === 0) {
           this.activities = data;
-          this.loading = false;
+          this.loading1 = false;
         } else {
-          this.loading = false;
+          this.loading1 = false;
           this.$message.error(msg);
         }
       });
     },
-
-    // /governance/icEvent/detail
-    // /governance/icEvent/process
   },
 };
 </script>

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

@@ -146,10 +146,10 @@ export default {
     getList() {
       this.loading = true;
       const getUrl = new Map([
-        ["sbsj", `/gov/org/organizational/neighborhood/getBuildingUnitLevelEvent?unitId=1634090229723381761`],
-        ["jmxq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelUserDemand?unitId=1565599676446027778`],
-        ["tzrq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelCtp?unitId=1483661223332417537`],
-        ["aqyh", `/gov/org/organizational/neighborhood/getEnterprisePatrolRecord?unitId=f896b59f3cddf1f54280546d79803652`],
+        ["sbsj", `/gov/org/organizational/neighborhood/getBuildingUnitLevelEvent?unitId=${this.paramsData.id}`],
+        ["jmxq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelUserDemand?unitId=${this.paramsData.id}`],
+        ["tzrq", `/gov/org/organizational/neighborhood/getBuildingUnitLevelCtp?unitId=${this.paramsData.id}`],
+        ["aqyh", `/gov/org/organizational/neighborhood/getEnterprisePatrolRecord?unitId=${this.paramsData.id}`],
       ]);
       const url = getUrl.get(this.otherTabel);
       // unitId=${this.paramsData.id}