Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi-admin/src/router/index.js

@@ -87,7 +87,7 @@ export const constantRoutes = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/role/user-auth'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/role' }
+        meta: { title: '分配用户', activeMenu: '/system/role' }
       }
     ]
   },

chuanyi-admin/src/views/system/role/user-auth.vue

@@ -60,10 +60,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-close"
+          icon="el-icon-back"
           size="mini"
           @click="handleClose"
-        >关闭</el-button>
+        >返回</el-button>
       </el-col>
     </el-row>
 
@@ -209,6 +209,9 @@ export default {
       getUserListById(this.queryParams).then(res => {
         if (res.code === 200) {
           const data = res.data
+          data.userList.forEach(item => {
+            item.lastLoginTime ? item.lastLoginTime : item.lastLoginTime = '暂未登录'
+          })
           this.userList = data.userList
           this.total = data.count
           this.loading = false

chuanyi-admin/src/views/system/role/user-menu.vue

@@ -28,10 +28,10 @@
         <el-button
           type="warning"
           plain
-          icon="el-icon-close"
+          icon="el-icon-back"
           size="mini"
           @click="handleClose"
-        >关闭</el-button>
+        >返回</el-button>
       </el-col>
     </el-row>
 

chuanyi-admin/src/views/system/role/user-select.vue

@@ -123,6 +123,9 @@ export default {
       getUserList(this.queryParams).then(res => {
         if (res.code === 200) {
           const data = res.data
+          data.userList.forEach(item => {
+            item.lastLoginTime ? item.lastLoginTime : item.lastLoginTime = '暂未登录'
+          })
           this.userList = data.userList
           this.total = data.count
         }