From fa6f4a6d96201978690e115f3658feb0114c7629 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 22 Aug 2023 17:29:12 +0800
Subject: [PATCH] xbot

---
 project/xbot/AppWorkOrder/components/Detail.vue | 13 ++++---------
 project/xbot/AppWorkOrder/components/List.vue   |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/project/xbot/AppWorkOrder/components/Detail.vue b/project/xbot/AppWorkOrder/components/Detail.vue
index b20bcd6f..6c4caebd 100644
--- a/project/xbot/AppWorkOrder/components/Detail.vue
+++ b/project/xbot/AppWorkOrder/components/Detail.vue
@@ -24,7 +24,7 @@
                 <ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
                 <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
                 <!-- <ai-info-item label="事件来源">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item> -->
-                <ai-info-item label="事件类型">{{ detail.flName }}</ai-info-item>
+                <ai-info-item label="事件类型" :value="dict.getLabel('xbotReportEventType', detail.type)"></ai-info-item>
                 <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
                 <ai-info-item label="现场照片" isLine>
                   <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
@@ -135,12 +135,8 @@
           <el-form-item label="事件描述" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入事件描述' }]">
             <el-input type="textarea" :rows="8" :maxlength="500" v-model="editInfo.content" clearable placeholder="请输入事件描述" show-word-limit></el-input>
           </el-form-item>
-          <el-form-item label="事件类型" prop="flId"  :rules="[{ required: true, message: '请选择事件类型' }]" style="width: 100%;">
-            <ai-select
-                v-model="editInfo.flId"
-                placeholder="请选择"
-                :selectList="dictList"
-            ></ai-select>
+          <el-form-item label="事件类型" prop="type"  :rules="[{ required: true, message: '请选择事件类型' }]" style="width: 100%;">
+            <ai-select v-model="editInfo.type" :selectList="dict.getDict('xbotReportEventType')" placeholder="请选择" />
           </el-form-item>
           <el-form-item label="所属网格" style="width: 100%;">
             <el-input disabled size="small" v-model="editInfo.girdName" clearable>
@@ -263,7 +259,7 @@ export default {
 
   created() {
     this.getDict()
-    this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
+    this.dict.load('clapEventStatus', 'residentEventSource', 'xbotReportEventType').then(() => {
       this.getDetail()
     })
   },
@@ -276,7 +272,6 @@ export default {
         if (res?.data) {
           this.detail = res.data
           this.processList = res.data.processList
-          this.form.groupId = res.data.groupId
           this.$forceUpdate()
           this.$nextTick(() => {
             this.initMap()
diff --git a/project/xbot/AppWorkOrder/components/List.vue b/project/xbot/AppWorkOrder/components/List.vue
index 381acd9e..162eceb8 100644
--- a/project/xbot/AppWorkOrder/components/List.vue
+++ b/project/xbot/AppWorkOrder/components/List.vue
@@ -111,7 +111,7 @@ export default {
     colConfigs() {
       return [
         {prop: 'content', label: '内容描述', width: '300px'},
-        {prop: 'flName', label: '事件类型', align: 'center'},
+        {prop: 'type', label: '事件类型', align: 'center', dict: 'xbotReportEventType'},
         {prop: 'girdName', label: '所属网格', align: 'center'},
         {prop: 'createTime', label: '上报时间', align: 'center'},
         {prop: 'name', label: '昵称', align: 'center'},
@@ -128,7 +128,7 @@ export default {
   },
 
   created() {
-    this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
+    this.dict.load('clapEventStatus', 'residentEventSource', 'xbotReportEventType').then(() => {
       this.getList()
     })
   },