From 45b1d0d64380a0e62fa2e7139503eec3eb121118 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Fri, 8 Dec 2023 14:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=B0=83=E9=85=8D=E7=9A=84=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E3=80=81=E8=81=94=E5=BB=BA=E7=BB=84=E7=BB=87=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BB=91=E5=AE=9A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MapDialog/CommunityList.vue    |  3 +-
 .../components/MapDialog/DisputeDispatch.vue  | 28 ++++++++--------
 .../overview/components/MapDialog/Njjwtqk.vue |  9 ++++--
 .../components/MapDialog/ResourceDispatch.vue | 32 ++++++++++---------
 4 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue b/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue
index 2444a505a..493fc94f2 100644
--- a/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/CommunityList.vue
@@ -94,7 +94,8 @@ export default {
       let params = {
         ...this.queryParams,
         agencyId: this.currentLevelData.orgId,
-        satisfactionCategory: this.catVal
+        satisfactionCategory: this.catVal,
+        satisfactionLevel:'bad'
       }
       this.$http.get("/governance/satisfaction/communitySelfInsp/inspResult/list?" + this.$paramsFormat(params)).then(({data: {data}}) => {
         this.list = data.list;
diff --git a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
index d65fabb5f..e26e21998 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DisputeDispatch.vue
@@ -4,14 +4,15 @@
     <div v-if="type === '4'" class="table">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="250px">
-        <el-table-column label="资源类型" min-width="120" prop="personnelType">
-          <template slot-scope="{row}">
+        <el-table-column label="资源类型" min-width="120" prop="serviceItem">
+          <!-- <template slot-scope="{row}">
             社区自组织
-          </template>
+          </template> -->
         </el-table-column>
-        <el-table-column label="所属组织" min-width="180" prop="agencyName"/>
-        <el-table-column label="负责人" min-width="120" prop="principalName"/>
-        <el-table-column label="联系电话" min-width="120" prop="principalPhone">
+        <el-table-column label="组织名称" min-width="180" prop="organizationName"/>
+        <el-table-column label="所属组织" min-width="100" prop="agencyName"/>
+        <el-table-column label="负责人" min-width="100" prop="principalName"/>
+        <el-table-column label="联系电话" min-width="100" prop="principalPhone">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.principalPhone, 3, 7) }}
           </template>
@@ -36,14 +37,15 @@
     <div v-if="type === '5'" class="table">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="250px">
-        <el-table-column label="资源类型" min-width="120" prop="personnelType">
-          <template slot-scope="{row}">
+        <el-table-column label="资源类型" min-width="100" prop="typeName">
+          <!-- <template slot-scope="{row}">
             联建单位
-          </template>
+          </template> -->
         </el-table-column>
-        <el-table-column label="所属组织" min-width="180" prop="agencyName"/>
-        <el-table-column label="联系人" min-width="120" prop="contact"/>
-        <el-table-column label="联系电话" min-width="120" prop="contactMobile">
+        <el-table-column label="机构名称" min-width="120" prop="unitName"/>
+        <el-table-column label="所属组织" min-width="120" prop="agencyName"/>
+        <el-table-column label="联系人" min-width="100" prop="contact"/>
+        <el-table-column label="联系电话" min-width="100" prop="contactMobile">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.contactMobile, 3, 7) }}
           </template>
@@ -135,7 +137,7 @@ export default {
     return {
       total: 0,
       queryParams: {
-        pageSize: 5,
+        pageSize: 10,
         pageNo: 1,
       },
       type: "staffGrid",
diff --git a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue
index 174c24aa6..b45227933 100644
--- a/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/Njjwtqk.vue
@@ -52,7 +52,7 @@ export default {
   props: {
     catVal: {
       type: [String, Number],
-      default: ""
+      default: 1
     },
     currentLevelData: {
       type: Object,
@@ -84,6 +84,10 @@ export default {
   },
   methods: {
     getList() {
+      if(this.catVal==''){
+        this.catVal = 1;
+      }
+      console.log("----------:"+this.catVal);
       this.$http.post('/governance/icEventOld/list', {type: this.catVal}).then(({data: {data}}) => {
         this.list = data.list;
         this.total = data.total;
@@ -94,8 +98,9 @@ export default {
       this.getList();
     },
     handleDispatch({icEventId}) {
+      console.log("1")
       this.$http
-          .post("/governance/icEvent/detail", {icEventId: icEventId})
+          .post("/governance/icEventOld/detail", {icEventId: icEventId})
           .then((res) => {
             const {code, data, msg} = res.data;
             if (code === 0) {
diff --git a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
index d1cf7bd48..1b996cf5b 100644
--- a/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/ResourceDispatch.vue
@@ -4,14 +4,15 @@
     <div class="table" v-if="type === '4'">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="250px">
-        <el-table-column label="资源类型" min-width="120" prop="personnelType">
-          <template slot-scope="{row}">
+                <el-table-column label="资源类型" min-width="120" prop="serviceItem">
+          <!-- <template slot-scope="{row}">
             社区自组织
-          </template>
+          </template> -->
         </el-table-column>
-        <el-table-column label="所属组织" min-width="180" prop="agencyName"/>
-        <el-table-column label="负责人" min-width="120" prop="principalName"/>
-        <el-table-column label="联系电话" min-width="120" prop="principalPhone">
+        <el-table-column label="所属组织" min-width="100" prop="agencyName"/>
+        <el-table-column label="组织名称" min-width="180" prop="organizationName"/>
+        <el-table-column label="负责人" min-width="100" prop="principalName"/>
+        <el-table-column label="联系电话" min-width="100" prop="principalPhone">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.principalPhone, 3, 7) }}
           </template>
@@ -36,14 +37,15 @@
     <div class="table" v-if="type === '5'">
       <el-table v-loading="loading" :data="list" element-loading-background="rgba(0, 0, 0, 0.3)"
                 height="250px">
-        <el-table-column label="资源类型" min-width="120" prop="personnelType">
-          <template slot-scope="{row}">
-            联建单位
-          </template>
-        </el-table-column>
-        <el-table-column label="所属组织" min-width="180" prop="agencyName"/>
-        <el-table-column label="联系人" min-width="120" prop="contact"/>
-        <el-table-column label="联系电话" min-width="120" prop="contactMobile">
+          <el-table-column label="资源类型" min-width="100" prop="typeName">
+            <!-- <template slot-scope="{row}">
+              联建单位
+            </template> -->
+          </el-table-column>
+          <el-table-column label="机构名称" min-width="120" prop="unitName"/>
+          <el-table-column label="所属组织" min-width="120" prop="agencyName"/>
+          <el-table-column label="联系人" min-width="100" prop="contact"/>
+          <el-table-column label="联系电话" min-width="100" prop="contactMobile">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.contactMobile, 3, 7) }}
           </template>
@@ -134,7 +136,7 @@ export default {
     return {
       total: 0,
       queryParams: {
-        pageSize: 5,
+        pageSize: 10,
         pageNo: 1,
       },
       type: "staffGrid",