Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/Home.vue

@@ -187,13 +187,18 @@ export default {
     logout() {
       // console.log('退出登录');
       // this.$router.replace('/login1')
-      this.$axios.post("/login/login/userLogout").then(res => {
+      this.$axios
+        .post("/login/login/userLogout")
+        .then(res => {
           if (res.data.code === 200) {
             localStorage.removeItem("token"); //删除名称为“token”的信息。
             localStorage.removeItem("userName"); //删除名称为“userName”的信息。
             this.$router.replace("/login1");
             this.$message.info("退出成功！");
           }
+        })
+        .catch(err => {
+          console.info(err);
         });
     },
     /**

src/views/SystemManage/AuthManage.vue

@@ -9,6 +9,10 @@
         <div class="btn" :class="{ active: isGroup }" @click="getGroup">
           用户组列表
         </div>
+        <el-button @click="add">add</el-button>
+        <el-button @click="edit">edit</el-button>
+        <el-button @click="del">del</el-button>
+        <el-button @click="search">search</el-button>
       </div> </dvi
     ><br />
     <div class="search">
@@ -168,6 +172,85 @@ export default {
     handleSizeChange: function(val) {
       this.reqParam.page.pageSize = val;
       // this.search();
+    },
+    add() {
+      var permission = new URLSearchParams();
+      permission.append("menuname", "菜单30");
+      permission.append("pid", "3");
+      permission.append("zindex", "4");
+      // permission.append("roleId", "30");
+      // menuname; //菜单名称
+      // pid;//父级权限id
+      // permission;//资源权限字符串
+      // url;//资源 url
+      // description;//描述
+      // type;//权限类型
+      // zindex;//菜单排序
+      // flag;//是否生成菜单,0:默认不生成菜单,1:生成菜单
+      // status;//权限状态（01:显示，02：加锁，03：隐藏）
+      // roleId;/必填
+      this.$axios
+        .post("/login/permission/add", permission)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    del() {
+      var permission = new URLSearchParams();
+      permission.append("menuId", "888");
+      this.$axios
+        .post("/login/permission/deletePermissionById", permission)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    edit() {
+      var permission = new URLSearchParams();
+      permission.append("menuId", "777");
+      this.$axios
+        .post("/login/permission/querypermissionInfo", permission)
+        .then(res => {
+          console.log(res);
+        })
+        .catch(failResponse => {});
+      // menuId;//权限id
+      // menuname;//菜单名称
+      // pid;//父级权限id
+      // permission;//资源权限字符串
+      // url;//资源 url
+      // description;//描述
+      // type;//权限类型
+      // zindex;//菜单排序
+      // status;//权限状态（01:显示，02：加锁，03：隐藏）
+
+      var permission1 = new URLSearchParams();
+      permission1.append("menuId", "777");
+      permission1.append("menuname", "修改菜单名字");
+      this.$axios
+        .post("/login/permission/update", permission1)
+        .then(res => {
+          console.log(res);
+        })
+        .catch(failResponse => {});
+    },
+    search() {
+      var permission = new URLSearchParams();
+      // permission.append("menuId", "要删除的权限id");
+      // menuname,pid,
+      //         userId(非admin用户，必填)
+      permission.append("page", "1"); //必填
+      permission.append("total", "20"); //必填
+      this.$axios
+        .post("/login/permission/querypermissionAll", permission)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
     }
   },
   mounted() {

src/views/SystemManage/GroupManage.vue

@@ -61,6 +61,10 @@
     <div class="operation">
       <div class="btn1" @click="batch">批量操作</div>
       <div class="btns">
+        <el-button @click="add">add</el-button>
+        <el-button @click="edit">edit</el-button>
+        <el-button @click="del">del</el-button>
+        <el-button @click="search">search</el-button>
         <div class="btn1">删除</div>
         <div class="add" @click="open">
           <svg-icon
@@ -335,10 +339,77 @@ export default {
       this.isShowAddUserDialogBg = false;
     },
     // 新增方法
+    // add() {
+    //   this.isShowAddUserDialog = false;
+    //   this.isShowAddUserDialogBg = false;
+    //   this.$message.success("新增成功！");
+    // }
     add() {
-      this.isShowAddUserDialog = false;
-      this.isShowAddUserDialogBg = false;
-      this.$message.success("新增成功！");
+      var usergroup = new URLSearchParams();
+      usergroup.append("groupname", "用户组1122");
+      usergroup.append("groupdesc", "用户组描述111222");
+      // usergroup.append("userId", "");  // userId(多个用户id之间用逗号隔开),
+      // usergroup.append("username", "");// username(多个用户名之间用逗号隔开),
+      // usergroup.append("roleId", "");// roleId(多个角色id之间用逗号隔开),
+      // usergroup.append("rolename", "角色名2,角色名3");// rolename(多个角色名之间用逗号隔开),
+      usergroup.append("status", "1"); // status(激活状态：0未激活；1已激活)
+
+      this.$axios
+        .post("/login/usergroup/saveusergroup", usergroup)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    del() {
+      var usergroup = new URLSearchParams();
+      usergroup.append("Id", "1");
+      this.$axios
+        .post("/login/usergroup/deleteUserGroupById", usergroup)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    edit() {
+      var usergroup = new URLSearchParams();
+      usergroup.append("Id", "2");
+      this.$axios
+        .post("/login/usergroup/queryusergroup", usergroup)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+      var usergroup1 = new URLSearchParams();
+      usergroup1.append("Id", "2");
+      usergroup1.append("groupname", "修改组名");
+      usergroup1.append("groupdesc", "修改组描述");
+      usergroup1.append("userId", ""); // userId(多个用户id之间用逗号隔开),
+      usergroup1.append("username", ""); // username(多个用户名之间用逗号隔开),
+      usergroup1.append("roleId", ""); // roleId(多个角色id之间用逗号隔开),
+      this.$axios
+        .post("/login/usergroup/update", usergroup1)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    search() {
+      var usergroup = new URLSearchParams();
+      // usergroup.append("Id", "2");
+      usergroup.append("page", "1"); //必填
+      usergroup.append("total", "20"); //必填
+      this.$axios
+        .post("/login/usergroup/queryUserGroupList", usergroup)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
     }
   }
 };

src/views/SystemManage/RoleManage.vue

@@ -46,6 +46,10 @@
           </div>
           <div class="save">
             <div class="btn" @click="save">保存</div>
+            <el-button @click="add">add</el-button>
+            <el-button @click="edit">edit</el-button>
+            <el-button @click="del">del</el-button>
+            <el-button @click="search">search</el-button>
           </div>
         </div>
         <div class="role-info">
@@ -318,13 +322,65 @@ export default {
       this.roleMenusSelection = this.roleMenus;
       console.info("roleMenusSelection====", this.roleMenusSelection);
     },
+    // 列表
+    search() {
+      var role = new URLSearchParams();
+      // role.append('userId', "可选");//根据用户id查询角色信息
+      // role.append('roleId', "可选");//根据角色id查询角色信息
+      // role.append('roleName', "可选");//根据角色名查询角色信息
+      // role.append('permissionName', "可选");//查询角色对应的权限
+      this.$axios
+        .post("/login/role/queryRolelist", role)
+        .then(res => {})
+        .catch(failResponse => {});
+    },
     // 删除
     del() {
       console.info("删除数据");
+      var sysRole = new URLSearchParams();
+      sysRole.append("roleId", "16");
+      this.$axios
+        .post("/login/role/deleteRoleById", sysRole)
+        .then(res => {})
+        .catch(failResponse => {});
     },
     // 新增
     add() {
       console.info("新增数据");
+      var role = new URLSearchParams();
+      role.append("roleName", "角色名");
+      role.append("description", "角色描述");
+      // sffb; //(是否发布:0:未发布,1:已发布),
+      // pid; // (父级角色的id),
+      // isparent; //(是否是父级：0：父级，1：子级),
+      // type角色类型;
+      this.$axios
+        .post("/login/role/add", role)
+        .then(res => {
+          console.log(res);
+          this.$message.success(res.message);
+        })
+        .catch(failResponse => {});
+    },
+    // 编辑
+    edit() {
+      console.info("编辑数据");
+      var role = new URLSearchParams();
+      // 1、进入角色修改界面
+      role.append("roleId", "15");
+      this.$axios
+        .post("/login/role/queryrolesInfo", role)
+        .then(res => {})
+        .catch(failResponse => {});
+
+      var role1 = new URLSearchParams();
+      role1.append("roleId", "15");
+      role1.append("roleName", "修改角色名");
+      role1.append("description", "修改角色描述");
+      this.$axios
+        .post("/login/role/update", role1)
+        .then(res => {})
+        .catch(failResponse => {});
     },
     funAuth() {
       this.funFlag = true;

src/views/login/modules/AccountsLogin.vue

@@ -72,19 +72,26 @@ export default {
     login(userinfo) {
       let me = this;
       console.info(userinfo);
-      let authentication = userinfo;
+      var authentication = new URLSearchParams();
+      authentication.append("userName", userinfo.userName);
+      authentication.append(
+        "passWord",
+        Encrypt(userinfo.passWord.trim()).toString()
+      );
+      // let authentication = userinfo;
       // let data = new FormData();
       //密码加密
-      authentication.passWord = Encrypt(
-        authentication.passWord.trim()
-      ).toString();
+      // authentication.passWord = Encrypt(
+      //   authentication.passWord.trim()
+      // ).toString();
       // let passwordAES = Encrypt(authentication.passWord.trim()).toString();
       // data.append("username", this.userInfo.userName);
       // data.append("password", passwordAES);
       // data.passWord = passwordAES;
       // todo 登录请求
       this.$axios
-        .post("/login/myLoginForm?" + qs.stringify(authentication))
+        .post("/login/myLoginForm", authentication)
+        // .post("/login/myLoginForm?" + qs.stringify(authentication))
         .then(res => {
           if (res.data.code === "200") {
             localStorage.setItem("token", res.data.token);