wzh vor 3 Jahren
Ursprung
Commit
e06d4745ec

+ 1 - 2
src/components/Aside.vue

@@ -22,5 +22,4 @@
     </el-sub-menu>
   </el-menu>
 </template>
-<script setup>
-</script>
+<script setup></script>

+ 1 - 2
src/components/Certs.vue

@@ -220,5 +220,4 @@ export default defineComponent({
 });
 </script>
 
-<style>
-</style>
+<style></style>

+ 3 - 1
src/components/Header.vue

@@ -27,6 +27,7 @@
           <el-timeline>
             <el-timeline-item
               v-for="item in timelineData"
+              :key="item"
               center
               :timestamp="item.timer"
               placement="top"
@@ -36,6 +37,7 @@
                 <div
                   style="margin-bottom: 5px; font-size: 12px"
                   v-for="(item1, index) in item.remarks"
+                  :key="item1"
                 >
                   {{ index + 1 }}. {{ item1.text }}
                 </div>
@@ -168,4 +170,4 @@ export default {
 .quit {
   margin-left: 26px;
 }
-</style>
+</style>

+ 37 - 42
src/styles/index.css

@@ -1,4 +1,3 @@
-
 .df {
   display: flex;
 }
@@ -26,7 +25,6 @@
   align-items: center;
 }
 
-
 .aifs {
   align-items: flex-start;
 }
@@ -35,157 +33,154 @@
   display: inline-block;
 }
 
-
 .pointer {
   cursor: pointer;
 }
 
-.m0a{
+.m0a {
   margin: 0 auto;
 }
 
-.mt5{
+.mt5 {
   margin-top: 5px;
 }
 
-.mt10{
+.mt10 {
   margin-top: 10px;
 }
 
-.mt20{
+.mt20 {
   margin-top: 20px;
 }
 
-.mt30{
+.mt30 {
   margin-top: 30px;
 }
 
-.mr5{
+.mr5 {
   margin-right: 5px;
 }
 
-.mr10{
+.mr10 {
   margin-right: 10px;
 }
 
-.mr20{
+.mr20 {
   margin-right: 20px;
 }
 
-.mr30{
+.mr30 {
   margin-right: 30px;
 }
 
-.mb5{
+.mb5 {
   margin-bottom: 5px;
 }
 
-.mb10{
+.mb10 {
   margin-bottom: 10px;
 }
 
-.mb20{
+.mb20 {
   margin-bottom: 20px;
 }
 
-.mb30{
+.mb30 {
   margin-bottom: 30px;
 }
 
-.ml5{
+.ml5 {
   margin-left: 5px;
 }
 
-.ml10{
+.ml10 {
   margin-left: 10px;
 }
 
-.ml20{
+.ml20 {
   margin-left: 20px;
 }
 
-.ml30{
+.ml30 {
   margin-left: 30px;
 }
 
-.p5{
+.p5 {
   padding: 5px;
 }
 
-.p10{
+.p10 {
   padding: 10px;
 }
 
-.p20{
+.p20 {
   padding: 20px;
 }
 
-.p30{
+.p30 {
   padding: 30px;
 }
 
-.pt5{
+.pt5 {
   padding-top: 5px;
 }
 
-.pt10{
+.pt10 {
   padding-top: 10px;
 }
 
-.pt20{
+.pt20 {
   padding-top: 20px;
 }
 
-.pt30{
+.pt30 {
   padding-top: 30px;
 }
 
-.pr5{
+.pr5 {
   padding-right: 5px;
 }
 
-.pr10{
+.pr10 {
   padding-right: 10px;
 }
 
-.pr20{
+.pr20 {
   padding-right: 20px;
 }
 
-.pr30{
+.pr30 {
   padding-right: 30px;
 }
 
-.pb5{
+.pb5 {
   padding-bottom: 5px;
 }
 
-.pb10{
+.pb10 {
   padding-bottom: 10px;
 }
 
-.pb20{
+.pb20 {
   padding-bottom: 20px;
 }
 
-.pb30{
+.pb30 {
   padding-bottom: 30px;
 }
 
-.pl5{
+.pl5 {
   padding-left: 5px;
 }
 
-.pl10{
+.pl10 {
   padding-left: 10px;
 }
 
-.pl20{
+.pl20 {
   padding-left: 20px;
 }
 
-.pl30{
+.pl30 {
   padding-left: 30px;
 }
-
-

+ 14 - 10
src/views/accountManage/clientList.vue

@@ -8,13 +8,13 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getClientList"
+          @keyup.enter="getClientList"
         ></el-input>
         <div class="seach-btn" @click="getClientList">查询</div>
       </div>
-      <el-button v-auth="'CLIENTACCOUNT'" type="primary" @click="showAddModal"
-        >添加客户</el-button
-      >
+      <el-button v-auth="'CLIENTACCOUNT'" type="primary" @click="showAddModal">
+        添加客户
+      </el-button>
     </div>
 
     <el-dialog
@@ -47,14 +47,16 @@
                 v-model="ruleForm.sharePermission"
                 :label="1"
                 size="large"
-                >有权限</el-radio
               >
+                有权限
+              </el-radio>
               <el-radio
                 v-model="ruleForm.sharePermission"
                 :label="0"
                 size="large"
-                >无权限</el-radio
               >
+                无权限
+              </el-radio>
             </el-form-item>
           </el-form>
         </div>
@@ -122,8 +124,9 @@
               :active-value="1"
               :inactive-value="0"
               @change="changeSharePermission($event, scope.row)"
-            /> </template
-        ></el-table-column>
+            />
+          </template>
+        </el-table-column>
 
         <el-table-column
           v-auth="'ADDACCOUNT'"
@@ -158,8 +161,9 @@
                 @click="showUpdateModal(scope.row, 1)"
                 size="small"
                 type="primary"
-                >修改客户权限</el-button
               >
+                修改客户权限
+              </el-button>
             </div>
           </template>
         </el-table-column>
@@ -350,4 +354,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 7 - 6
src/views/accountManage/subAccountList.vue

@@ -8,13 +8,13 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getSubAccountList"
+          @keyup.enter="getSubAccountList"
         ></el-input>
         <div class="seach-btn" @click="getSubAccountList">查询</div>
       </div>
-      <el-button v-auth="'ADDACCOUNT'" type="primary" @click="showAddModal"
-        >添加员工</el-button
-      >
+      <el-button v-auth="'ADDACCOUNT'" type="primary" @click="showAddModal">
+        添加员工
+      </el-button>
     </div>
 
     <el-dialog
@@ -154,8 +154,9 @@
                 @click="showUpdateModal(scope.row, 1)"
                 size="small"
                 type="primary"
-                >修改员工权限</el-button
               >
+                修改员工权限
+              </el-button>
             </div>
           </template>
         </el-table-column>
@@ -350,4 +351,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 9 - 9
src/views/agencyManage/agencyCompanyList.vue

@@ -8,13 +8,13 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getAgencyList"
+          @keyup.enter="getAgencyList"
         ></el-input>
         <div class="seach-btn" @click="getAgencyList">查询</div>
       </div>
-      <el-button v-auth="'ADDPROXY'" type="primary" @click="visable = true"
-        >添加代理</el-button
-      >
+      <el-button v-auth="'ADDPROXY'" type="primary" @click="visable = true">
+        添加代理
+      </el-button>
     </div>
 
     <el-dialog v-model="visable" title="添加代理" width="550px">
@@ -95,9 +95,9 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
-          <template v-slot="scope">
+          <!-- <template v-slot="scope">
             <div class="df aic jcsa">
-              <!-- <el-switch
+              <el-switch
                 v-model="scope.row.accountStatus"
                 active-color="#13ce66"
                 inactive-color="#ff4949"
@@ -105,10 +105,10 @@
                 inactive-text="禁用"
                 :active-value="1"
                 :inactive-value="0"
-              /> -->
+              />
               <el-button disabled size="small" type="danger">删除</el-button>
             </div>
-          </template>
+          </template> -->
         </el-table-column>
       </el-table>
       <div style="width: 100%; text-align: right; margin-top: 43px">
@@ -235,4 +235,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 4 - 4
src/views/authManage/addRole.vue

@@ -40,9 +40,9 @@
       style="display: flex; justify-content: space-between"
     />
     <div class="df aic jcfe mt50">
-      <el-button type="primary" @click="addRole">{{
-        roleId ? "修改员工" : "添加职位"
-      }}</el-button>
+      <el-button type="primary" @click="addRole">
+        {{ roleId ? "修改员工" : "添加职位" }}
+      </el-button>
     </div>
   </el-card>
 </template>
@@ -205,4 +205,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 10 - 5
src/views/authManage/departmentList.vue

@@ -8,13 +8,17 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getDepartmentList"
+          @keyup.enter="getDepartmentList"
         ></el-input>
         <div class="seach-btn" @click="getDepartmentList">查询</div>
       </div>
-      <el-button v-auth="'ADDUPDATEDEPT'" type="primary" @click="visable = true"
-        >添加部门</el-button
+      <el-button
+        v-auth="'ADDUPDATEDEPT'"
+        type="primary"
+        @click="visable = true"
       >
+        添加部门
+      </el-button>
     </div>
 
     <el-dialog
@@ -104,8 +108,9 @@
                 @click="showUpdateModal(scope.row)"
                 size="small"
                 type="primary"
-                >修改部门</el-button
               >
+                修改部门
+              </el-button>
             </div>
           </template>
         </el-table-column>
@@ -233,4 +238,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 7 - 6
src/views/authManage/roleList.vue

@@ -8,13 +8,13 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getRoleList"
+          @keyup.enter="getRoleList"
         ></el-input>
         <div class="seach-btn" @click="getRoleList">查询</div>
       </div>
-      <el-button v-auth="'ADDUPDATEROLE'" type="primary" @click="addRole"
-        >添加职位</el-button
-      >
+      <el-button v-auth="'ADDUPDATEROLE'" type="primary" @click="addRole">
+        添加职位
+      </el-button>
     </div>
     <div style="margin-top: 24px">
       <el-table :data="tableData" stripe style="width: 100%">
@@ -57,8 +57,9 @@
               @click="roleDetail(scope.row.id)"
               size="small"
               type="primary"
-              >详情</el-button
             >
+              详情
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -144,4 +145,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

+ 5 - 5
src/views/cargoManage/cargoList.vue

@@ -8,13 +8,13 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
-          @keyup.enter.native="getCargoList"
+          @keyup.enter="getCargoList"
         ></el-input>
         <div class="seach-btn" @click="getCargoList">查询</div>
       </div>
-      <el-button v-auth="'ADDCARGO'" type="primary" @click="addCargo"
-        >添加货种</el-button
-      >
+      <el-button v-auth="'ADDCARGO'" type="primary" @click="addCargo">
+        添加货种
+      </el-button>
     </div>
 
     <div style="margin-top: 24px">
@@ -161,4 +161,4 @@ onMounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
-</style>
+</style>

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

@@ -1,3 +1,2 @@
 <template>主页</template>
-<script setup>
-</script>
+<script setup></script>

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

@@ -181,8 +181,8 @@
         <div style="margin-right: 20px">
           信息更新时间 :
           <span style="font-size: 18px">
-            {{ subStr(voyage.infoUpdateTime) }}</span
-          >
+            {{ subStr(voyage.infoUpdateTime) }}
+          </span>
         </div>
       </div>
       <div class="line-container-p24">
@@ -552,8 +552,9 @@
           style="width: 220px; margin-right: 20px"
           type="primary"
           :loading="isDischargeLoadingExcel"
-          >下载卸货信息</el-button
         >
+          下载卸货信息
+        </el-button>
       </div>
       <el-table :data="dischargeList" stripe style="width: 1200px">
         <el-table-column
@@ -839,8 +840,9 @@
         v-auth="'BILLDOWNLOAD'"
         @click="downloadBillZip"
         :loading="billZipLoading"
-        >下载单据</el-button
       >
+        下载单据
+      </el-button>
     </div>
     <div class="line-container-p24" style="padding-left: 60px">
       <div class="df aic">

+ 15 - 11
src/views/voyage/voyageList.vue

@@ -59,7 +59,7 @@
           v-model="term"
           clearable
           style="width: 240px"
-          @keyup.enter.native="getVoyageList(1)"
+          @keyup.enter="getVoyageList(1)"
         ></el-input>
         <div class="search-btn" @click="getVoyageList(1)">查询</div>
       </div>
@@ -83,29 +83,33 @@
             size="medium"
             v-auth="'DOWNLOADVOYAGELIST'"
             @click="showExportModal('航次列表')"
-            >导出航次列表</el-button
           >
+            导出航次列表
+          </el-button>
           <el-button
             type="primary"
             size="medium"
             v-auth="'MULTDOWNLOADSHIPTRACK'"
             @click="showExportModal('航次跟踪')"
-            >导出航次跟踪</el-button
           >
+            导出航次跟踪
+          </el-button>
           <el-button
             type="primary"
             size="medium"
             @click="showExportModal('卸货记录')"
             v-auth="'MULTDOWNLOADDISCHARGE'"
-            >导出卸货记录</el-button
           >
+            导出卸货记录
+          </el-button>
           <el-button
             v-auth="'DOWNLOADFYDI'"
             type="primary"
             size="medium"
             @click="downloadFYDI"
-            >下载FYDI指数</el-button
           >
+            下载FYDI指数
+          </el-button>
         </div>
       </el-popover>
     </div>
@@ -131,9 +135,9 @@
           />
         </div>
         <div></div>
-        <el-button type="primary" @click="exportZip" :loading="isLoadingZip"
-          >导出{{ exportModalTitle }}</el-button
-        >
+        <el-button type="primary" @click="exportZip" :loading="isLoadingZip">
+          导出{{ exportModalTitle }}
+        </el-button>
       </div>
     </el-dialog>
     <el-dialog v-model="voyageAddDialogVisible" title="添加航次">
@@ -412,9 +416,9 @@
           <el-option label="已购买" :value="1" />
         </el-select>
       </div>
-      <el-button @click="resetFilter" class="mb10" size="small" type="primary"
-        >重置</el-button
-      >
+      <el-button @click="resetFilter" class="mb10" size="small" type="primary">
+        重置
+      </el-button>
     </div>
     <el-table
       :data="tableData"