王智慧 3 anni fa
parent
commit
b793afc92b

+ 6 - 3
src/components/Header.vue

@@ -22,7 +22,7 @@
       >
         <img class="ling-icon" src="../assets/ling.png" alt="" />
       </el-badge>
-      <el-dialog v-model="noticeVisable" title="通知" width="400px">
+      <el-dialog v-model="noticeVisable" title="通知" width="600px">
         <el-button-group>
           <el-button
             @click="
@@ -48,12 +48,15 @@
         <el-table
           :data="noticeTableData[currentType]?.data[currentPage - 1]"
           stripe
-          style="width: 400px"
+          style="width: 600px"
           size="small"
           :row-style="{ height: '40px' }"
           :cell-style="{ padding: '0' }"
         >
-          <el-table-column prop="voyageName" label="航次名称" width="280" />
+          <el-table-column prop="voyageName" label="航次名称" width="220" />
+          <el-table-column prop="cargoOwnerName" label="货主" />
+          <el-table-column prop="cargo" label="货种" />
+          <el-table-column prop="dischargePorts" label="目的港" />
           <el-table-column prop="name" label="操作">
             <template v-slot="scope">
               <el-button

+ 1 - 0
src/components/RemoteSelect.vue

@@ -10,6 +10,7 @@
     :loading="loading"
     @change="selectItem"
     @focus="getSelectList"
+    style="width: 200px"
   >
     <el-option
       v-for="item in options"

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

@@ -145,7 +145,7 @@
               style="
                 display: flex;
                 flex-direction: column;
-                height: 180px;
+                height: 160px;
                 justify-content: space-between;
                 align-items: center;
               "
@@ -663,7 +663,9 @@ async function getIndexSelect() {
 }
 
 router.beforeEach(() => {
-  myChart.value.dispose();
+  try {
+    myChart.value.dispose();
+  } catch (error) {}
 });
 async function downloadUFile() {
   let res = await api.getUFile({

+ 4 - 3
src/views/voyage/voyageDetail.vue

@@ -179,6 +179,7 @@
           <el-select
             v-model="dischargeForm.previousPortId"
             placeholder="请选择前置港口"
+            style="width: 197px !important"
           >
             <el-option
               v-for="item in beforePorts"
@@ -370,7 +371,7 @@
         ></el-input>
         <span class="unit">吨</span>
         <el-input
-          style="width: 80px !important"
+          style="width: 140px !important"
           class="info-line-text"
           v-model="voyage.actualLoadPieces"
           :disabled="disabledStatus"
@@ -494,7 +495,7 @@
         </div>
         <div class="line">
           <div class="info-line">
-            <div class="info-line-title">实卸货量</div>
+            <div class="info-line-title">实卸货量</div>
             <el-input
               style="width: 100px !important"
               class="info-line-text"
@@ -504,7 +505,7 @@
             ></el-input>
             <span class="unit">吨</span>
             <el-input
-              style="width: 80px !important"
+              style="width: 140px !important"
               class="info-line-text"
               placeholder="实际卸货件数"
               v-model="item.actualDischargePieces"