提交

ele-admin-template/src/api/layout/index.js

@@ -6,6 +6,9 @@ import { res1111 } from './router';
  */
 export async function getUserInfo() {
   // const res = await request.get('/system/resources/getResourcesTree');
+  // if (res.code === 0 && res.data) {
+  //   return res.data;
+  // }
   if (res1111.code === 0 && res1111.data) {
     return res1111.data;
   }

ele-admin-template/src/api/system/role/index.js

@@ -9,7 +9,7 @@ export async function pageRoles(params) {
     params
   });
   if (res.data.code === 0) {
-    return res.data.records;
+    return res.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

ele-admin-template/src/api/system/user/index.js

@@ -5,11 +5,15 @@ import request from '@/utils/request';
  * @param params 查询条件
  */
 export async function pageUsers(params) {
-  const res = await request.get('/system/user/page', {
-    params
-  });
-  if (res.data.code === 0) {
-    return res.data.data;
+  const res = await request.post('/system/account/getAccountPage', 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;
   }
   return Promise.reject(new Error(res.data.message));
 }

ele-admin-template/src/views/system/user/components/user-edit.vue

@@ -21,7 +21,7 @@
               placeholder="请输入用户账号"
             />
           </el-form-item>
-          <el-form-item label="用户名:" prop="nickname">
+ <!--         <el-form-item label="用户名:" prop="nickname">
             <el-input
               clearable
               :maxlength="20"
@@ -39,21 +39,21 @@
               <el-option label="男" value="1" />
               <el-option label="女" value="2" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="角色:" prop="roleIds">
             <role-select v-model="form.roleIds" />
           </el-form-item>
-          <el-form-item label="邮箱:" prop="email">
+<!--          <el-form-item label="邮箱:" prop="email">
             <el-input
               clearable
               :maxlength="100"
               v-model="form.email"
               placeholder="请输入邮箱"
             />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="手机号:" prop="phone">
+          <!-- <el-form-item label="手机号:" prop="phone">
             <el-input
               clearable
               :maxlength="11"
@@ -69,7 +69,7 @@
               value-format="yyyy-MM-dd"
               placeholder="请选择出生日期"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item v-if="!isUpdate" label="登录密码:" prop="password">
             <el-input
               show-password
@@ -78,7 +78,7 @@
               placeholder="请输入登录密码"
             />
           </el-form-item>
-          <el-form-item label="个人简介:">
+          <!-- <el-form-item label="个人简介:">
             <el-input
               :rows="4"
               clearable
@@ -87,7 +87,7 @@
               v-model="form.introduction"
               placeholder="请输入个人简介"
             />
-          </el-form-item>
+          </el-form-item> -->
         </el-col>
       </el-row>
     </el-form>

ele-admin-template/src/views/system/user/components/user-search.vue

@@ -12,7 +12,7 @@
           <el-input clearable v-model="where.username" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+<!--      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="用户名:">
           <el-input clearable v-model="where.nickname" placeholder="请输入" />
         </el-form-item>
@@ -29,7 +29,7 @@
             <el-option label="女" :value="2" />
           </el-select>
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button

ele-admin-template/src/views/system/user/index.vue

@@ -145,34 +145,34 @@
             fixed: 'left'
           },
           {
-            prop: 'username',
+            prop: 'loginName',
             label: '用户账号',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'nickname',
-            label: '用户名',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 110,
-            slot: 'nickname'
-          },
-          {
-            prop: 'sexName',
-            label: '性别',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 80
-          },
-          {
-            prop: 'phone',
-            label: '手机号',
-            sortable: 'custom',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+          // {
+          //   prop: 'nickname',
+          //   label: '用户名',
+          //   sortable: 'custom',
+          //   showOverflowTooltip: true,
+          //   minWidth: 110,
+          //   slot: 'nickname'
+          // },
+          // {
+          //   prop: 'sexName',
+          //   label: '性别',
+          //   sortable: 'custom',
+          //   showOverflowTooltip: true,
+          //   minWidth: 80
+          // },
+          // {
+          //   prop: 'phone',
+          //   label: '手机号',
+          //   sortable: 'custom',
+          //   showOverflowTooltip: true,
+          //   minWidth: 110
+          // },
           {
             columnKey: 'roles',
             label: '角色',
@@ -223,7 +223,7 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return pageUsers({ ...where, ...order, page, limit });
+        return pageUsers({ ...where, ...order, pageNum:page, size:limit });
       },
       /* 刷新表格 */
       reload(where) {

ele-admin-template/vue.config.js

@@ -15,9 +15,9 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.3.51:18086', // 跨域请求的地址
+        // target: 'http://192.168.3.51:18086', // 跨域请求的地址
         // target: 'http://192.168.3.35:8080', // kang杨威
-        // target: 'http://192.168.3.31:8080', // 黄峥嵘
+        target: 'http://192.168.3.31:8080', // 黄峥嵘
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''