From f7cb02d6814c0e1496b6b7484fb6ee125f93d0cc Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Mon, 9 Sep 2024 18:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=98=E6=B2=A1=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accident/records/components/addOrEdit.vue | 41 +++++++------------
 .../accident/records/components/list.vue      |  3 +-
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/views/accident/records/components/addOrEdit.vue b/src/views/accident/records/components/addOrEdit.vue
index c2b6983..dd7cbac 100644
--- a/src/views/accident/records/components/addOrEdit.vue
+++ b/src/views/accident/records/components/addOrEdit.vue
@@ -8,19 +8,19 @@
       style="width: 900px"
     >
       <el-form-item :label-width="formLabelWidth" label="事故案号" prop="incidentNumber">
-        <el-input v-model="infoForm.incidentNumber" :disabled="isDisabled" autocomplete="off" />
+        <el-input v-model="infoForm.incidentNumber" :disabled="isDisabled" autocomplete="off"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="事故名称" prop="incidentName">
-        <el-input v-model="infoForm.incidentName" :disabled="isDisabled" autocomplete="off" />
+        <el-input v-model="infoForm.incidentName" :disabled="isDisabled" autocomplete="off"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="事故类型" prop="incidentType">
         <el-select v-model="infoForm.incidentType" :disabled="isDisabled" placeholder="请选择">
-          <el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id"/>
         </el-select>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="事故级别" prop="incidentLevel">
         <el-select v-model="infoForm.incidentLevel" :disabled="isDisabled" placeholder="请选择">
-          <el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id"/>
         </el-select>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="事故发生地点" prop="location">
@@ -58,7 +58,7 @@
         <el-upload
           ref="upload"
           :disabled="isDisabled"
-          :file-list.sync="infoForm.photos"
+          :file-list.sync="fileList"
           :multiple="false"
           :auto-upload="true"
           :limit="limitNum"
@@ -71,7 +71,7 @@
           action="#"
           accept=".jpg,.jpeg,.png"
           list-type="picture-card">
-          <i class="el-icon-plus" />
+          <i class="el-icon-plus"/>
         </el-upload>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="原因分析及责任认定" prop="analysis">
@@ -100,16 +100,17 @@
     </el-form>
 
     <el-dialog :visible.sync="dialogImgVisible">
-      <img :src="dialogImageUrl" width="100%" alt="">
+      <img :src="config.fileUrl+infoForm.photos" width="100%" alt="">
     </el-dialog>
 
-    <div class="ui-height" />
+    <div class="ui-height"/>
     <div class="ui-foot">
       <el-button
         type="primary"
         icon="el-icon-arrow-left"
         plain
-        @click="goBack">返回</el-button>
+        @click="goBack">返回
+      </el-button>
       <el-button type="primary" @click="confirm">确 定</el-button>
     </div>
   </div>
@@ -139,7 +140,7 @@ export default {
         seriouslyInjured: null, // 重伤人数
         cause: '', // 事故起因
         summary: '', // 事故概述
-        photos: [], // 事故照片
+        photos: '', // 事故照片
         analysis: '', // 原因分析及责任认定
         suggestions: '', // 考核建议
         measures: '', // 整改措施
@@ -154,8 +155,8 @@ export default {
       tableName: '',
       /** 图片上传限制个数 */
       limitNum: 1,
-      /** 预览图片地址 */
-      dialogImageUrl: '',
+      /** 图片 */
+      fileList: [],
       allowRemove: true, // 添加一个控制标志
       /** 预览弹窗 */
       dialogImgVisible: false,
@@ -224,15 +225,6 @@ export default {
       }
     },
 
-    /**
-     * 单独查询图片流文件
-     */
-    getFileImageBinaray(fileName) {
-      requestFN(`/accident/view/photos`, { path: fileName }).then((res) => {
-        console.log('res :>> ', res)
-      })
-    },
-
     /**
      * 点击文件列表中已上传的文件时的钩子
      */
@@ -244,6 +236,7 @@ export default {
     /**
      * 文件上传失败时的钩子处理
      */
+    // eslint-disable-next-line handle-callback-err
     handleError(err, file, fileList) {
       this.$message({
         message: `${file.name}上传失败, 请稍后重试`,
@@ -280,11 +273,7 @@ export default {
         formData.append('file', file)
         upload('/accident/import/photos', formData).then((data) => {
           if (data.result === 'success') {
-            this.infoForm.photos = [{
-              name: file.name,
-              url: URL.createObjectURL(file),
-              remotePathName: data.path
-            }]
+            this.infoForm.photos = data.path
           }
         })
         return false
diff --git a/src/views/accident/records/components/list.vue b/src/views/accident/records/components/list.vue
index 92478ea..066c430 100644
--- a/src/views/accident/records/components/list.vue
+++ b/src/views/accident/records/components/list.vue
@@ -101,7 +101,6 @@ export default {
 
   data() {
     return {
-      config: config,
       // 搜索查询条件
       searchForm: {
         /** 事故名称 */
@@ -242,7 +241,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.listLoading = false
-        window.open(config.templatefileUrl + 'template/limitSpace.xls')
+        window.open(config.httpurl + '/export/excel')
       }).catch(() => {
         this.listLoading = false
       })