Merge branch 'master' of http://221.182.8.141:11666/sujunlin/xld-gis-admin

src/views/dataAdmin/dataAdmin/flowStep/handleLog.vue

@@ -10,14 +10,16 @@
   <div class="handle-log-table">
     <BasicTable @register="registerTable" :clickToRowSelect="false">
       <template #ISPASS="{ record }">
-        <Tag :style="`color:${setStatusName(record) === '通过' ? '#05B069' :(setStatusName(record) === '进行中' ? 'rgb(240, 135, 24)' : 'red') };`">
+        <Tag
+          :style="`color:${setStatusName(record) === '通过' ? '#05B069' : (setStatusName(record) === '进行中' ? 'rgb(240, 135, 24)' : 'red')};`">
           {{ setStatusName(record) }}
         </Tag>
       </template>
 
       <template #CHECKTIME="{ record }">
         <Tag>
-          {{ record.CHECKTIME ? record.CHECKTIME : record.CREATETIME }}
+          <!-- {{ record.CHECKTIME ? record.CHECKTIME : record.CREATETIME }} -->
+          {{ record.CHECKTIME }}
         </Tag>
       </template>
     </BasicTable>
@@ -76,12 +78,12 @@ export default defineComponent({
     onMounted(async () => {
       checkList.value = flowStatus.value === '1' ? [] : checkInfo as any;
     });
-    
-    const setStatusName = (record)=> {
+
+    const setStatusName = (record) => {
       let statusName = '通过'
-      if(!record.ISPASS) statusName='进行中'
-      else if(record.ISPASS === '1') statusName = '通过'
-      else if(record.ISPASS === '0') statusName = '不通过'
+      if (!record.ISPASS) statusName = '进行中'
+      else if (record.ISPASS === '1') statusName = '通过'
+      else if (record.ISPASS === '0') statusName = '不通过'
       return statusName;
     }