فهرست منبع

refactor(shipManage): 重构船只管理模块

- 修改 API URL 格式,统一添加斜杠
- 更新船员信息相关组件和数据结构
- 调整船主列表中的时间显示格式
wzg 9 ماه پیش
والد
کامیت
5f6e3f4f91
3فایلهای تغییر یافته به همراه13 افزوده شده و 31 حذف شده
  1. 3 3
      src/store/index.js
  2. 9 27
      src/views/shipManage/shipDetail.vue
  3. 1 1
      src/views/shipOwnerManage/shipOwnerList.vue

+ 3 - 3
src/store/index.js

@@ -2,9 +2,9 @@ import { createStore } from "vuex";
 
 console.log(import.meta.env.VITE_PROJECT_ENV);
 let baseurl = import.meta.env.VITE_BASEURL;
-const idCardUrl = `${baseurl}cos/uploadIdCard`;
-const addCertsUrl = `${baseurl}cos/uploadShipCertNew`;
-const updateCertsUrl = `${baseurl}cos/uploadShipCertUpdate`;
+const idCardUrl = `${baseurl}/cos/uploadIdCard`;
+const addCertsUrl = `${baseurl}/cos/uploadShipCertNew`;
+const updateCertsUrl = `${baseurl}/cos/uploadShipCertUpdate`;
 
 const store = createStore({
   state: {

+ 9 - 27
src/views/shipManage/shipDetail.vue

@@ -12,23 +12,23 @@
   <ShipInfo :shipInfos="shipInfos"></ShipInfo>
   <div class="df aic jcsb pr20" v-if="shipInfos.length">
     <div class="container-title">船员信息</div>
-    <CrewInfo
+    <!-- <CrewInfo
       :shipCode="route.query.shipCode"
       :shipname="shipInfos[0].shipname"
       @onSubmit="getCrewList"
-    ></CrewInfo>
+    ></CrewInfo> -->
   </div>
-  <el-table border :data="crewList" stripe style="width: 1000px">
+  <el-table border :data="crews" stripe style="width: 1000px">
     <el-table-column align="center" type="index" label="序号" width="80" />
     <el-table-column
       align="center"
-      prop="crewName"
+      prop="fullname"
       label="船员姓名"
       min-width="120"
     />
     <el-table-column
       align="center"
-      prop="crewCertExpiryDate"
+      prop="expiryAt"
       label="有效期"
       min-width="120"
     >
@@ -39,27 +39,7 @@
     <el-table-column align="center" label="详情" min-width="120">
       <template #default="scope">
         <div class="df aic jcc">
-          <CrewInfo
-            class="mr10"
-            :shipCode="route.query.shipCode"
-            :shipname="shipInfos[0].shipname"
-            :crewId="scope.row.id"
-            :crewInfo="scope.row"
-            btnText="查看"
-            disabled
-          ></CrewInfo>
-          <CrewInfo
-            class="mr10"
-            :shipCode="route.query.shipCode"
-            :shipname="shipInfos[0].shipname"
-            :crewId="scope.row.id"
-            :crewInfo="scope.row"
-            btnText="修改"
-            @onSubmit="getCrewList"
-          ></CrewInfo>
-          <el-button type="danger" @click="deleteCrew(scope.row.id)">
-            删除
-          </el-button>
+          <el-button type="primary">查看详情</el-button>
         </div>
       </template>
     </el-table-column>
@@ -144,6 +124,7 @@ let shipInfos = ref([{}]);
 let medias = ref([]);
 let mediaCoors = ref([]);
 let shipCoors = ref([]);
+let crews = ref([]);
 let shipCoorsPolyline = ref([]);
 let mediaCoorsPolyline = ref([]);
 async function getShipDetail(shipCode) {
@@ -159,8 +140,9 @@ async function getShipDetail(shipCode) {
   mediaCoors.value = data.result.mediaCoors;
   shipCoors.value = data.result.shipCoors;
   shipInfos.value = [data.result];
+  crews.value = data.result.crews;
   initMap();
-  getCrewList();
+  // getCrewList();
 }
 let crewCurrentPage = ref(1);
 let crewTotal = ref(0);

+ 1 - 1
src/views/shipOwnerManage/shipOwnerList.vue

@@ -87,7 +87,7 @@
           align="center"
         >
           <template v-slot="scope">
-            {{ subTimeStr(scope.row.createTime) }}
+            {{ subTimeStr(scope.row.createTime, 10) }}
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="80" align="center">