微网格列表接口对接

src/components/GridTree/nodeWrap.vue

@@ -30,7 +30,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'">
-                    <div @click="gotoPersonnel" class="dyzxh" :title="item.name">
+                    <div @click="gotoPersonnel(item)" class="dyzxh" :title="item.name">
                       {{ spliceNameFun(item.name, 3) }}
                     </div>
                   </div>
@@ -74,8 +74,24 @@ export default {
       return row;
     },
 
-    gotoPersonnel() {
-      this.$router.push("/organizational/microgrid");
+    findParentParentId(nodeConfig, pid) {
+      let parentParentId = "";
+      if (nodeConfig.id === pid) {
+        return nodeConfig.pid;
+      } else {
+        if (nodeConfig.children && nodeConfig.children.length > 0) {
+          for (let i = 0; i < nodeConfig.children.length; i++) {
+            parentParentId = this.findParentParentId(nodeConfig.children[i], pid);
+            if (parentParentId) {
+              return parentParentId;
+            }
+          }
+        }
+      }
+    },
+    gotoPersonnel(item) {
+      const grandPid = this.findParentParentId(this.nodeConfig, item.pid);
+      this.$router.push(`/organizational/microgrid/${item.id}/${grandPid}`);
     },
   },
 };

src/router/index.js

@@ -411,7 +411,7 @@ export const dataBoardRoutes = {
       },
     },
     {
-      path: "/organizational/microgrid",
+      path: "/organizational/microgrid/:id/:pid",
       props: true,
       component: () => import("@/views/dataBoard/organizational/microgrid/index"),
       name: "Microgrid",

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

@@ -70,7 +70,7 @@ export default {
     getTreeData() {
       this.loading = true;
       this.$http
-        .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName}`)
+        .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
         .then((res) => {
           const {
             data: { code, data },

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

@@ -73,7 +73,7 @@ export default {
     getTreeData() {
       this.loading = true;
       this.$http
-        .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName}`)
+        .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
         .then((res) => {
           const {
             data: { code, data },

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

@@ -76,7 +76,7 @@ export default {
     getTreeData() {
       this.loading = true;
       this.$http
-        .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName}`)
+        .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`)
         .then((res) => {
           const {
             data: { code, data },

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

@@ -81,16 +81,15 @@
 import Dialog from "@/components/Dialog/index.vue";
 
 export default {
-  name: "residentDetails",
+  name: "ReportAnEvent",
+  components: { Dialog },
   props: {
-    resiId: {
+    id: {
       type: String,
       default: "",
     },
   },
 
-  components: { Dialog },
-
   data() {
     return {
       activities: [
@@ -114,13 +113,38 @@ export default {
   },
 
   computed: {},
-
+  watch: {
+    id: {
+      handler(val) {
+        if (val) {
+          this.getDetailsData(val);
+          this.getProcessData(val);
+        }
+      },
+      immediate: true,
+    },
+  },
   mounted() {},
 
   methods: {
     handleClose() {
       this.$emit("close", false);
     },
+
+    getDetailsData(id) {
+      this.$http.post("/governance/icEvent/detail", { icEventId: id }).then((res) => {
+        console.log(res);
+      });
+    },
+
+    getProcessData(id) {
+      this.$http.post("/governance/icEvent/process", { icEventId: id }).then((res) => {
+        console.log(res);
+      });
+    },
+
+    // /governance/icEvent/detail
+    // /governance/icEvent/process
   },
 };
 </script>

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

@@ -13,44 +13,44 @@
         <el-table-column label="序号" type="index" width="80" />
         <!-- 上报事件 -->
         <template v-if="otherTabel === 'sbsj'">
-          <el-table-column prop="name" label="事件类型" />
-          <el-table-column prop="address" label="事件描述" />
-          <el-table-column prop="address" label="办理情况" />
-          <el-table-column prop="address" label="上报时间" />
+          <el-table-column prop="categoryName" label="事件类型" />
+          <el-table-column prop="addeventContentress" label="事件描述" />
+          <el-table-column prop="status" label="办理情况" />
+          <el-table-column prop="happenTime" label="上报时间" />
         </template>
 
         <!-- 居民需求 -->
         <template v-if="otherTabel === 'jmxq'">
-          <el-table-column prop="name" label="需求类型" />
-          <el-table-column prop="address" label="需求描述" />
-          <el-table-column prop="address" label="办理情况" />
-          <el-table-column prop="address" label="上报时间" />
+          <el-table-column prop="categoryName" label="需求类型" />
+          <el-table-column prop="content" label="需求描述" />
+          <el-table-column prop="status" label="办理情况" />
+          <el-table-column prop="reportTime" label="上报时间" />
         </template>
         <!-- 统治人群 -->
         <template v-if="otherTabel === 'tzrq'">
-          <el-table-column prop="name" label="所属组织" />
-          <el-table-column prop="address" label="所属网格" />
-          <el-table-column prop="address" label="所属家庭" />
-          <el-table-column prop="address" label="姓名" />
-          <el-table-column prop="address" label="联系电话" />
-          <el-table-column prop="address" label="性别" />
-          <el-table-column prop="address" label="证件号" />
-          <el-table-column prop="address" label="人员类别" />
-          <el-table-column prop="address" label="备注" />
+          <el-table-column prop="organizationName" label="所属组织" />
+          <el-table-column prop="gridName" label="所属网格" />
+          <el-table-column prop="familyName" label="所属家庭" />
+          <el-table-column prop="name" label="姓名" />
+          <el-table-column prop="mobile" label="联系电话" />
+          <el-table-column prop="gender" label="性别" />
+          <el-table-column prop="idNum" label="证件号" />
+          <el-table-column prop="categoryType" label="人员类别" />
+          <el-table-column prop="remark" label="备注" />
         </template>
         <!-- 安全隐患 -->
         <template v-if="otherTabel === 'aqyh'">
-          <el-table-column prop="name" label="场所名称" />
-          <el-table-column prop="address" label="巡查时间" />
-          <el-table-column prop="address" label="巡查人员" />
-          <el-table-column prop="address" label="联系电话" />
-          <el-table-column prop="address" label="隐患明细" />
-          <el-table-column prop="address" label="图片" />
-          <el-table-column prop="address" label="拟复查时间" />
+          <el-table-column prop="placeOrgName" label="场所名称" />
+          <el-table-column prop="patrolTime" label="巡查时间" />
+          <el-table-column prop="staffName" label="巡查人员" />
+          <el-table-column prop="mobile" label="联系电话" />
+          <el-table-column prop="detailed" label="隐患明细" />
+          <el-table-column prop="attachmentUrl" label="图片" />
+          <el-table-column prop="reviewTime" label="拟复查时间" />
         </template>
         <el-table-column label="操作" width="90" align="center">
-          <template slot-scope="data">
-            <el-button type="text" @click="handleView">查看</el-button>
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleView(scope.row)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,7 +59,7 @@
       <same-dialog @close="close" />
     </div>
     <div v-if="showDialogEvent">
-      <report-an-event @close="closeEvent" />
+      <report-an-event :id="rowId" @close="closeEvent" />
     </div>
     <div v-if="showDialogSaft">
       <Safetyhazard @close="closeSaft" />
@@ -115,6 +115,7 @@ export default {
           name: "微网格",
         },
       ],
+      rowId: null,
       itemNav: 1,
       showDialog: false,
       showDialogEvent: false,
@@ -123,10 +124,47 @@ export default {
       monthOptions: new Array(12).fill(0).map((_, index) => {
         return { label: index - 0 + 1 + "月", value: index - 0 + 1 };
       }),
-      list: [{}, {}, {}],
+      paramsData: {},
+      list: [],
     };
   },
+  watch: {
+    otherTabel(n) {
+      if (n) {
+        this.getList();
+      }
+    },
+  },
+  created() {
+    this.paramsData = this.$route.params;
+  },
+  mounted() {
+    this.getList();
+  },
   methods: {
+    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`],
+      ]);
+      const url = getUrl.get(this.otherTabel);
+      // unitId=${this.paramsData.id}
+      this.$http.get(`${url}&pageNo=${this.pageNum}&pageSize=${this.pageSize}`).then((res) => {
+        const {
+          code,
+          data: { total, list },
+        } = res.data;
+        if (code === 0) {
+          this.total = total;
+          this.list = list;
+          this.loading = false;
+        }
+      });
+    },
+
     chooseNav(item) {
       this.itemNav = item.key;
       this.otherTabel = item.key === 1 ? "sbsj" : item.key === 2 ? "jmxq" : item.key === 3 ? "tzrq" : "aqyh";
@@ -147,8 +185,8 @@ export default {
     closeSaft(flag) {
       this.showDialogSaft = flag;
     },
-    getList() {},
-    handleView() {
+    handleView(row) {
+      this.rowId = row.id;
       if (this.itemNav === 1) {
         this.showDialogEvent = true;
       }