Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into wangmq

src/components/PositionMsg/OverLay.vue

@@ -52,12 +52,15 @@
             />
           </div>
         </n-form-item>
-        <n-form-item label="处理描述:">
+        <n-form-item label="处理备注:">
           <span>{{ resultForm.handlerResult }}</span>
         </n-form-item>
         <n-form-item label="处理时间:">
           <span>{{ resultForm.handlerTime }}</span>
         </n-form-item>
+        <n-form-item label="处理人员:">
+          <span>{{ resultForm.handlerUserName }}</span>
+        </n-form-item>
       </n-form>
     </div>
     <div v-if="positionType === 'handle'" class="btn_list">

src/views/order-manage/deal-order/components/MapDrawer.vue

@@ -1,7 +1,7 @@
 <template>
   <n-drawer v-bind="getDrawerOptions" @update:show="handleDrawerColse">
     <n-drawer-content closable title="图片位置">
-      <PositionMsg :data="getPostionOptions" :show-legend="false" />
+      <PositionMsg :data="getPostionOptions" show-result :show-legend="false" />
     </n-drawer-content>
   </n-drawer>
 </template>

src/views/order-manage/deal-order/tools/quesForm.js

@@ -17,7 +17,7 @@ export const form = reactive({
     { type: 'input', key: 'handlerTime', label: '处理时间', props: { disabled: true }, mode: true, handle: true },
     { type: 'input', key: 'handlerUserName', label: '处理人员', props: { disabled: true }, mode: true, handle: true },
     { type: 'oss', refIndex: 0, key: 'imageStatus', file: 'handlerImage', label: '处理图片', mode: true },
-    { type: 'input', key: 'handlerResult', label: '描述', props: { type: 'textarea', maxlength: 255 }, mode: true }
+    { type: 'input', key: 'handlerResult', label: '处理备注', props: { type: 'textarea', maxlength: 255 }, mode: true }
   ]
 })
 

src/views/question-manage/question-list/tools/quesForm.js

@@ -15,8 +15,9 @@ export const form = reactive({
     { type: 'image', key: 'fileMarkerUrl', label: '问题图片', props: { width: 100 }},
     { type: 'select', key: 'status', label: '问题状态', props: { options: QUES_STATUS, disabled: true }},
     { type: 'oss', refIndex: 0, key: 'imageStatus', file: 'handlerImage', label: '处理结果', mode: true },
-    { type: 'input', key: 'handlerResult', label: '描述', props: { type: 'textarea', maxlength: 255 }, mode: true },
-    { type: 'input', key: 'handlerUserName', label: '处理人', mode: true }
+    { type: 'input', key: 'handlerResult', label: '处理备注', props: { type: 'textarea', maxlength: 255 }, mode: true },
+    { type: 'input', key: 'handlerTime', label: '处理时间', mode: true },
+    { type: 'input', key: 'handlerUserName', label: '处理人员', mode: true }
   ]
 })
 

src/views/question-manage/question-list/tools/table.js

@@ -34,7 +34,9 @@ async function handlePreview(row) {
     data.rowData = {
       ...row,
       handlerImage: res.data.questionHandle.handlerImage,
-      handlerResult: res.data.questionHandle.handlerResult
+      handlerResult: res.data.questionHandle.handlerResult,
+      handlerTime: res.data.questionHandle.handlerTime,
+      handlerUserName: res.data.questionHandle.handlerUserName
     }
   }
   data.modalShow = true