xbot

src/project/xbot/AppWorkOrder/AppWorkOrder.vue

@@ -23,7 +23,7 @@
 
             <div class="types">
               <span>事件类型</span>
-              <span class="types-right">{{ item.groupName }}</span>
+              <span class="types-right">{{ $dict.getLabel('xbotReportEventType', item.type)}}</span>
             </div>
 
             <div class="gards">
@@ -95,7 +95,7 @@ export default {
     document.title = '工单管理'
   },
   created() {
-    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory').then(() => {
+    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'xbotReportEventType').then(() => {
       this.getList()
     })
   },

src/project/xbot/AppWorkOrder/Detail.vue

@@ -18,7 +18,7 @@
 
       <div class="card">
         <span class="card-left">事件类型</span>
-        <span class="card-right">{{ data.groupName }}</span>
+        <span class="card-right">{{ $dict.getLabel('xbotReportEventType', data.type)}}</span>
       </div>
 
       <!-- <div class="card">
@@ -156,7 +156,7 @@ export default {
   watch: {},
   onLoad(o) {
     this.id = o.id
-    this.$dict.load('realityStatus', 'clapDoStatus').then(() => {
+    this.$dict.load('realityStatus', 'clapDoStatus', 'xbotReportEventType').then(() => {
       this.getDetail()
     })
 

src/project/xbot/AppWorkOrder/Edit.vue

@@ -5,20 +5,20 @@
         <u-form-item label="事件描述" prop="content" required :border-bottom="false" label-position="top" class="contents">
           <u-input v-model="forms.content" placeholder="请输入事件描述..." type="textarea" auto-height height="100" maxlength="500"/>
         </u-form-item>
-        <u-form-item label="事件类型" prop="flName" required :border-bottom="false" right-icon="arrow-right">
+        <u-form-item label="事件类型" prop="type" required :border-bottom="false" right-icon="arrow-right">
-          <span @click="show = true" class="right-span" :style="forms.flName ? '' : 'color:#999;'">{{ forms.flName || '请选择事件类型' }}</span>
+          <span @click="show = true" class="right-span" :style="forms.typeName ? '' : 'color:#999;'">{{ forms.typeName || '请选择事件类型' }}</span>
-          <u-select v-model="show" :list="flList" value-name="id" label-name="groupName" @confirm="selectFl"></u-select>
+          <u-select v-model="show" :list="$dict.getDict('xbotReportEventType')" value-name="dictValue" label-name="dictName" @confirm="selectFl"></u-select>
         </u-form-item>
         <div class="line"></div>
-        <u-form-item label="所属网格" prop="girdName" required :border-bottom="false">
+        <u-form-item label="所属网格" prop="girdName" :border-bottom="false">
           <AiPagePicker type="gird" v-model="forms.girdId" @change="confirmGird" valueObj nodeKey="id" formType="2" class="right-span">
             <AiMore v-model="forms.girdName" placeholder="请选择所属网格"/>
           </AiPagePicker>
         </u-form-item>
-        <u-form-item label="联系方式" prop="phone" required :border-bottom="false" >
+        <u-form-item label="联系方式" prop="phone" :border-bottom="false" >
           <u-input v-model="forms.phone" placeholder="请输入联系方式" />
         </u-form-item>
-        <u-form-item label="上报位置" prop="mapInfo" required :border-bottom="false" right-icon="arrow-right" class="border">
+        <u-form-item label="上报位置" prop="mapInfo" :border-bottom="false" right-icon="arrow-right" class="border">
           <span @click="toMap" class="right-span" :style="forms.mapInfo.address ? '' : 'color:#999;'">{{ forms.mapInfo.address || '请选择上报位置' }}</span>
         </u-form-item>
         <div class="line"></div>
@@ -52,7 +52,8 @@ export default {
         girdName: '',
         files: [],
         name: '',
-        phone: ''
+        phone: '',
+        type: ''
       },
       flag: false,
       show: false,
@@ -65,7 +66,9 @@ export default {
   },
   onLoad(option) {
     this.id = option.id
-    this.typeList()
+    this.$dict.load('xbotReportEventType').then(() => {
+      this.getDetail()
+    })
   },
   onShow() {
     document.title = '事件编辑'
@@ -105,8 +108,8 @@ export default {
       })
     },
     selectFl(e) {
-      this.forms.flName = e[0].label
+      this.forms.type = e[0].value
-      this.forms.flId = e[0].value
+      this.forms.typeName = e[0].label
     },
     confirmGird(v) {
       this.forms.girdId = v.id
@@ -121,7 +124,7 @@ export default {
       if (!this.forms.content) {
         return this.$u.toast('请输入事件描述')
       }
-      if (!this.forms.flName) {
+      if (!this.forms.type) {
         return this.$u.toast('请选择事件类型')
       }