Merge remote-tracking branch 'origin/master'

ebts-ui/src/api/system/menu.js

@@ -26,9 +26,9 @@ export function treeselect() {
 }
 
 // 根据角色ID查询菜单下拉树结构
-export function roleMenuTreeselect(roleId) {
+export function roleMenuTreeSelect(roleId) {
   return request({
-    url: '/system/menu/roleMenuTreeselect/' + roleId,
+    url: '/system/menu/roleMenuTreeSelect/' + roleId,
     method: 'get'
   })
 }

ebts-ui/src/api/tool/regular.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询校验规则列表
 export function listRegular(query) {
   return request({
-    url: '/tool/regular/option',
+    url: '/tool/regular/list',
     method: 'get',
     params: query
   })

ebts-ui/src/store/modules/user.js

@@ -37,8 +37,8 @@ const user = {
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
         login(username, password, code, uuid).then(res => {
-          setToken(res.token)
+          setToken(res.data)
-          commit('SET_TOKEN', res.token)
+          commit('SET_TOKEN', res.data)
           resolve()
         }).catch(error => {
           reject(error)
@@ -50,18 +50,19 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo(state.token).then(res => {
-          const user = res.user
+          let  data = res.data
+          const user = data.user
           // const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : user.avatar;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
+            commit('SET_ROLES', data.roles)
-            commit('SET_PERMISSIONS', res.permissions)
+            commit('SET_PERMISSIONS', data.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
-          resolve(res)
+          resolve(data)
         }).catch(error => {
           reject(error)
         })

ebts-ui/src/views/system/role/index.vue

@@ -261,7 +261,7 @@
 
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import { treeselect as menuTreeselect, roleMenuTreeSelect } from "@/api/system/menu";
 import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
 
 export default {
@@ -401,17 +401,19 @@ export default {
       return checkedKeys;
     },
     /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
+    getRoleMenuTreeSelect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
+      return roleMenuTreeSelect(roleId).then(res => {
-        this.menuOptions = response.menus;
+        let data = res.data
-        return response;
+        this.menuOptions = data.menus;
+        return data;
       });
     },
     /** 根据角色ID查询部门树结构 */
     getRoleDeptTreeselect(roleId) {
-      return roleDeptTreeselect(roleId).then(response => {
+      return roleDeptTreeselect(roleId).then(res => {
-        this.deptOptions = response.depts;
+        let data = res.data
-        return response;
+        this.deptOptions = data.deptList;
+        return data;
       });
     },
     // 角色状态修改
@@ -520,7 +522,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
+      const roleMenu = this.getRoleMenuTreeSelect(roleId);
       getRole(roleId).then(response => {
         this.form = response.data;
         this.open = true;
@@ -535,12 +537,12 @@ export default {
     /** 分配数据权限操作 */
     handleDataScope(row) {
       this.reset();
-      const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
+      const roleDeptTreeSelect = this.getRoleDeptTreeselect(row.roleId);
       getRole(row.roleId).then(response => {
         this.form = response.data;
         this.openDataScope = true;
         this.$nextTick(() => {
-          roleDeptTreeselect.then(res => {
+          roleDeptTreeSelect.then(res => {
             this.$refs.dept.setCheckedKeys(res.checkedKeys);
           });
         });

ebts-ui/src/views/system/user/index.vue

@@ -556,9 +556,10 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
-      getUser().then(response => {
+      getUser().then(res => {
-        this.postOptions = response.posts;
+        let data = res.data
-        this.roleOptions = response.roles;
+        this.postOptions = data.posts;
+        this.roleOptions = data.roles;
         this.open = true;
         this.title = "添加用户";
         this.form.password = this.initPassword;

ebts-ui/src/views/system/user/profile/index.vue

@@ -80,10 +80,11 @@ export default {
   },
   methods: {
     getUser() {
-      getUserProfile().then(response => {
+      getUserProfile().then(res => {
-        this.user = response.data;
+        let data = res.data
-        this.roleGroup = response.roleGroup;
+        this.user = data.user;
-        this.postGroup = response.postGroup;
+        this.roleGroup = data.roleGroup;
+        this.postGroup = data.postGroup;
       });
     }
   }

ebts-ui/src/views/system/user/profile/userAvatar.vue

@@ -124,11 +124,12 @@ export default {
       this.$refs.cropper.getCropBlob(data => {
         let formData = new FormData();
         formData.append("avatarfile", data);
-        uploadAvatar(formData).then(response => {
+        uploadAvatar(formData).then(res => {
+          let data = res.data
           this.open = false;
-          // this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+          // this.options.img = process.env.VUE_APxP_BASE_API + response.imgUrl;
 
-          this.options.img = response.imgUrl;
+          this.options.img = data;
           store.commit('SET_AVATAR', this.options.img);
           this.msgSuccess("修改成功");
           this.visible = false;