Jelajahi Sumber

返回修改

LAPTOP-16IUEB3P\Lenovo 3 tahun lalu
induk
melakukan
d768057c4c

+ 21 - 26
src/api/codeManagement/index.js

@@ -1,45 +1,40 @@
 import request from '@/utils/request';
 
 // 保存/修改编码信息
-export async function saveNew(data) {
-    const res = await request.post('/main/codemanage/saveNew', data);
-    if (res.data.code == 0) {
-        return res.data;
-    }
-    return Promise.reject(new Error(res.data.message));
+export async function saveNew (data) {
+  const res = await request.post('/main/codemanage/saveNew', data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }
 
 // 获取编码列表
-export async function getCodeList(data) {
-    let par = new URLSearchParams(data)
-    const res = await request.post(`/main/codemanage/page?`+par, {});
-    if (res.data.code == 0) {
-        return {
-          list: res.data.data.records,
-          count: res.data.data.total
-        }
-    }
-    return Promise.reject(new Error(res.data.message));
+export async function getCodeList (data) {
+  let par = new URLSearchParams(data);
+  const res = await request.get(`/main/codemanage/page?` + par, {});
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 删除编码
  */
-export async function removeCodeInfo(params) {
-  const res = await request.post('/main/codemanage/delete' , params );
+export async function removeCodeInfo (params) {
+  const res = await request.post('/main/codemanage/delete', params);
   if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 获取编码详情
-export async function getCodeDetail(id) {
-    const res = await request.get(`/main/codemanage/getById/`+id, {});
-    if (res.data.code == 0) {
-       return res.data
-    }
-    return Promise.reject(new Error(res.data.message));
+export async function getCodeDetail (id) {
+  const res = await request.get(`/main/codemanage/getById/` + id, {});
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

+ 77 - 78
src/api/flowable/manage.js

@@ -1,95 +1,94 @@
-import request from '@/utils/request'
-import {Message} from 'element-ui'
+import request from '@/utils/request';
+import { Message } from 'element-ui';
 
-export function postAction(url, parameter) {
-    return request({
-        url: url,
-        method: 'post',
-        data: parameter
-    })
+export function postAction (url, parameter) {
+  return request({
+    url: url,
+    method: 'post',
+    data: parameter
+  });
 }
 
-export async function listDictionaries() {
-    const res = await request.get('/system/dict/getPage', {});
-    if (res.data.code == 0) {
-      return {
-        list: res.data.data.records,
-        count: res.data.data.total
-      };
-    }
-    return Promise.reject(new Error(res.data.message));
+export async function listDictionaries () {
+  const res = await request.get('/system/dict/getPage', {});
+  if (res.data.code == 0) {
+    return res.data.data;
   }
+  return Promise.reject(new Error(res.data.message));
+}
 
-export function httpAction(url, parameter, method) {
-    return request({
-        url: url,
-        method: method,
-        data: parameter
-    })
+export function httpAction (url, parameter, method) {
+  return request({
+    url: url,
+    method: method,
+    data: parameter
+  });
 }
 
-export function putAction(url, parameter) {
-    return request({
-        url: url,
-        method: 'put',
-        data: parameter
-    })
+export function putAction (url, parameter) {
+  return request({
+    url: url,
+    method: 'put',
+    data: parameter
+  });
 }
 
-export function getAction(url, parameter) {
-    return request({
-        url: url,
-        method: 'get',
-        params: parameter
-    })
+export function getAction (url, parameter) {
+  return request({
+    url: url,
+    method: 'get',
+    params: parameter
+  });
 }
 
-export function downloadAction(url, method, parameter, filename) {
-    return request({
-        url: url,
-        method: method,
-        params: parameter,
-        responseType: 'blob',
-    }).then(response => {
-        const type = response.type || ''
-        if (type.includes('application/json')) {
-            let reader = new FileReader()
-            reader.onload = e => {
-                if (e.target.readyState === 2) {
-                    let res = {}
-                    res = JSON.parse(e.target.result)
-                    Message.error(res.msg)
-                }
-            }
-            reader.readAsText(response)
+export function downloadAction (url, method, parameter, filename) {
+  return request({
+    url: url,
+    method: method,
+    params: parameter,
+    responseType: 'blob'
+  })
+    .then((response) => {
+      const type = response.type || '';
+      if (type.includes('application/json')) {
+        let reader = new FileReader();
+        reader.onload = (e) => {
+          if (e.target.readyState === 2) {
+            let res = {};
+            res = JSON.parse(e.target.result);
+            Message.error(res.msg);
+          }
+        };
+        reader.readAsText(response);
+      } else {
+        filename = decodeURI(filename);
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(response, filename);
         } else {
-            filename = decodeURI(filename);
-            if (typeof window.navigator.msSaveBlob !== 'undefined') {
-                window.navigator.msSaveBlob(response, filename)
-            } else {
-                var blobURL = window.URL.createObjectURL(response)// 将blob对象转为一个URL
-                var tempLink = document.createElement('a')// 创建一个a标签
-                tempLink.style.display = 'none'
-                tempLink.href = blobURL
-                tempLink.setAttribute('download', filename)// 给a标签添加下载属性
-                if (typeof tempLink.download === 'undefined') {
-                    tempLink.setAttribute('target', '_blank')
-                }
-                document.body.appendChild(tempLink)// 将a标签添加到body当中
-                tempLink.click()// 启动下载
-                document.body.removeChild(tempLink)// 下载完毕删除a标签
-                window.URL.revokeObjectURL(blobURL)
-            }
+          var blobURL = window.URL.createObjectURL(response); // 将blob对象转为一个URL
+          var tempLink = document.createElement('a'); // 创建一个a标签
+          tempLink.style.display = 'none';
+          tempLink.href = blobURL;
+          tempLink.setAttribute('download', filename); // 给a标签添加下载属性
+          if (typeof tempLink.download === 'undefined') {
+            tempLink.setAttribute('target', '_blank');
+          }
+          document.body.appendChild(tempLink); // 将a标签添加到body当中
+          tempLink.click(); // 启动下载
+          document.body.removeChild(tempLink); // 下载完毕删除a标签
+          window.URL.revokeObjectURL(blobURL);
         }
-    }).catch((error) => {
-        console.log(error)
+      }
     })
+    .catch((error) => {
+      console.log(error);
+    });
 }
 
-export function deleteAction(url, parameter) {
-    return request({
-        url: url,
-        method: 'delete',
-        params: parameter
-    })
+export function deleteAction (url, parameter) {
+  return request({
+    url: url,
+    method: 'delete',
+    params: parameter
+  });
 }

+ 5 - 8
src/api/system/dictionary/index.js

@@ -4,13 +4,10 @@ import request from '@/utils/request';
  * 查询字典列表
  * @param params 查询条件
  */
-export async function listDictionaries() {
+export async function listDictionaries () {
   const res = await request.get('/system/dict/getPage', {});
   if (res.data.code == 0) {
-    return {
-      list: res.data.data.records,
-      count: res.data.data.total
-    };
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -19,7 +16,7 @@ export async function listDictionaries() {
  * 添加字典
  * @param data 字典信息
  */
-export async function addDictionary(data) {
+export async function addDictionary (data) {
   const res = await request.post('/system/dict/submit', data);
   if (res.data.code == 0) {
     return res.data.message;
@@ -31,7 +28,7 @@ export async function addDictionary(data) {
  * 修改字典
  * @param data 字典信息
  */
-export async function updateDictionary(data) {
+export async function updateDictionary (data) {
   const res = await request.post('/system/dict/update', data);
   if (res.data.code == 0) {
     return res.data.message;
@@ -43,7 +40,7 @@ export async function updateDictionary(data) {
  * 删除字典
  * @param id 字典id
  */
-export async function removeDictionary(id, f) {
+export async function removeDictionary (id, f) {
   let res;
   if (f) {
     res = await request.post('/system/dict/removeDictInfoById', id);

+ 17 - 25
src/api/system/organization/index.js

@@ -1,11 +1,10 @@
 import request from '@/utils/request';
 
-
 /**
  * 查询机构列表
  * @param params 查询条件
  */
-export async function listOrganizations(params) {
+export async function listOrganizations (params) {
   const res = await request.get('/main/group/getGroupList', params);
   if (res.data.code == 0) {
     return res.data.data;
@@ -17,24 +16,20 @@ export async function listOrganizations(params) {
  * 查询人员列表
  * @param params 查询条件
  */
-export async function getUserPage(params) {
-  let par = new URLSearchParams(params)
-  const res = await request.get(`/main/user/getUserPage?`+par, {});
+export async function getUserPage (params) {
+  let par = new URLSearchParams(params);
+  const res = await request.get(`/main/user/getUserPage?` + par, {});
   if (res.data.code == 0) {
-    return {
-      list: res.data.data.records,
-      count: res.data.data.total
-    };
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 添加机构
  * @param data 机构信息
  */
-export async function addOrganization(data) {
+export async function addOrganization (data) {
   const res = await request.post('/main/group/save', data);
   if (res.data.code == 0) {
     return res.data.message;
@@ -46,7 +41,7 @@ export async function addOrganization(data) {
  * 修改机构
  * @param data 机构信息
  */
-export async function updateOrganization(data) {
+export async function updateOrganization (data) {
   const res = await request.put('/main/group/update', data);
   if (res.data.code == 0) {
     return res.data.message;
@@ -58,21 +53,20 @@ export async function updateOrganization(data) {
  * 删除机构
  * @param params 机构id数组
  */
-export async function removeOrganization(params) {
-  const res = await request.post('/main/group/delete' , params );
+export async function removeOrganization (params) {
+  const res = await request.post('/main/group/delete', params);
   if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 获取人员详情
  * @param id 人员id
  */
-export async function getUserDetail(id) {
-  const res = await request.get(`/main/user/getById/`+id  );
+export async function getUserDetail (id) {
+  const res = await request.get(`/main/user/getById/` + id);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -83,20 +77,19 @@ export async function getUserDetail(id) {
  * 新增或修改人员信息
  * @param params 人员信息
  */
-export async function saveOrUpdateUser(params) {
-  const res = await request.post('/main/user/saveNew' , params  );
+export async function saveOrUpdateUser (params) {
+  const res = await request.post('/main/user/saveNew', params);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 删除人员
  * @param params 人员信息
  */
-export async function removePersonnel(params) {
+export async function removePersonnel (params) {
   const res = await request.post('/main/user/removeById', params);
   if (res.data.code == 0) {
     return res.data;
@@ -104,15 +97,14 @@ export async function removePersonnel(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 检查工号是否存在
  * @param jobNumber 工号
  */
-export async function checkExistence(jobNumber) {
-  const res = await request.get('/main/user/getByJobNumber/'+ jobNumber );
+export async function checkExistence (jobNumber) {
+  const res = await request.get('/main/user/getByJobNumber/' + jobNumber);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

+ 10 - 13
src/api/system/role/index.js

@@ -4,20 +4,17 @@ import request from '@/utils/request';
  * 分页查询角色
  * @param params 查询条件
  */
-export async function pageRoles(params) {
+export async function pageRoles (params) {
   const res = await request.get('/sys/role/page', {
     params
   });
   if (res.data.code == 0) {
-    return {
-      list: res.data.data.records,
-      count: res.data.data.total
-    };
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-export async function putRoles(params) {
+export async function putRoles (params) {
   const res = await request.put('/sys/role/update', params);
   if (res.data.code == 0) {
     return res.data;
@@ -29,7 +26,7 @@ export async function putRoles(params) {
  * 查询角色列表
  * @param params 查询条件
  */
-export async function listRoles(params) {
+export async function listRoles (params) {
   let par = new URLSearchParams(params);
   const res = await request.get(`/sys/role/page?` + par, {});
   if (res.data.code == 0) {
@@ -42,7 +39,7 @@ export async function listRoles(params) {
  * 添加角色
  * @param data 角色信息
  */
-export async function addRole(data) {
+export async function addRole (data) {
   const res = await request.post('/sys/role/add', data);
   if (res.data.code == 0) {
     return res.data.message;
@@ -54,7 +51,7 @@ export async function addRole(data) {
  * 修改角色
  * @param data 角色信息
  */
-export async function updateRole(data) {
+export async function updateRole (data) {
   const res = await request.put('/system/role', data);
   if (res.data.code === 0) {
     return res.data.message;
@@ -66,7 +63,7 @@ export async function updateRole(data) {
  * 删除角色
  * @param id 角色id
  */
-export async function removeRole(id, f) {
+export async function removeRole (id, f) {
   let res;
   if (f) {
     res = await request.delete('/sys/role/delete', {
@@ -88,7 +85,7 @@ export async function removeRole(id, f) {
  * 批量删除角色
  * @param ids 角色id集合
  */
-export async function removeRoles(data) {
+export async function removeRoles (data) {
   const res = await request.delete('/system/role/batch', {
     data
   });
@@ -102,7 +99,7 @@ export async function removeRoles(data) {
  * 获取角色分配的菜单
  * @param roleId 角色id
  */
-export async function listRoleMenus(id) {
+export async function listRoleMenus (id) {
   const res = await request.get(`/sys/role/getByRoleId/${id}`);
   if (res.data.code == 0) {
     return res.data.data;
@@ -115,7 +112,7 @@ export async function listRoleMenus(id) {
  * @param roleId 角色id
  * @param data 菜单id集合
  */
-export async function updateRoleMenus(data) {
+export async function updateRoleMenus (data) {
   const res = await request.post('/sys/role/ResourceGrant', data);
   if (res.data.code == 0) {
     return res.data;

+ 27 - 32
src/api/system/user/index.js

@@ -4,23 +4,20 @@ import request from '@/utils/request';
  * 分页查询用户
  * @param params 查询条件
  */
-export async function pageUsers(params) {
-  let par = new URLSearchParams(params)
-  const res = await request.get(`/system/account/getAccountPage?`+par, params);
-  if (res.data.code == 0 ) {
-    const result = {
-      count:0,
-      list:[]
-    }
-    result.count = res.data.data.total
-    result.list = res.data.data.records
-    return result;
+export async function pageUsers (params) {
+  let par = new URLSearchParams(params);
+  const res = await request.get(
+    `/system/account/getAccountPage?` + par,
+    params
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
 // 修改用户信息
-export async function putUsers(params) {
+export async function putUsers (params) {
   const res = await request.post('/system/account/update', params);
   if (res.data.code == 0) {
     return res.data;
@@ -28,9 +25,8 @@ export async function putUsers(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 新增用户
-export async function addUsers(params) {
+export async function addUsers (params) {
   const res = await request.post('/system/account/submit', params);
   if (res.data.code == 0) {
     return res.data;
@@ -39,7 +35,7 @@ export async function addUsers(params) {
 }
 
 // 删除用户
-export async function deleteUsers(params) {
+export async function deleteUsers (params) {
   const res = await request.post('/system/account/removeById', params);
   if (res.data.code == 0) {
     return res.data;
@@ -48,8 +44,8 @@ export async function deleteUsers(params) {
 }
 
 // 管理员重置密码
-export async function resetPassword(params) {
-  const res = await request.get(`/system/account/resetPassword/`+params, {});
+export async function resetPassword (params) {
+  const res = await request.get(`/system/account/resetPassword/` + params, {});
   if (res.data.code == 0) {
     return res.data;
   }
@@ -57,7 +53,7 @@ export async function resetPassword(params) {
 }
 
 // 修改用户密码
-export async function updatePassword(params) {
+export async function updatePassword (params) {
   const res = await request.post('/system/account/updatePassword', params);
   if (res.data.code == 0) {
     return res.data;
@@ -66,7 +62,7 @@ export async function updatePassword(params) {
 }
 
 // 退出登录
-export async function userLogout(params) {
+export async function userLogout (params) {
   const res = await request.post('/main/user/logout', params);
   if (res.data.code == 0) {
     return res.data;
@@ -74,14 +70,13 @@ export async function userLogout(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 /**
  * 查询未绑定用户账号
  * @param params 查询条件
  */
-export async function getNotBoundAccount(params) {
+export async function getNotBoundAccount (params) {
   const res = await request.get('/system/account/getNotBoundAccount');
-  if (res.data.code == 0 ) {
+  if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -92,7 +87,7 @@ export async function getNotBoundAccount(params) {
  * 查询用户列表
  * @param params 查询条件
  */
-export async function listUsers(params) {
+export async function listUsers (params) {
   const res = await request.get('/system/user', {
     params
   });
@@ -106,7 +101,7 @@ export async function listUsers(params) {
  * 根据id查询用户
  * @param id 用户id
  */
-export async function getUser(id) {
+export async function getUser (id) {
   const res = await request.get('/system/user/' + id);
   if (res.data.code === 0) {
     return res.data.data;
@@ -118,7 +113,7 @@ export async function getUser(id) {
  * 添加用户
  * @param data 用户信息
  */
-export async function addUser(data) {
+export async function addUser (data) {
   const res = await request.post('/system/user', data);
   if (res.data.code === 0) {
     return res.data.message;
@@ -130,7 +125,7 @@ export async function addUser(data) {
  * 修改用户
  * @param data 用户信息
  */
-export async function updateUser(data) {
+export async function updateUser (data) {
   const res = await request.put('/system/user', data);
   if (res.data.code === 0) {
     return res.data.message;
@@ -142,7 +137,7 @@ export async function updateUser(data) {
  * 删除用户
  * @param id 用户id
  */
-export async function removeUser(id) {
+export async function removeUser (id) {
   const res = await request.delete('/system/user/' + id);
   if (res.data.code === 0) {
     return res.data.message;
@@ -154,7 +149,7 @@ export async function removeUser(id) {
  * 批量删除用户
  * @param data 用户id集合
  */
-export async function removeUsers(data) {
+export async function removeUsers (data) {
   const res = await request.delete('/system/user/batch', {
     data
   });
@@ -169,7 +164,7 @@ export async function removeUsers(data) {
  * @param userId 用户id
  * @param status 状态
  */
-export async function updateUserStatus(userId, status) {
+export async function updateUserStatus (userId, status) {
   const res = await request.put('/system/user/status', {
     userId,
     status
@@ -186,7 +181,7 @@ export async function updateUserStatus(userId, status) {
  * @param password 密码
  * @returns {Promise<string>}
  */
-export async function updateUserPassword(userId, password = '123456') {
+export async function updateUserPassword (userId, password = '123456') {
   const res = await request.put('/system/user/password', {
     userId,
     password
@@ -201,7 +196,7 @@ export async function updateUserPassword(userId, password = '123456') {
  * 导入用户
  * @param file excel文件
  */
-export async function importUsers(file) {
+export async function importUsers (file) {
   const formData = new FormData();
   formData.append('file', file);
   const res = await request.post('/system/user/import', formData);
@@ -217,7 +212,7 @@ export async function importUsers(file) {
  * @param value 字段的值
  * @param id 修改时的id
  */
-export async function checkExistence(field, value, id) {
+export async function checkExistence (field, value, id) {
   const res = await request.get('/system/user/existence', {
     params: { field, value, id }
   });

+ 11 - 7
src/layout/components/header-tools.vue

@@ -21,8 +21,12 @@
     <div class="ele-admin-header-tool-item">
       <el-dropdown @command="onUserDropClick">
         <div class="ele-admin-header-avatar">
-          <el-avatar :src="loginUser.avatar" />
-          <span class="hidden-xs-only">{{ loginUser.nickname }}</span>
+          <el-avatar
+            :src="loginUser && loginUser.avatar ? loginUser.avatar : ''"
+          />
+          <span class="hidden-xs-only">{{
+            loginUser && loginUser.nickname ? loginUser.nickname : ''
+          }}</span>
           <i class="el-icon-arrow-down"></i>
         </div>
         <template v-slot:dropdown>
@@ -69,7 +73,7 @@
       // 是否是全屏
       fullscreen: Boolean
     },
-    data() {
+    data () {
       return {
         // 是否显示修改密码弹窗
         passwordVisible: false,
@@ -79,13 +83,13 @@
     },
     computed: {
       // 当前用户信息
-      loginUser() {
+      loginUser () {
         return this.$store.state.user.info;
       }
     },
     methods: {
       /* 用户信息下拉点击事件 */
-      onUserDropClick(command) {
+      onUserDropClick (command) {
         if (command === 'password') {
           this.passwordVisible = true;
         } else if (command === 'profile') {
@@ -109,11 +113,11 @@
         }
       },
       /* 全屏切换 */
-      toggleFullscreen() {
+      toggleFullscreen () {
         this.$emit('fullscreen');
       },
       /* 打开设置抽屉 */
-      openSetting() {
+      openSetting () {
         this.settingVisible = true;
       }
     }

+ 11 - 11
src/layout/index.vue

@@ -119,7 +119,7 @@
       HeaderTools,
       PageFooter
     },
-    data() {
+    data () {
       return {
         PROJECT_NAME,
         HIDE_SIDEBARS,
@@ -135,11 +135,11 @@
     },
     computed: {
       // 当前语言
-      locale() {
+      locale () {
         return this.$i18n.locale;
       },
       // 菜单数据
-      menus() {
+      menus () {
         return this.$store.state.user.menus;
       },
       // 主题状态
@@ -147,29 +147,29 @@
     },
     methods: {
       /* 侧栏折叠切换 */
-      updateCollapse(value) {
+      updateCollapse (value) {
         // console.log('value:', this.$store.state.user.menus);
         this.$store.dispatch('theme/setCollapse', value);
       },
       /* 双侧栏一级折叠切换 */
-      updateSideNavCollapse(value) {
+      updateSideNavCollapse (value) {
         this.$store.dispatch('theme/setSideNavCollapse', value);
       },
       /* 内容区域全屏切换 */
-      updateBodyFullscreen(value) {
+      updateBodyFullscreen (value) {
         this.$store.dispatch('theme/setBodyFullscreen', value);
       },
       /* logo 点击事件 */
-      onLogoClick(isHome) {
+      onLogoClick (isHome) {
         isHome || this.$router.push(LAYOUT_PATH);
       },
       /* 监听屏幕尺寸改变 */
-      screenSizeChange() {
+      screenSizeChange () {
         this.$store.dispatch('theme/updateScreenSize');
         this.fullscreen = isFullscreen();
       },
       /* 全屏切换 */
-      onFullscreen() {
+      onFullscreen () {
         try {
           this.fullscreen = toggleFullscreen();
         } catch (e) {
@@ -177,7 +177,7 @@
         }
       },
       /* 页签右键菜单点击事件 */
-      onTabContextMenu({ key, tabKey, item, active }) {
+      onTabContextMenu ({ key, tabKey, item, active }) {
         switch (key) {
           case 'reload': // 刷新
             reloadPageTab({
@@ -212,7 +212,7 @@
         }
       },
       /* 菜单标题国际化 */
-      i18n(_path, key) {
+      i18n (_path, key) {
         if (!I18N_ENABLE || !key) {
           return;
         }

+ 3 - 3
src/views/codeManagement/components/code-list.vue

@@ -78,21 +78,21 @@
             fixed: 'left'
           },
           {
-            prop: 'name',
+            prop: 'code',
             label: '编码',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'loginName',
+            prop: 'name',
             label: '名称',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'status',
+            prop: 'remark',
             label: '描述',
             align: 'center',
             sortable: 'custom',

+ 2 - 1
vue.config.js

@@ -17,8 +17,9 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 跨域请求的地址
         // target: 'http://192.168.3.35:8080', // kang杨威
-        target: 'http://192.168.3.25:8080', // 黄峥嵘
+        // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
+        target: 'http://192.168.3.33:8080', // 谢一平
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {