gjy 2 年之前
父节点
当前提交
9de8c30a48

+ 14 - 9
src/permission.js

@@ -17,7 +17,7 @@ NProgress.configure({
   showSpinner: false
 }) // NProgress Configuration
 
-const whiteList = ['/login', '/dashboard'] // no redirect whitelist
+const whiteList = ['/login'] // no redirect whitelist
 
 router.beforeEach(async (to, from, next) => {
   // start progress bar
@@ -41,10 +41,9 @@ router.beforeEach(async (to, from, next) => {
       const hasGetUserInfo = store.getters.name
       // console.log(store.getters)
       if (store.getters.token) {
-        
-        // if (!whiteList.includes(to.path)) {
-        //   checkLoginUser();
-        // }
+        if (!whiteList.includes(to.path)) {
+          checkLoginUser();
+        }
         next();
       } else {
         // try {
@@ -82,11 +81,17 @@ router.beforeEach(async (to, from, next) => {
     //   next(`/login?redirect=${to.path}`)
     //   NProgress.done()
     // }
+    
     if (whiteList.indexOf(to.path) !== -1) {
-      if (!whiteList.includes(to.path)) {
-        checkLoginUser();
-      }
-      next();
+      // if(!localStorage.getItem('ws-pf_userId')){
+      //   next(getLoginOutUrl() + `?redirect=${to.path}`);
+      //   NProgress.done();
+      // }else{
+        if (!whiteList.includes(to.path)) {
+          checkLoginUser();
+        }
+        next();
+      // }
     } else {
       next(getLoginOutUrl() + `?redirect=${to.path}`);
       NProgress.done();

+ 1 - 1
src/store/modules/user.js

@@ -40,7 +40,6 @@ const mutations = {
     state.avatar = avatar
   },
   SET_ROLES: (state, roles) => {
-    console.log(roles)
     state.roles = roles
   },
 }
@@ -122,6 +121,7 @@ const actions = {
     vesselBankFlag = 'B',
     compName = ''
   }) {
+    debugger
     const response = await getInfo()
     const {
       staffName,

+ 6 - 0
src/views/cargoOwnerManagement/empowerExamine.vue

@@ -50,6 +50,12 @@
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
         highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
         <el-table-column prop="phone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="cardNumber" label="身份证号" min-width="165"></el-table-column>

+ 6 - 0
src/views/cargoOwnerManagement/merchantVerification.vue

@@ -37,6 +37,12 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+				<el-table-column type="index" width="60"  label="序号" align="center">
+					<template scope="scope">
+						<span>{{scope.$index + 1}}</span>
+						<!-- <span v-else>{{scope.$index}}</span> -->
+					</template>
+				</el-table-column>
 				<el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
 				<el-table-column prop="phone" label="账号" min-width="107"></el-table-column>
 				<el-table-column prop="cardNumber" label="身份证号" min-width="162"></el-table-column>

+ 6 - 0
src/views/cargoOwnerManagement/taskAudit.vue

@@ -37,6 +37,12 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+				<el-table-column type="index" width="60"  label="序号" align="center">
+					<template scope="scope">
+						<span>{{scope.$index + 1}}</span>
+						<!-- <span v-else>{{scope.$index}}</span> -->
+					</template>
+				</el-table-column>
 				<el-table-column prop="cargoOwnerName" label="货主姓名" min-width="125"></el-table-column>
 				<el-table-column prop="taskNo" label="任务编号" min-width="165"></el-table-column>
 				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>

+ 6 - 0
src/views/contractManagement/contractModel.vue

@@ -49,6 +49,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>

+ 6 - 0
src/views/driverManagement/fleetInfo.vue

@@ -38,6 +38,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="队长"></el-table-column>
         <el-table-column prop="driverNumber" label="账号"></el-table-column>
         <el-table-column prop="fleetName" label="车队名称"></el-table-column>

+ 6 - 0
src/views/driverManagement/identityExamine.vue

@@ -52,6 +52,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="90"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="130"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>

+ 6 - 0
src/views/driverManagement/vehicleExamine.vue

@@ -43,6 +43,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>

+ 6 - 0
src/views/enterpriseManagement/enterpriseAudit.vue

@@ -42,6 +42,12 @@
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
         highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="companyName" label="企业名称" min-width="150"></el-table-column>
         <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="160"></el-table-column>
         <el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>

+ 6 - 0
src/views/feedbackManagement/userFeedback.vue

@@ -34,6 +34,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="number" label="工单编号"></el-table-column>
         <el-table-column prop="orderNo" label="关联订单"></el-table-column>
         <el-table-column prop="initiator" label="发起方"></el-table-column>

+ 6 - 0
src/views/platformManagement/specifiedRecords.vue

@@ -23,6 +23,12 @@
         </el-row>
       </div>
       <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
+        <el-table-column type="index" width="60"  label="序号" align="center">
+            <template scope="scope">
+                <span>{{scope.$index + 1}}</span>
+                <!-- <span v-else>{{scope.$index}}</span> -->
+            </template>
+        </el-table-column>
         <el-table-column prop="versionNumber" label="版本号" />
         <el-table-column prop="compilationUnit" label="编写单位" />
         <el-table-column prop="editor" label="编撰人员" />