From 030ce888cc06898159c51b74745257af1b248d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Wed, 17 Aug 2022 09:58:38 +0800
Subject: [PATCH] up

---
 src/permission.js                        |  9 +++++----
 src/views/rain/inspection/inspection.vue | 19 +++++++++++++++----
 src/views/rain/inspection/law.vue        | 17 +++++++++++++++--
 src/views/rain/maintain/law.vue          | 13 +++++++++++++
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 0e124be..2dbbd62 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -28,10 +28,11 @@ router.beforeEach(async (to, from, next) => {
 
   if (hasToken) {
     if (to.path === '/login') {
-      // if is logged in, redirect to the home page
-      next({
-        path: '/'
-      })
+      // if is logged in, redirect to the home page
+      
+      await store.dispatch('user/resetToken');
+      next(to.fullPath)
+      
       NProgress.done()
     } else {
       // determine whether the user has obtained his permission roles through getInfo
diff --git a/src/views/rain/inspection/inspection.vue b/src/views/rain/inspection/inspection.vue
index f8de792..09aafae 100644
--- a/src/views/rain/inspection/inspection.vue
+++ b/src/views/rain/inspection/inspection.vue
@@ -17,8 +17,6 @@
                 <el-option v-for="item in selects.areasList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
-
-
               <el-select class="vm10" filterable v-model="searchFields.status" placeholder="请选择状态">
                 <el-option v-for="item in selects.statusList" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
@@ -97,6 +95,9 @@
                 <!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
                 <div v-else></div> -->
               </div>
+              <div v-else-if="column.type=='admin'">
+                {{getUserName(scope.row)}}
+              </div>
               <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
                     <el-tag  type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
@@ -1052,9 +1053,9 @@
           },
 
           {
-            field: "admin",
+            field: "userName",
             title: "提交人",
-            type: "format",
+            type: "admin",
             align: "center",
             width: 180
           },
@@ -1104,6 +1105,16 @@
       }
     },
     methods: {
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
+      },
       handleSelectionChange(val) {
         console.log(val)
         this.reviewList = val
diff --git a/src/views/rain/inspection/law.vue b/src/views/rain/inspection/law.vue
index bedc77a..6449108 100644
--- a/src/views/rain/inspection/law.vue
+++ b/src/views/rain/inspection/law.vue
@@ -74,6 +74,9 @@
                 <!-- <div v-if="column.field=='ask_content_detail'">{{scope.row[column.field]?scope.row[column.field].value:""}}</div>
                 <div v-else></div> -->
               </div>
+              <div v-else-if="column.type=='admin'">
+                {{getUserName(scope.row)}}
+              </div>
               <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
                     <el-tag  type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
@@ -624,9 +627,9 @@
             width: 180
           },
           {
-            field: "admin",
+            field: "userName",
             title: "提交人",
-            type: "format",
+            type: "admin",
             align: "center",
             width: 180
           },
@@ -655,6 +658,16 @@
     watch: {
     },
     methods: {
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
+      },
       initLoad() {
         var that = this;
         var clientHeight = document.documentElement.clientHeight
diff --git a/src/views/rain/maintain/law.vue b/src/views/rain/maintain/law.vue
index 98ae4d9..dffa7ec 100644
--- a/src/views/rain/maintain/law.vue
+++ b/src/views/rain/maintain/law.vue
@@ -52,6 +52,9 @@
               <div v-else-if="column.type=='format'">
                 {{scope.row[column.field]?scope.row[column.field].name:""}}
               </div>
+              <div v-else-if="column.type=='admin'">
+                {{getUserName(scope.row)}}
+              </div>
               <!-- <div v-else-if="column.type=='end_type'">
                     <el-tag v-if="scope.row[column.field]==0">无</el-tag>
                     <el-tag  type="danger" v-if="scope.row[column.field]==1" >违法转办</el-tag>
@@ -619,6 +622,16 @@
     },
     methods: {
 
+      getUserName(row) {
+        if (row.admin) {
+          return row.admin.name;
+        } else if (row.user) {
+          return row.user.name;
+        } else {
+          return "未知";
+        }
+
+      },
       initLoad() {
         var that = this;
         var clientHeight = document.documentElement.clientHeight