合并的

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

@@ -13,17 +13,6 @@ export async function login(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-export async function sub() {
-  const res = await request.post('/main/user/login', {
-    loginName: 'aaa',
-    loginPwd: '123456'
-  });
-  if (res) {
-    console.log(res);
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
 /**
  * 获取验证码
  */

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

@@ -8,8 +8,21 @@ export async function pageRoles(params) {
   const res = await request.get('/sys/role/page', {
     params
   });
-  if (res.data.code === 0) {
-    return res.data.records;
+
+  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 putRoles(params) {
+  const res = await request.put('/sys/role/update', params);
+
+  if (res.data.code == 0) {
+    return res.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -33,8 +46,8 @@ export async function listRoles(params) {
  * @param data 角色信息
  */
 export async function addRole(data) {
-  const res = await request.post('/system/role', data);
-  if (res.data.code === 0) {
+  const res = await request.post('/sys/role/add', data);
+  if (res.data.code == 0) {
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
@@ -56,9 +69,20 @@ export async function updateRole(data) {
  * 删除角色
  * @param id 角色id
  */
-export async function removeRole(id) {
-  const res = await request.delete('/system/role/' + id);
-  if (res.data.code === 0) {
+export async function removeRole(id, f) {
+  let res;
+  if (f) {
+    res = await request.delete('/sys/role/delete', {
+      data: id
+    });
+  } else {
+    res = await request.delete('/sys/role/delete', {
+      data: [id]
+    });
+  }
+
+  console.log(res);
+  if (res.data.code == 0) {
     return res.data.message;
   }
   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/layout/index.vue

@@ -58,9 +58,9 @@
       <header-tools :fullscreen="fullscreen" @fullscreen="onFullscreen" />
     </template>
     <!-- 全局页脚 -->
-    <template v-slot:footer>
+    <!-- <template v-slot:footer>
       <page-footer />
-    </template>
+    </template> -->
     <!-- 自定义菜单标题增加徽章、小红点 -->
     <template v-slot:title="{ title, item }">
       <span>{{ title }} </span>

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

@@ -8,30 +8,32 @@
     @update:visible="updateVisible"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
-      <el-form-item label="角色名称:" prop="roleName">
+      <el-form-item label="角色名称:" prop="name">
         <el-input
           clearable
           :maxlength="20"
-          v-model="form.roleName"
+          v-model="form.name"
           placeholder="请输入角色名称"
         />
       </el-form-item>
-      <el-form-item label="角色标识:" prop="roleCode">
+      <el-form-item label="组织ID:" prop="groupId">
         <el-input
           clearable
           :maxlength="20"
-          v-model="form.roleCode"
+          v-model="form.groupId"
           placeholder="请输入角色标识"
         />
       </el-form-item>
-      <el-form-item label="备注:">
-        <el-input
-          :rows="4"
-          type="textarea"
-          :maxlength="200"
-          v-model="form.comments"
-          placeholder="请输入备注"
-        />
+      <el-form-item label="启用状态:" prop="enable">
+        <el-switch
+          v-model="form.enable"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          :active-value="1"
+          :inactive-value="0"
+          @change="changeEnable(row)"
+        >
+        </el-switch>
       </el-form-item>
     </el-form>
     <template v-slot:footer>
@@ -44,7 +46,7 @@
 </template>
 
 <script>
-  import { addRole, updateRole } from '@/api/system/role';
+  import { addRole, putRoles } from '@/api/system/role';
 
   export default {
     props: {
@@ -55,10 +57,9 @@
     },
     data() {
       const defaultForm = {
-        roleId: null,
-        roleName: '',
-        roleCode: '',
-        comments: ''
+        name: '',
+        groupId: '',
+        enable: 1
       };
       return {
         defaultForm,
@@ -66,14 +67,14 @@
         form: { ...defaultForm },
         // 表单验证规则
         rules: {
-          roleName: [
+          name: [
             {
               required: true,
               message: '请输入角色名称',
               trigger: 'blur'
             }
           ],
-          roleCode: [
+          groupId: [
             {
               required: true,
               message: '请输入角色标识',
@@ -95,11 +96,11 @@
             return false;
           }
           this.loading = true;
-          const saveOrUpdate = this.isUpdate ? updateRole : addRole;
+          const saveOrUpdate = this.isUpdate ? putRoles : addRole;
           saveOrUpdate(this.form)
             .then((msg) => {
               this.loading = false;
-              this.$message.success(msg);
+              this.$message.success(this.isUpdate ? '修改' : '增加' + msg);
               this.updateVisible(false);
               this.$emit('done');
             })
@@ -118,7 +119,8 @@
       visible(visible) {
         if (visible) {
           if (this.data) {
-            this.$util.assignObject(this.form, this.data);
+            // this.$util.assignObject(this.form, this.data);
+            this.form = this.data;
             this.isUpdate = true;
           } else {
             this.isUpdate = false;

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

@@ -9,19 +9,19 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="角色名称:">
-          <el-input clearable v-model="where.roleName" placeholder="请输入" />
+          <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="角色标识:">
-          <el-input clearable v-model="where.roleCode" placeholder="请输入" />
+        <el-form-item label="组织ID:">
+          <el-input clearable v-model="where.groupId" 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.comments" placeholder="请输入" />
         </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
@@ -40,13 +40,13 @@
 </template>
 
 <script>
+  import { login } from '@/api/login';
   export default {
     data() {
       // 默认表单数据
       const defaultWhere = {
-        roleName: '',
-        roleCode: '',
-        comments: ''
+        name: '',
+        groupId: ''
       };
       return {
         // 表单数据
@@ -62,6 +62,7 @@
     methods: {
       /* 搜索 */
       search() {
+        console.log(this.where);
         this.$emit('search', this.where);
       },
       /*  重置 */

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

@@ -32,6 +32,17 @@
             删除
           </el-button>
         </template>
+        <template v-slot:enable="{ row }">
+          <el-switch
+            v-model="row.enable"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            :active-value="1"
+            :inactive-value="0"
+            @change="changeEnable(row)"
+          >
+          </el-switch>
+        </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -42,14 +53,14 @@
           >
             修改
           </el-link>
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-finished"
             @click="openAuth(row)"
           >
             分配权限
-          </el-link>
+          </el-link> -->
           <el-popconfirm
             class="ele-action"
             title="确定要删除此角色吗？"
@@ -75,7 +86,12 @@
   import RoleSearch from './components/role-search.vue';
   import RoleEdit from './components/role-edit.vue';
   import RoleAuth from './components/role-auth.vue';
-  import { pageRoles, removeRole, removeRoles } from '@/api/system/role';
+  import {
+    pageRoles,
+    removeRole,
+    removeRoles,
+    putRoles
+  } from '@/api/system/role';
 
   export default {
     name: 'SystemRole',
@@ -111,17 +127,19 @@
             minWidth: 110
           },
           {
-            prop: 'roleCode',
-            label: '角色标识',
+            prop: 'groupId',
+            label: '组织ID',
             sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'comments',
-            label: '备注',
+            prop: 'enable',
+            label: '启用状态',
             sortable: 'custom',
             showOverflowTooltip: true,
+            slot: 'enable',
+
             minWidth: 110
           },
           {
@@ -154,18 +172,28 @@
         showAuth: false
       };
     },
-    created() {
-      this.getRoles(); //获取角色列表数据。该方法在实例初始化时实现。在实例销毁时
-    },
+    created() {},
     methods: {
-      getRoles() {},
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return pageRoles({ ...where, ...order, page, limit });
+        console.log(where);
+        return pageRoles({ pageNum: page, size: limit, ...where });
+      },
+      async changeEnable(row) {
+        const res = await putRoles(row);
+        if (res.code == 0) {
+          this.$message({
+            type: 'success',
+            message: '修改成功',
+            customClass: 'ele-message-border'
+          });
+          this.reload();
+        }
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where: where });
+        console.log(where, '1111');
+        this.$refs.table.reload({ page: 1, where });
       },
       /* 显示编辑 */
       openEdit(row) {
@@ -180,7 +208,7 @@
       /* 删除 */
       remove(row) {
         const loading = this.$loading({ lock: true });
-        removeRole(row.roleId)
+        removeRole(row.id)
           .then((msg) => {
             loading.close();
             this.$message.success(msg);
@@ -202,7 +230,10 @@
         })
           .then(() => {
             const loading = this.$loading({ lock: true });
-            removeRoles(this.selection.map((d) => d.roleId))
+            removeRole(
+              this.selection.map((d) => d.id),
+              true
+            )
               .then((msg) => {
                 loading.close();
                 this.$message.success(msg);

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': ''