Ver Fonte

更新 文案;字段;序号逻辑

王智慧 há 3 anos atrás
pai
commit
ae87656ba8

+ 22 - 2
src/components/ShipInfo.vue

@@ -135,6 +135,26 @@
           <view class="unit">年</view>
         </div>
       </div>
+      <div class="line">
+        <div class="info-line">
+          <div class="info-line-title">吃水</div>
+          <el-input
+            class="info-line-text"
+            v-model="shipInfos[currentIndex].loadTons"
+            :disabled="shipInfoDisabled"
+          ></el-input>
+          <view class="unit">米</view>
+        </div>
+        <div class="info-line">
+          <div class="info-line-title">载重吨位</div>
+          <el-input
+            class="info-line-text"
+            v-model="shipInfos[currentIndex].age"
+            :disabled="shipInfoDisabled"
+          ></el-input>
+          <view class="unit">吨</view>
+        </div>
+      </div>
     </div>
     <div style="max-width: 1200px">
       <div class="container-title">船舶证书</div>
@@ -312,7 +332,7 @@ let initShipInfo = {
       certs: [],
     },
     {
-      typeName: "船舶年审合格证书",
+      typeName: "船舶营运证书",
       type: 3,
       date: "",
       startValidTime: "",
@@ -356,7 +376,7 @@ async function searchShip(e) {
     data.result.shipCerts[0].typeName = "船舶主要项目页";
     data.result.shipCerts[1].typeName = "船舶国籍证书";
     data.result.shipCerts[2].typeName = "内河船舶适航证书";
-    data.result.shipCerts[3].typeName = "船舶年审合格证书";
+    data.result.shipCerts[3].typeName = "船舶营运证书";
     data.result.shipCerts[4].typeName = "内河船舶最低安全配员证书";
     data.result.shipCerts[5].typeName = "船舶保险";
     for (let i of data.result.shipCerts) {

+ 11 - 2
src/views/index/Index.vue

@@ -20,14 +20,23 @@
         <div class="df data-line">
           <img class="icon" src="../../assets/rubber.png" />
           <div class="data-text">
-            <div class="data-title">所有船舶吨位</div>
+            <div class="data-title">所有船舶吨位(总吨)</div>
+            <div class="df aib">
+              <div class="num">{{ shipLoadTons }}</div>
+              <div class="unit">吨</div>
+            </div>
+          </div>
+        </div>
+        <div class="df data-line">
+          <img class="icon" src="../../assets/rubber.png" />
+          <div class="data-text">
+            <div class="data-title">所有船舶载重吨位</div>
             <div class="df aib">
               <div class="num">{{ shipLoadTons }}</div>
               <div class="unit">吨</div>
             </div>
           </div>
         </div>
-
         <div class="df aic jcsb mt30 mb10 aic" v-if="ship.code">
           <div class="df aic">
             <div class="shu"></div>

+ 36 - 13
src/views/shipManage/shipList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="full-container-p24">
-    <div style="display: flex; justify-content: space-between">
+    <div class="df aic jcsb">
       <div style="display: flex">
         <el-input
           placeholder="请输入船名/MMSI/手机号"
@@ -15,15 +15,15 @@
           查询
         </el-button>
       </div>
+      <div class="c6 fs16">所有船舶总数量: {{ total }}</div>
     </div>
     <div style="margin-top: 24px">
       <el-table border :data="tableData" stripe style="width: 100%">
-        <el-table-column
-          type="index"
-          label="序号"
-          width="80"
-          align="center"
-        ></el-table-column>
+        <el-table-column label="序号" width="80" align="center">
+          <template v-slot="scope">
+            {{ scope.$index + 1 + 10 * (currentPage - 1) }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="shipname"
           label="船舶名称"
@@ -61,18 +61,41 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="phone"
-          label="状态"
-          min-width="60"
+          prop="loadTons"
+          label="吨位(总吨)"
+          min-width="100"
           align="center"
-        >
+        ></el-table-column>
+        <el-table-column label="船舶状态" min-width="60" align="center">
+          <template v-slot="scope">
+            <div
+              :style="{
+                color: scope.row.transStatus == 1 ? 'red' : '#333',
+              }"
+            >
+              {{ scope.row.transStatus == 1 ? "异常" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="证书状态" min-width="60" align="center">
+          <template v-slot="scope">
+            <div
+              :style="{
+                color: scope.row.certsStatus == 1 ? 'red' : '#333',
+              }"
+            >
+              {{ scope.row.certsStatus == 1 ? "异常" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="保险状态" min-width="60" align="center">
           <template v-slot="scope">
             <div
               :style="{
-                color: scope.row.hasMmsi == 1 ? 'red' : '#333',
+                color: scope.row.insuranceStatus == 1 ? 'red' : '#333',
               }"
             >
-              {{ scope.row.hasMmsi == 1 ? "异常" : "正常" }}
+              {{ scope.row.insuranceStatus == 1 ? "异常" : "正常" }}
             </div>
           </template>
         </el-table-column>

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

@@ -217,7 +217,7 @@ let initShipInfo = {
       certs: [],
     },
     {
-      typeName: "船舶年审合格证书",
+      typeName: "船舶营运证书",
       type: 3,
       date: "",
       startValidTime: "",

+ 1 - 1
src/views/workStation/certsManage.vue

@@ -57,7 +57,7 @@
             @click="(currentPage = 1), (certType = 3), getCertList()"
             class="btn"
           >
-            船舶年审合格证书
+            船舶营运证书
           </el-button>
         </div>
         <div>