wenhongquan vor 3 Jahren
Ursprung
Commit
505531ba9b

+ 8 - 2
src/components/ImagePreview/index.vue

@@ -48,9 +48,15 @@ const realSrc = computed(() => {
 const realSrcList = computed(() => {
 
   if (props.src == null) return [];
-  if (Array.isArray(props.src) && props.src.length==0) return [];
+  if (Array.isArray(props.src) && props.src.length == 0) return [];
+  let real_src_list = []
+  if (Array.isArray(props.src)) {
+    real_src_list = props.src;
+
+  } else {
+    real_src_list = (props.src ?? '') .split(",");
+  }
 
-  let real_src_list = (props.src ?? '') .split(",");
   let srcList = [];
   ((real_src_list==null||real_src_list==""?[]:real_src_list)).forEach(item => {
     if (isExternal(item)) {

+ 6 - 6
src/views/mb/task/detail/index.vue

@@ -372,8 +372,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).gzldata"
-                >{{ item.label + ":" + item.value }}
+                ).gzldata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </van-col>
             </van-row>
           </div>
@@ -388,8 +388,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).clsbdata"
-                >{{ item.label + ":" + item.value }}
+                ).clsbdata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </van-col>
             </van-row>
           </div>
@@ -404,8 +404,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).hcdata"
-                >{{ item.label + ":" + item.value }}
+                ).hcdata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </van-col>
             </van-row>
           </div>

+ 6 - 6
src/views/task/detail/index.vue

@@ -529,8 +529,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).gzldata"
-                >{{ item.label + ":" + item.value }}
+                ).gzldata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </el-col>
             </el-row>
           </div>
@@ -545,8 +545,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).clsbdata"
-                >{{ item.label + ":" + item.value }}
+                ).clsbdata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </el-col>
             </el-row>
           </div>
@@ -561,8 +561,8 @@
                 v-for="(item, index1) in JSON.parse(
                   taskinfo.tblTaskLogList.filter((ii) => ii.taskStatus === 3)[0]
                     .logDes ?? '{}'
-                ).hcdata"
-                >{{ item.label + ":" + item.value }}
+                ).hcdata" :style="item['value1'] !==''?'':'display:none' "
+                >{{ item.name + ":" + item.value1 +" "+item.unit1 +(item.hasOwnProperty('value2')?(`${item.value2+" "+item.unit2}`):'') }}
               </el-col>
             </el-row>
           </div>