소스 검색

更新 时间格式

wzh 3 년 전
부모
커밋
18480fe150
3개의 변경된 파일47개의 추가작업 그리고 15개의 파일을 삭제
  1. 8 2
      src/utils/utils.js
  2. 27 13
      src/views/voyage/voyageDetail.vue
  3. 12 0
      vite.config.js

+ 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);
 }
 

+ 27 - 13
src/views/voyage/voyageDetail.vue

@@ -193,7 +193,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"
@@ -226,7 +226,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"
@@ -238,7 +238,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"
@@ -263,7 +263,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"
@@ -289,7 +289,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"
@@ -301,7 +301,7 @@
           class="info-line-text"
           v-model="voyage.arrivalPortTime"
           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"
@@ -315,7 +315,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"
@@ -327,7 +327,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"
@@ -435,7 +435,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
@@ -563,7 +567,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="卸货吨位"
@@ -627,7 +635,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="车号"
@@ -727,7 +739,7 @@
             class="info-line-text"
             v-model="truckRecordForm.weighTime"
             type="datetime"
-            format="YYYY/MM/DD HH:mm:ss"
+            format="YYYY/MM/DD HH:mm"
             value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="称重时间"
           ></el-date-picker>
@@ -953,7 +965,7 @@
               class="info-line-text"
               v-model="updateForm.dischargeTime"
               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
@@ -991,6 +1003,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();
@@ -1027,6 +1040,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;

+ 12 - 0
vite.config.js

@@ -1,10 +1,22 @@
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import viteCompression from "vite-plugin-compression";
+import path from "path";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue(), viteCompression()],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "src"),
+      comps: path.resolve(__dirname, "src/components"),
+      apis: path.resolve(__dirname, "src/apis"),
+      router: path.resolve(__dirname, "src/router"),
+      store: path.resolve(__dirname, "src/store"),
+      views: path.resolve(__dirname, "src/views"),
+      utils: path.resolve(__dirname, "src/utils"),
+    },
+  },
   server: {
     port: 8888,
   },