合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -96,7 +96,7 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+    @ApiOperation(value = "添加成员", notes = "用户成员列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
     })
@@ -107,5 +107,46 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "修改成员", notes = "修改成员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+    })
+    @RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
+    public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.upDate(parameter,userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "查看成员详情", notes = "查看成员详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+    })
+    @RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
+    public ResponseBean selectById(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.selectById(parameter,userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改当前状态", notes = "修改当前状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+    })
+    @RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
+    public ResponseBean upDateStatus(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.upDateStatus(parameter,userElement.getId());
+        return responseBean;
+    }
+//    @ApiOperation(value = "得到所有角色", notes = "得到所有角色")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+//    })
+//    @RequestMapping(value = "/user/selectRole", method = RequestMethod.POST)
+//    public ResponseBean selectRole(@RequestBody String parameter){
+//        ResponseBean  responseBean = iToUserService.selectRole(parameter);
+//        return responseBean;
+//    }
 
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysUserRoleMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.ToSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface ToSysUserRoleMapper {
@@ -16,4 +17,6 @@ public interface ToSysUserRoleMapper {
     int updateByPrimaryKeySelective(ToSysUserRole record);
 
     int updateByPrimaryKey(ToSysUserRole record);
+
+    void delete(@Param("userId") Integer userId);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToUserMapper.java

@@ -31,4 +31,13 @@ public interface ToUserMapper {
      * @return
      */
     String selectByIdUserName(Integer createUser);
+
+    List<ToUser> selectUser(@Param("id") Integer id);
+
+    /**
+     * 查询多个角色
+     * @return
+     */
+    List<ToUser>  selectRole(@Param("id") Integer id);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToUser.java

@@ -42,6 +42,18 @@ public class ToUser {
      */
     private String updateNmae;
 
+    /**
+     * 角色id
+     */
+    private  String roleId;
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
 
     public String getCreateNmae() {
         return createNmae;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -37,4 +37,33 @@ public interface IToUserService {
      * @return
      */
     ResponseBean addUser(String parameter,Integer UserID);
+
+    /**
+     * 修改成员
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean upDate(String parameter, Integer id);
+
+    /**
+     * 查看成员详情
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean selectById(String parameter, Integer id);
+
+    /**
+     * 修改当前状态
+     * @param parameter
+     * @return
+     */
+    ResponseBean upDateStatus(String parameter,Integer userID);
+
+//    /**
+//     * 角色有多个
+//     * @return
+//     */
+//    ResponseBean selectRole(String parameter);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -23,9 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.security.auth.callback.TextOutputCallback;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service("iToUserServer")
 @Slf4j
@@ -113,6 +111,8 @@ public class ToUserServerImpl implements IToUserService {
         List<ToUser> userList=toUserMapper.userList(loginName,userName);
 
         for (ToUser toUser:userList){
+            //查询当前所有角色
+            toUser.setRoleName(selectRole(toUser.getId()));
             // 创建人
             String createNmae=toUserMapper.selectByIdUserName(toUser.getCreateUser());
             // 修改人
@@ -137,8 +137,8 @@ public class ToUserServerImpl implements IToUserService {
 
         String loginName= object.getString("loginName");
         String userName = object.getString("userName");
-        JSONArray contentImg = object.getJSONArray("roleName");
-        Integer[] roleIDArray = contentImg.toArray(new Integer[]{});
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
         String remark = object.getString("remark");
 
         toUser.setUserName(userName);
@@ -159,4 +159,99 @@ public class ToUserServerImpl implements IToUserService {
          response.addSuccess("成功");
         return response;
     }
+
+    @Override
+    public ResponseBean upDate(String parameter, Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        ToUser toUser = new ToUser();
+
+        String loginName = object.getString("loginName");
+        Integer ID= object.getInteger("id");
+        String userName = object.getString("userName");
+        JSONArray List = object.getJSONArray("menuArray");
+        Integer[] roleIDArray = List.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        toUser.setUserName(userName);
+        toUser.setLoginName(loginName);
+        toUser.setRemark(remark);
+        toUser.setStatus("1");
+        toUser.setId(ID);
+        toUser.setUpdateUser(userID);
+        toUser.setUpdateDate(new Date());
+        toUserMapper.updateByPrimaryKey(toUser);
+
+        //会对应多个角色
+        if (null!=List) {
+            toSysUserRoleMapper.delete(ID);
+            for (Integer roleID : roleIDArray) {
+                ToSysUserRole toSysUserRole = new ToSysUserRole();
+                toSysUserRole.setUserId(toUser.getId());
+                toSysUserRole.setRoleId(roleID);
+                toSysUserRoleMapper.insert(toSysUserRole);
+            }
+        }
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean selectById(String parameter, Integer userID) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        Integer ID= object.getInteger("id");
+        List<String> list=new ArrayList<String>();
+        List<ToUser> userList=toUserMapper.selectUser(ID);
+        for (ToUser toUser:userList){
+            list.add(toUser.getRoleId());
+        }
+         HashMap map= new HashMap<>();
+        map.put("userList",userList);
+        map.put("roleList",list);
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean upDateStatus(String parameter,Integer userID) {
+        ResponseBean response = new ResponseBean<>();
+        JSONObject object = JSONObject.parseObject(parameter);
+        Integer status = object.getInteger("status");
+        Integer id = object.getInteger("id");
+        ToUser toUser = new ToUser();
+        toUser.setId(id);
+        int st=status.intValue();
+        if (st==1){
+            toUser.setStatus("0");
+        }else if (st==0){
+            toUser.setStatus("1");
+        }
+        toUser.setUpdateUser(userID);
+        toUser.setUpdateDate(new Date());
+        toUserMapper.updateByPrimaryKey(toUser);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    //查询多个角色转换为字符串
+    public String selectRole(Integer id) {
+        List<ToUser> toUser= toUserMapper.selectRole(id);
+        List<String> list=new ArrayList<String>();
+         for (ToUser user:toUser){
+             list.add(user.getRoleName());
+         }
+        String result = "";
+        if (list != null && list.size() > 0) {
+            for (String item : list) {
+                // 把列表中的每条数据用逗号分割开来，然后拼接成字符串
+                result += item + ",";
+
+            }
+            result = result.substring(0,result.length()-1);
+        }
+        return result;
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysUserRoleMapper.xml

@@ -68,4 +68,9 @@
       role_id = #{roleId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <delete id="delete" parameterType="java.lang.Integer" >
+    delete from to_sys_user_role
+    where user_id = #{userId,jdbcType=INTEGER}
+  </delete>
 </mapper>

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -15,6 +15,7 @@
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="role_id" property="roleId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_name, login_name, login_password, email, head_portrait, remark, status, 
@@ -193,13 +194,13 @@
     tu.user_name,
     tu.remark,
     tu.login_name,
-    tu.remark,
     tu.status,
     tu.id
     FROM
     to_user tu
     LEFT JOIN to_sys_user_role ON tu.id = to_sys_user_role.user_id
     LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
+    group by to_sys_user_role.user_id
     <where>
     <if test="loginName != null and loginName !=''" >
       and tu.login_name = #{loginName,jdbcType=VARCHAR}
@@ -218,4 +219,37 @@
     WHERE id=#{id,jdbcType=INTEGER}
   </select>
 
+  <select id="selectUser"  resultMap="BaseResultMap" >
+    SELECT
+    sr.role_name,
+    sr.description,
+    sr.create_user,
+    sr.create_date,
+    sr.update_date,
+    sr.update_user,
+    tu.user_name,
+    tu.remark,
+    tu.login_name,
+    tu.status,
+    tu.id,
+    to_sys_user_role.role_id
+    FROM
+    to_user tu
+    LEFT JOIN to_sys_user_role ON tu.id = to_sys_user_role.user_id
+    LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
+    WHERE tu.id=#{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectRole"  resultMap="BaseResultMap" parameterType="int">
+      SELECT
+          sr.role_name,
+          tu.remark,
+          tu.login_name,
+          tu.id,
+          to_sys_user_role.role_id
+      FROM
+          to_user tu
+      LEFT JOIN to_sys_user_role ON tu.id = to_sys_user_role.user_id
+      LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
+      WHERE tu.id=#{id,jdbcType=INTEGER}
+  </select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java

@@ -34,7 +34,7 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
     ResponseBean announcementById(String paramets);
 
     /**
-     * 添加公告
+     * 修改公告
       * @param paramets
      * @return
      */

VUECODE/smart-operate-manage/src/api/user.js

@@ -25,4 +25,57 @@ export function userRoleById(data) {
     }
   })
 }
-
+// 添加用户角色
+export function addUser(data) {
+  return request({
+    url: '/user/addUser',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 查看用户角色
+export function selectUser(data) {
+  return request({
+    url: '/user/selectById',
+    method: 'post',
+    data: {
+      id: data.id
+    }
+  })
+}
+// 修改用户角色
+export function upDate(data) {
+  return request({
+    url: '/user/upDate',
+    method: 'post',
+    data: {
+      id: data.id,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName,
+      remark: data.remark,
+      userName: data.userName,
+      loginName: data.loginName,
+      menuArray: data.menuArray
+    }
+  })
+}
+// 修改用户当前状态
+export function upDateStatus(data) {
+  return request({
+    url: '/user/upDateStatus',
+    method: 'post',
+    data: {
+      id: data.id,
+      status: data.status
+    }
+  })
+}

VUECODE/smart-operate-manage/src/router/index.js

@@ -148,6 +148,13 @@ export const constantRouterMap = [
         name: 'user-addUser',
         hidden: true,
         meta: { title: '添加成员', icon: 'table' }
+      },
+      {
+        path: '/account/user/edit',
+        component: () => import('@/views/account/user/edit'),
+        name: 'user-edit',
+        hidden: true,
+        meta: { title: '添加成员', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList, userRoleById } from '@/api/user'
+import { employeesList, userRoleById, addUser, selectUser, upDate, upDateStatus, selectRole } from '@/api/user'
 
 const user = {
   state: {
@@ -112,7 +112,7 @@ const user = {
       })
     },
     // 查询角色 UserRoleById
-    UserRoleById({ commit, state }, data) { // 查询活动详情
+    UserRoleById({ commit, state }, data) {
       return new Promise((resolve, reject) => {
         userRoleById(data).then(response => {
           resolve(response)
@@ -120,8 +120,47 @@ const user = {
           reject(error)
         })
       })
+    },
+    // 添加成员角色
+    AddUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        addUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 获取成员信息
+    SelectUser({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        selectUser(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员信息
+    UpDate({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDate(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 修改成员状态(停用或者启用)
+    UpDateStatus({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        upDateStatus(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }
-
 export default user

VUECODE/smart-operate-manage/src/views/account/user/addUser.vue

@@ -1,127 +1,137 @@
 <template>
   <div id="root">
-    <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="100px" class="demo-listQuery">
-      <el-form-item label="姓名:" prop="roleName">
-        <el-input v-model="listQuery.roleName"/>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
       </el-form-item>
-      <el-form-item label="手机号:" prop="description">
-        <el-input v-model="listQuery.description"/>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
       </el-form-item>
-      <el-transfer
-    filterable
-    :titles="['所有角色', '已选角色']"
-    :left-default-checked="[2, 3]"
-    :filter-method="filterMethod"
-    filter-placeholder="请输角色名称"
-    v-model="value2"
-    :data="dataList"/>
-      <el-form-item label="备注:" prop="description">
-        <el-input v-model="listQuery.description"/>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary">立即创建</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-import { mapActions } from 'vuex'
 export default {
   data() {
     return {
-      listQuery: {
-        id: '',  
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
         roleName: '',
-        description: '',
-        menuArray: [], // 已选中的权限资源
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
         pageNum: 1,
-        pageSize:100
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
       },
-       va3:[], 
-       value2:[1,4],
-       dataList:[],
-       citiesList:['上海', '北京', '广州', '深圳', '南京', '西安'],
-       pinyinList:['上海', '北京', '广州', '深圳', '南京', '西安', '成都'],
       rules: {
         roleName: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
+          { required: true, message: '名称', trigger: 'blur' }
         ],
-        description: [
+        loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
+        
       }
     }
   },
   mounted() {
-      this.getById()
-    //    this.roleBox()
+     this.getById()
   },
   methods: {
-     getById() { // 根据ID获取活动信息
-    //   this.ruleForm.id = this.$route.params.id
-      this.$store.dispatch('UserRoleById', this.listQuery).then((res) => {
-            console.log('1111',res.data.list)
-             const iss= res.data.list
-
-    for (let i = 0; i < iss.length;i++) {
-          this.va3.push(iss[i].id)
-          console.log('this.va3',this.va3)
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('AddUser', this.ruleForm).then((res) => {
+            const resCode = res.code
+            this.ruleForm.id=''
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
         }
       })
     },
-    roleBox(){
-        const generateData2 = _ => {
-        const data = this.dataList;
-        const cities = this.citiesList
-        const pinyin = this.pinyinList
-        cities.forEach((city, index) => {
-          data.push({
-            label: city,
-            key: index,
-            pinyin: pinyin[index]
-          });
-        });
-         console.log('data:',data)
-        return data;
-        this.filterMethod(query,item)
-      };
-      return {
-        data2: generateData2(),
-        }
-        this.filterMethod
-      },
-      filterMethod(query, item) {
-        //  console.log('item:',item)
-        const s = item.pinyin.indexOf(query) > -1;
-        //  console.log('this.value2:++',this.value2)
-        // console.log('this.value2:++',this.citiesList[2])
-        // console.log('this.value2:++',this.citiesList[4])
-        return s
-        },
-        // ss4(){
-        //   console.log('11111111111111111111')
-        //    console.log('this.checked:',this.checked)
-        // let value = this.value2
-        // for(let i=0;i < value.length;i++){
-        //      const va= this.value2[i]
-        //    console.log('根据下标遍历每一条数据',this.citiesList[va])
-        // }
-
-        // }
-  }    
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
 }
+  }
+  }
 </script>
 
 <style scoped>
-.demo-listQuery {
+.demo-ruleForm {
   width: 500px;
   margin-top: 20px;
   margin-left: auto;
   margin-right: auto;
 }
-#button-checked{
-     float:right;
-     margin-right: 50px; 
-}
 </style>

VUECODE/smart-operate-manage/src/views/account/user/edit.vue

@@ -0,0 +1,156 @@
+<template>
+  <div id="root">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="名称" prop="userName">
+        <el-input v-model="ruleForm.userName"/>
+      </el-form-item>
+     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+        <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
+      </el-form-item>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="menuData"
+          :default-expanded-keys="ruleForm.menuArray"
+          :default-checked-keys="ruleForm.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="ruleForm.remark"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        id: '',
+        userName: '',
+        loginName:'',
+        remark: '',
+        roleName: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray: [] // 已选中的权限资源
+      },
+      menuData: [], // 所有权限资源
+      defaultProps: { // 设置树形节点的渲染的属性
+        id: 'id',
+        label: 'roleName',
+        children: 'children'
+      },
+      rules: {
+        roleName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        loginName: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+        
+      }
+    }
+  },
+  mounted() {
+     this.selectUser(this.$route.params.id)
+     console.log('this.$route.params.id',this.$route.params.id)
+     this.getById()
+  },
+  methods: {
+    submitForm(formName) {
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        if (valid) {
+          console.log('this.roleName',this.roleName)
+          this.$store.dispatch('UpDate', this.ruleForm).then((res) => {
+            const resCode = res.code
+            if (resCode === '0') {
+              this.$message({
+                message: res.message,
+                type: 'success'
+              })
+              loading.close()
+              this.$router.push({ name: 'user-index' })
+            }
+          }).catch(() => {
+            console.log('error AddUser')
+            loading.close()
+          })
+        } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+      })
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    handleCheckChange(data, checked, indeterminate) { // 树形图选择事件
+      console.log(data, checked, indeterminate)
+    },
+    getMenuList() { // 获取 菜单列表
+      this.$store.dispatch('GetMenuList').then((res) => {
+        this.menuData = res.data
+      }).catch(() => {
+        console.log('error GetMenuList')
+      })
+    },
+    getById(){
+    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+      this.menuData = res.data.list
+      console.log(this.menuData)
+    }).catch(() => {
+      console.log('error UserRoleById')
+    })
+},
+  selectUser(id){
+    this.ruleForm.id=id
+    this.$store.dispatch('SelectUser', this.ruleForm).then((res) => {
+      // this.ruleForm.loginName = res.data.loginName
+      // this.ruleForm=res.data[0]
+        // this.ruleForm.loginName.push(res.data[0])
+        this.ruleForm.loginName=res.data.userList[0].loginName
+         this.ruleForm.userName=res.data.userList[0].userName
+         this.ruleForm.remark=res.data.userList[0].remark
+         this.ruleForm.menuArray=res.data.roleList
+        console.log('res.data',res.data)
+
+    }).catch(() => {
+      console.log('error SelectUser')
+    })
+
+
+  }
+  }
+  }
+</script>
+
+<style scoped>
+.demo-ruleForm {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

VUECODE/smart-operate-manage/src/views/account/user/index.vue

@@ -14,7 +14,7 @@
     </el-form>
     <div class="button">
       <el-button type="primary" @click="addUser">添加</el-button>
-      <el-button type="warning" >修改</el-button>
+      <el-button type="warning" @click="upDate">修改</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -36,7 +36,7 @@
       <el-table-column prop="updateNmae" label="修改人" align="center"/>
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
-          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
+          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
       <!-- <a><template slot-scope="scope">
           <span v-if="scope.row.status==1">{{ '停用账号' }}</span>
           <span v-if="scope.row.status==0">{{ '启用账号' }}</span>
@@ -70,6 +70,7 @@ export default {
         createUser: '',
         updateUser: '',
         updateDate: '',
+        status : '',
         pageNum: 1,
         pageSize: 10
       },
@@ -101,34 +102,33 @@ export default {
       value = value < 10 ? '0' + value : value
       return value
     },
-    getStatus(row) { // 获取状态
-      let statusName = ''
+    // getStatus(row) { // 获取状态
+    //   let statusName = ''
 
-      // 判断状态
-      switch (row.status) {
-        case '0':
-          statusName = '已作废'
-          break
-        case '1':
-          statusName = '已发布'
-          break
-        case '2':
-          statusName = '草稿'
-          break
-      }
+    //   // 判断状态
+    //   switch (row.status) {
+    //     case '0':
+    //       statusName = '已作废'
+    //       break
+    //     case '1':
+    //       statusName = '已发布'
+    //       break
+    //     case '2':
+    //       statusName = '草稿'
+    //       break
+    //   }
 
-      // 如果修改时间和创建时间不一致, 就显示已修改
-      if (row.status === '1' && (row.updateDate > row.createDate)) {
-        statusName = '已修改'
-      }
+    //   // 如果修改时间和创建时间不一致, 就显示已修改
+    //   if (row.status === '1' && (row.updateDate > row.createDate)) {
+    //     statusName = '已修改'
+    //   }
 
-      return statusName
-    },
+    //   return statusName
+    // },
     dataQuery() { // 查询数据
       this.listLoading = true
       this.$store.dispatch('EmployeesList', this.listQuery).then((res) => {
          this.listDate = res.item
-        console.log('resData1',this.listDate)
         this.list = res.item
         this.total = res.total
         this.listLoading = false
@@ -136,6 +136,7 @@ export default {
         this.listLoading = false
         console.log('error EmployeesList')
       })
+      
     },
     handleSelectionChange(data) {
       // 设置为 空
@@ -171,9 +172,29 @@ export default {
     },
     addUser(){
     this.$router.push({ name: 'user-addUser' })
+     this.listQuery.id=''
+    },
+    upDate(){
+      //  this.$router.push({ name: 'user-edit' })
+       const ids = this.deleteIds[0]
+          this.$router.push({ name: 'user-edit', params: { id: ids }})
+    },
+    upDateStatus(id,status){
+      this.listQuery.id=id
+      this.listQuery.status=status
+      this.$store.dispatch('UpDateStatus', this.listQuery).then((res) => {
+        console.log('res',res)
+        this.dataQuery()
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error UpDateStatus')
+      })
     }
-  }
-}
+    }
+    }
+  
+
 </script>
 
 <style scoped>