Browse Source

更新 时间格式

wzh 3 năm trước cách đây
mục cha
commit
8c06e0fbf9
2 tập tin đã thay đổi với 32 bổ sung12 xóa
  1. 8 2
      src/utils/utils.js
  2. 24 10
      src/views/voyage/voyageDetail.vue

+ 8 - 2
src/utils/utils.js

@@ -1,6 +1,12 @@
-function subTimeStr(str) {
+function subTimeStr(str, i) {
   if (!str || typeof str != "string") return;
-  let index = str.indexOf(" ");
+  let index;
+  if (i) {
+    index = i;
+  } else {
+    index = str.indexOf(" ");
+  }
+
   return str.substring(0, index);
 }
 

+ 24 - 10
src/views/voyage/voyageDetail.vue

@@ -233,7 +233,7 @@
           class="info-line-text"
           v-model="voyage.arrivalLoadPortTime"
           type="datetime"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY/MM/DD HH:mm"
           value-format="YYYY/MM/DD HH:mm:ss"
           placeholder="到达装货港时间"
           :disabled="disabledStatus"
@@ -266,7 +266,7 @@
           class="info-line-text"
           v-model="voyage.loadStartTime"
           type="datetime"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY/MM/DD HH:mm"
           value-format="YYYY/MM/DD HH:mm:ss"
           placeholder="装货开始时间"
           :disabled="disabledStatus"
@@ -278,7 +278,7 @@
           class="info-line-text"
           v-model="voyage.loadEndTime"
           type="datetime"
-          format="YYYY/MM/DD HH:mm:ss"
+          format="YYYY/MM/DD HH:mm"
           value-format="YYYY/MM/DD HH:mm:ss"
           placeholder="装货开始时间"
           :disabled="disabledStatus"
@@ -299,7 +299,7 @@
               v-model="item.setSailTime"
               type="datetime"
               @change="calExpectedArrivalTime"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY/MM/DD HH:mm"
               value-format="YYYY/MM/DD HH:mm:ss"
               placeholder="开航时间"
               :disabled="disabledStatus"
@@ -325,7 +325,7 @@
               class="info-line-text"
               v-model="item.actualArrivalTime"
               type="datetime"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY/MM/DD HH:mm"
               value-format="YYYY/MM/DD HH:mm:ss"
               placeholder="实际到港时间"
               :disabled="disabledStatus"
@@ -351,7 +351,7 @@
               class="info-line-text"
               v-model="item.dischargeStartTime"
               type="datetime"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY/MM/DD HH:mm"
               value-format="YYYY/MM/DD HH:mm:ss"
               placeholder="卸货开始时间"
               :disabled="disabledStatus"
@@ -363,7 +363,7 @@
               class="info-line-text"
               v-model="item.dischargeEndTime"
               type="datetime"
-              format="YYYY/MM/DD HH:mm:ss"
+              format="YYYY/MM/DD HH:mm"
               value-format="YYYY/MM/DD HH:mm:ss"
               placeholder="卸货结束时间"
               :disabled="disabledStatus"
@@ -468,7 +468,11 @@
         label="记录时间"
         min-width="100"
         align="center"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{ subTimeStr(scope.row.reporttime, 16) }}
+        </template>
+      </el-table-column>
     </el-table>
     <div style="width: 1200px; text-align: right; margin-top: 43px">
       <el-pagination
@@ -634,7 +638,11 @@
         label="卸货时间"
         min-width="120"
         align="center"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{ subTimeStr(scope.row.dischargeTime, 16) }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="dischargeTons"
         label="卸货吨位"
@@ -816,7 +824,11 @@
         label="称重时间"
         min-width="120"
         align="center"
-      ></el-table-column>
+      >
+        <template v-slot="scope">
+          {{ subTimeStr(scope.row.weighTime, 16) }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="carNum"
         label="车号"
@@ -1539,6 +1551,7 @@ import store from "../../store";
 import { ElNotification, ElMessageBox, ElMessage } from "element-plus";
 import downloadBlobFile from "../../utils/downloadBlobFile";
 import url from "../../apis/config";
+import { subTimeStr } from "utils/utils";
 
 const route = useRoute();
 let map = ref({});
@@ -1566,6 +1579,7 @@ async function getVoyageDetail(isInit) {
     blockchainInfo.value = res.data.result.blockChain;
     coordinates.value = res.data.result.coordinates;
     voyage.value = res.data.result.voyage;
+    voyage.value.startTime = voyage.value.startTime.substring(0, 16);
     currentPortId.value = voyage.value.voyageDetails[0].portId + "";
     currentDiscPortId.value = voyage.value.voyageDetails[0].portId + "";
     medias.value = res.data.result.medias;