lilei před 2 roky
rodič
revize
e9c53db200
2 změnil soubory, kde provedl 39 přidání a 25 odebrání
  1. 3 0
      src/utils/request.js
  2. 36 25
      src/views/power/user/userList.vue

+ 3 - 0
src/utils/request.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import axios from 'axios'
 import store from '@/store'
+import router from '@/router'
 import notification from 'ant-design-vue/es/notification'
 import modal from 'ant-design-vue/es/modal'
 import { VueAxios } from './axios'
@@ -94,6 +95,8 @@ const err = (error) => {
 
 // request interceptor
 service.interceptors.request.use(config => {
+  console.log(config)
+  console.log(router)
   const token = store.getters.token
   if (token) {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改

+ 36 - 25
src/views/power/user/userList.vue

@@ -48,31 +48,42 @@
           <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
         </span>
         <span slot="action" slot-scope="text, record">
-          <a-icon
-            type="edit"
-            title="编辑"
-            v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
-            :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
-            @click="handleEdit(record)"
-          />
-          <a-icon
-            type="unlock"
-            title="重置密码"
-            v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
-            :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
-            @click="resetPassword(record)" />
-          <a-icon
-            type="delete"
-            title="删除"
-            :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
-            @click="delect(record)"/>
-          <a-icon
-            type="setting"
-            title="分区设置"
-            v-if="$hasPermissions('B_power_user_set')"
-            :style="{fontSize: '20px',color:' #00aa00',padding: '0 10px'}"
-            @click="handleSetting(record)" />
+          <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
+              @click="handleEdit(record)"
+            >
+            编辑
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
+              @click="resetPassword(record)"
+            >
+            重置密码
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="$hasPermissions('B_power_user_set')"
+              @click="handleSetting(record)"
+            >
+            分区设置
+            </a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
+              @click="delect(record)"
+            >
+            删除
+            </a-button>
         </span>
       </s-table>
     </a-spin>