Merge branch 'cc-dev' into 'dev'

给后端接口试错

See merge request product-group-fe/sfy-safety-group/sfy-safety!81

src/views/disaster/disaster-precaution/src/components/TemplateTableMerge.vue

@@ -28,14 +28,19 @@
                 <div class="execute-person">
                   <span v-if="resultData.executeName">检查人员：{{ resultData.executeName }}</span>
                   <span v-if="resultData.inspectTime">时间：{{ resultData.inspectTime }}</span>
-                  <div class="execute-images" v-if="resultData.executeImages && resultData.executeImages.length > 0">
+                  <div
+                    class="execute-images"
+                    v-if="resultData.executeImages && safetyJsonParse(resultData.executeImages).length > 0"
+                  >
                     <el-tooltip content="图片查看" effect="light">
                       <el-image
                         :src="ImageIcon"
                         :zoom-rate="1.2"
                         :max-scale="7"
                         :min-scale="0.2"
-                        :preview-src-list="resultData.executeImages"
+                        :preview-src-list="safetyJsonParse(resultData.executeImages)"
+                        :initial-index="0"
+                        show-progress
                         preview-teleported
                         fit="cover"
                       />
@@ -64,14 +69,19 @@
                 <div class="execute-person">
                   <span v-if="opinionData.executeName">审批人员：{{ opinionData.executeName }}</span>
                   <span v-if="opinionData.inspectTime">时间：{{ opinionData.inspectTime }}</span>
-                  <div class="execute-images" v-if="opinionData.executeImages && opinionData.executeImages.length > 0">
+                  <div
+                    class="execute-images"
+                    v-if="opinionData.executeImages && safetyJsonParse(opinionData.executeImages).length > 0"
+                  >
                     <el-tooltip content="图片查看" effect="light">
                       <el-image
                         :src="ImageIcon"
                         :zoom-rate="1.2"
                         :max-scale="7"
                         :min-scale="0.2"
-                        :preview-src-list="opinionData.executeImages"
+                        :preview-src-list="safetyJsonParse(opinionData.executeImages)"
+                        :initial-index="0"
+                        show-progress
                         preview-teleported
                         fit="cover"
                       />
@@ -114,6 +124,8 @@
                   :max-scale="7"
                   :min-scale="0.2"
                   :preview-src-list="safetyJsonParse(scope.row.inspectImages)"
+                  :initial-index="0"
+                  show-progress
                   preview-teleported
                   fit="cover"
                 />
@@ -304,7 +316,10 @@
     emit('validate-change', valid);
   };
 
-  const safetyJsonParse = (value: string) => {
+  const safetyJsonParse = (value: string | string[]) => {
+    if (Array.isArray(value)) {
+      return value;
+    }
     try {
       return JSON.parse(value);
     } catch (error) {