From 1fb85bdceacde9f193ef0cc00972bb5c8abdd35a Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Wed, 27 Sep 2023 15:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=9E=B6=E6=9E=84=E5=BE=AE?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizational/microgrid/index.vue         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index 446eeba60..e5708f851 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -13,7 +13,7 @@
         <el-table-column label="序号" type="index" width="80" />
         <!-- 上报事件 -->
         <el-table-column v-if="otherTabel === 'sbsj'" prop="categoryName" label="事件类型" />
-        <el-table-column v-if="otherTabel === 'sbsj'" prop="addeventContentress" label="事件描述" />
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="eventContent" label="事件描述" />
         <el-table-column v-if="otherTabel === 'sbsj'" prop="status" label="办理情况">
           <template slot-scope="scope">
             {{ getStatusMap(scope.row.status) }}
@@ -25,7 +25,7 @@
         <el-table-column v-if="otherTabel === 'jmxq'" prop="content" label="需求描述" />
         <el-table-column v-if="otherTabel === 'jmxq'" prop="status" label="办理情况">
           <template slot-scope="scope">
-            {{ getStatusMap(scope.row.status) }}
+            {{ getStatusMapsb(scope.row.status) }}
           </template>
         </el-table-column>
         <el-table-column v-if="otherTabel === 'jmxq'" prop="reportTime" label="上报时间" />
@@ -191,7 +191,7 @@ export default {
       this.rowId = null;
     },
     handleView(row) {
-      console.log('this.itemNav::', this.itemNav);
+      console.log("this.itemNav::", this.itemNav);
       this.rowId = row.id;
       if (this.itemNav === 1 || this.itemNav === 2) {
         this.showDialogEvent = true;
@@ -206,7 +206,17 @@ export default {
 
     getStatusMap(s) {
       const statusMap = new Map([
-        ["pending", "待处理"],
+        ["processing", "处理中"],
+        ["closed_case", "已结办"],
+        // ["assigned", "已派单"],
+        // ["have_order", "已接单"],
+        // ["finished", "已完成"],
+      ]);
+      return statusMap.get(s);
+    },
+    getStatusMapsb(s) {
+      const statusMap = new Map([
+        ["pending", "带办理"],
         ["canceled", "已取消"],
         ["assigned", "已派单"],
         ["have_order", "已接单"],