Bladeren bron

时间显示调整

jiawuxian 1 jaar geleden
bovenliggende
commit
c7928aa0a6

+ 1 - 1
src/views/resumption/taskManager/dialog.scanrecord.vue

@@ -41,7 +41,7 @@
           prop="executeTime"
         >
           <template slot-scope="r">
-            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD") }}
+            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD HH:mm") }}
           </template>
         </el-table-column>
         <el-table-column

+ 12 - 13
src/views/safetycheck/task/dialog.scanrecord.vue

@@ -1,10 +1,6 @@
 <template>
   <div>
-    <DialogCom
-      title="扫描记录"
-      :visible.sync="isShow"
-      width="850px"
-    >
+    <DialogCom title="扫描记录" :visible.sync="isShow" width="850px">
       <el-table :data="tableData" border>
         <el-table-column
           label="检查区域"
@@ -23,13 +19,13 @@
         >
         </el-table-column>
         <el-table-column
-        label="NFC标签名称"
-        align="center"
-        :show-overflow-tooltip="true"
-        prop="nfcName"
-        min-width="120px"
-      >
-      </el-table-column>
+          label="NFC标签名称"
+          align="center"
+          :show-overflow-tooltip="true"
+          prop="nfcName"
+          min-width="120px"
+        >
+        </el-table-column>
         <el-table-column
           label="扫描时间"
           align="center"
@@ -37,6 +33,9 @@
           width="180px"
           prop="executeTime"
         >
+          <template slot-scope="r">
+            {{ dayjs(r.row.executeTime).format("YYYY-MM-DD HH:mm") }}
+          </template>
         </el-table-column>
         <el-table-column
           label="扫描方式"
@@ -58,7 +57,7 @@
           min-width="150px"
         >
           <template slot-scope="r">
-            <label v-if="r.row.scanMethod == 0">{{r.row.nfcCode}}}</label>
+            <label v-if="r.row.scanMethod == 0">{{ r.row.nfcCode }}}</label>
             <el-image
               v-else
               style="width: 50px; height: 50px"