修改账号编辑页面

.eslintrc.js

@@ -22,7 +22,7 @@ module.exports = {
       }
     }],
     "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
+    "vue/multiline-html-element-content-newline": "off",
     "vue/name-property-casing": ["error", "PascalCase"],
     "vue/no-v-html": "off",
     'accessor-pairs': 2,
@@ -47,7 +47,7 @@ module.exports = {
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'eqeqeq': ["error", "always", { "null": "ignore" }],
     'generator-star-spacing': [2, {
       'before': true,
       'after': true
@@ -172,7 +172,11 @@ module.exports = {
       'after': true
     }],
     'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [2, 'never'],
+    'space-before-function-paren': [2, {
+      "anonymous": "always",
+      "named": "never",
+      "asyncArrow": "always"
+    }],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
     'space-unary-ops': [2, {

src/api/Account.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-02-14 09:37:11
- * @LastEditTime: 2022-02-14 17:50:17
+ * @LastEditTime: 2022-02-15 10:41:09
  * @LastEditors: your name
  * @Description: 账户管理api
  * have a nice day!
@@ -49,7 +49,7 @@ export function addAccount(params) {
 }
 
 // 账号详情查询
-export function accDeaitls(params) {
+export function getAccountDetails(params) {
   return request({
     url: '/api/4A/GetUserDetails/v1',
     method: 'post',
@@ -59,7 +59,7 @@ export function accDeaitls(params) {
 }
 
 // 账号编辑保存
-export function deitAcc(params) {
+export function editAccount(params) {
   return request({
     url: '/api/4A/EditUser/v1',
     method: 'post',

src/components/loginpolicy/index.vue

@@ -138,13 +138,13 @@ export default {
       if (data.checked == true) {
         // this.listArray = [];
         this.listArray.push(data);
-        this.$emit("getCheckedList", this.listArray);
+        this.$emit("get-checked-list", this.listArray);
       } else {
         this.listArray.splice(
           this.listArray.findIndex((item) => item.TacId === data.TacId),
           1
         );
-        this.$emit("getCheckedList", this.listArray);
+        this.$emit("get-checked-list", this.listArray);
       }
     },
   },

src/components/permissiontree/index.vue

@@ -308,7 +308,7 @@ export default {
           };
         }
       });
-      this.$emit("getTreeData", arr);
+      this.$emit("get-tree-data", arr);
     },
     //获取指定数据
     decompose(data, id) {

src/components/rolelist/index.vue

@@ -179,7 +179,7 @@ export default {
     // 选中
     handleBg (item, i) {
       this.msg = i;
-      this.$emit("checkClick", item);
+      this.$emit("check-click", item);
     },
     //多选框
     checkChange (arr) {
@@ -187,11 +187,11 @@ export default {
       // if (this.roleType == 'account') {
       //   datas = this.formatChecks(arr, 'UserId');
       // }
-      this.$emit("checkChange", datas);
+      this.$emit("check-change", datas);
     },
     //单选框
     radioChange (val) {
-      this.$emit("radioChange", val);
+      this.$emit("radio-change", val);
     },
     //格式化选中回调
     formatChecks (arr, key) {

src/components/rulesofcompetency/index.vue

@@ -163,7 +163,7 @@ export default {
         EditRow: this.form.input5,
         DeleteRow: this.form.input3
       }
-      this.$emit('getData', obj)
+      this.$emit('get-data', obj)
       const arr = this.$store.getters.authArrs
       const datas = _.unionBy(arr, 'AuthId')
       const id = this.$store.getters.authId
@@ -172,7 +172,7 @@ export default {
         // const dat = datas[datas.length - 1]
         let dat = datas[datas.length - 1]
         datas.map(item=>{
-          if(item.AuthId == id){
+          if (item.AuthId == id) {
             dat = item;
           }
         })
@@ -184,7 +184,6 @@ export default {
           }
         })
         this.$store.dispatch('auth/changeAuthArrs', datas)
-        //this.$emit('getData', obj)
       }
     },
     clearFormData () {

src/components/usergrouptree/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-02-11 15:44:58
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-15 13:50:24
+ * @LastEditors: your name
  * @Description: 用户组树
  * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
 -->
@@ -11,11 +11,28 @@
     <div class="head">
       <p>{{ title }}</p>
     </div>
-    <div :class="type ? 'radioBg':''" class="content">
+    <div
+      :class="type ? 'radioBg':''"
+      class="content"
+    >
       <el-scrollbar style="height: 100%">
-        <el-tree :data="data" show-checkbox :check-strictly="true" @check-change="currentChange" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="GroupId" default-expand-all ref="tree" highlight-current>
-          <span class="custom-tree-node" slot-scope="{ data }">
-            {{ data.GroupName }}
+        <el-tree
+          ref="tree"
+          :data="data"
+          show-checkbox
+          :check-strictly="true"
+          :default-props="defaultProps"
+          :expand-on-click-node="false"
+          node-key="GroupId"
+          default-expand-all
+          highlight-current
+          @check-change="currentChange"
+        >
+          <span
+            slot-scope="{ scope }"
+            class="custom-tree-node"
+          >
+            {{ scope.GroupName }}
           </span>
         </el-tree>
       </el-scrollbar>
@@ -25,64 +42,68 @@
 
 <script>
 import { GetGroupTree } from '@/api/AccountGroup'
-import { translateDataToTreeAll } from "@/utils/validate"
+import { translateDataToTreeAll } from '@/utils/validate'
 export default {
   name: 'UserGroupTree',
   props: {
-    title: { //标题
+    title: {
+      // 标题
       type: String,
-      default: "",
+      default: ''
     },
     checkedKeys: {
-      //已选中
+      // 已选中
       type: Array,
-      default: () => [],
+      default: () => []
     },
     type: {
       type: Boolean,
-      default: false,
+      default: false
+    },
+    defaultProps: {
+      type: Object,
+      default: () => ({
+        children: 'children',
+        label: 'GroupName'
+      })
     }
   },
-  data () {
+  data() {
     return {
-      data: [], //tree数据
-      checkedList: [], //已选中数据
-      defaultProps: {
-        children: "children",
-        label: "GroupName",
-      },
+      data: [], // tree数据
+      checkedList: [], // 已选中数据
       pageIndex: 1,
       pageSize: 20
     }
   },
   watch: {
     checkedKeys: {
-      handler (val) {
-        this.checkedList = val;
-        this.$refs.tree.setCheckedKeys(val);
+      handler(val) {
+        this.checkedList = val
+        this.$refs.tree.setCheckedKeys(val)
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
-  created () {
+  created() {
     this.getGroupTree()
   },
   methods: {
-    //复选框选中
-    currentChange (data, isChecked) {
+    // 复选框选中
+    currentChange(data, isChecked) {
       if (this.type) {
         const { GroupId } = data
-        this.$emit("getTreeData", this.$refs.tree.getCheckedNodes())
+        this.$emit('get-tree-data', this.$refs.tree.getCheckedNodes())
         if (isChecked) {
           const checked = [GroupId]
           this.$refs.tree.setCheckedKeys(checked)
         }
       } else {
         const arr = this.$refs.tree.getCheckedNodes()
-        this.$emit("getTreeData", arr)
+        this.$emit('get-tree-data', arr)
       }
     },
-    async getGroupTree () {
+    async getGroupTree() {
       const result = await GetGroupTree({
         QueryName: '',
         PageIndex: this.pageIndex,
@@ -93,7 +114,7 @@ export default {
       const obj = {
         AuthCount: 0,
         GroupId: 0,
-        GroupName: "系统用户组",
+        GroupName: '系统用户组',
         GroupUpid: 0,
         QueryTarget: 0,
         Status: 0,
@@ -148,4 +169,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/accountManagement/accountEdit.vue

@@ -0,0 +1,436 @@
+<!--
+ * @Author: Badguy
+ * @Date: 2022-02-15 11:37:42
+ * @LastEditTime: 2022-02-15 15:01:16
+ * @LastEditors: your name
+ * @Description: 编辑账号
+ * have a nice day!
+-->
+
+<template>
+  <div class="account-edit">
+    <div class="account-edit-header">
+      <div class="title">
+        <div class="title-left">编辑账号</div>
+        <!-- <div class="account-status">
+          是否启用
+          <el-radio
+            v-model="accountForm.status"
+            v-if="accountForm.status == 1 || accountForm.status == 3"
+            :label="1"
+            >是</el-radio
+          >
+          <el-radio v-model="accountForm.status" v-if="accountForm.status == 2" :label="2"
+            >是</el-radio
+          >
+          <el-radio v-model="accountForm.status" :label="3">否</el-radio>
+        </div> -->
+        <div>
+          <!-- <button type="submmit" class="btn-delete" @click="delate">删除</button> -->
+          <button
+            type="submmit"
+            class="btn-save"
+            @click="saveEdit"
+          >保存</button>
+        </div>
+      </div>
+      <div class="title-content">
+        <el-form
+          ref="accountForm"
+          :model="accountForm"
+          label-width="80px"
+        >
+          <el-row :gutter="40">
+            <el-col :span="5">
+              <el-form-item
+                label="账号名称"
+                prop="name"
+              >
+                <el-input
+                  v-model="accountForm.name"
+                  maxlength="32"
+                  placeholder="请输入名称"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item
+                label="登录密码"
+                prop="pwd"
+              >
+                <el-input
+                  v-model="accountForm.pwd"
+                  placeholder="*******"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-button
+                class="btn-reset-pwd"
+                size="small"
+                @click="resetPwd"
+              >重置密码</el-button>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
+                label="描述"
+                prop="desc"
+              >
+                <el-input
+                  v-model="accountForm.desc"
+                  maxlength="128"
+                  placeholder="描述内容描述内容描述内容描述内容描述内容描述内容"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+
+    <div class="content">
+      <!-- 用户组和角色未开启 -->
+      <el-row
+        v-if="!openGroup && !openRole"
+        :gutter="24"
+      >
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <PermissionTree
+              title="权限树"
+              query-type="all"
+              :query-id="permissionTreeQueryId"
+              :checked-keys="permissionTreeChckedKeys"
+              @get-tree-data="getPermissionTreeData"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <RulesOfCompetency
+              title="权限规则"
+              @get-data="getRulesOfCompetency"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <LoginPolicy
+              :checked-list="loginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyCheckedList"
+            />
+          </div>
+        </el-col>
+      </el-row>
+      <!-- 角色和用户组都开启 -->
+      <el-row
+        v-if="openGroup && openRole"
+        :gutter="24"
+      >
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <AccountGroupTree
+              title="所属账号组"
+              nodekey="GroupId"
+              :default-props="accountGroupTreeProps"
+              :checked-id-list="accountGroupTreeCheckedList"
+              @get-tree-data="getAccountGroupTreeData"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <RoleList
+              title="角色列表"
+              :data-list="roleListCheckedList"
+              :group-ids="accountGroupTreeCheckedList"
+              :check-box-list="checkRole"
+              :number="8"
+              @check-click="roleClick"
+              @check-change="checkChange"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-medium">
+            <PermissioLlist
+              title="权限列表"
+              class="hucPower"
+              :role-list="powerList"
+              :check="true"
+              @Competen="Competen"
+            />
+          </div>
+          <div class="content-card content-card-small">
+            <LoginPolicy
+              :checked-list="loginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyCheckedList"
+            />
+          </div>
+        </el-col>
+      </el-row>
+      <!-- 只开启用户组 -->
+      <el-row
+        v-if="openGroup && !openRole"
+        :gutter="24"
+      >
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <AccountGroupTree
+              title="所属账号组"
+              nodekey="GroupId"
+              :default-props="accountGroupTreeProps"
+              :checked-id-list="accountGroupTreeCheckedList"
+              @get-tree-data="getAccountGroupTreeData"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <PermissionTree
+              title="权限树"
+              query-type="group"
+              :query-id="permissionTreeQueryId"
+              :checked-keys="permissionTreeChckedKeys"
+              @get-tree-data="getPermissionTreeData"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-medium">
+            <RulesOfCompetency
+              title="权限规则"
+              @get-data="getRulesOfCompetency"
+            />
+          </div>
+
+          <div class="content-card content-card-small">
+            <LoginPolicy
+              :checked-list="loginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyCheckedList"
+            />
+          </div>
+        </el-col>
+      </el-row>
+      <!-- 只开启角色 -->
+      <el-row
+        v-if="!openGroup && openRole"
+        :gutter="24"
+      >
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <RoleList
+              title="角色列表"
+              :data-list="roleListCheckedList"
+              :check-box-list="checkRole"
+              :number="8"
+              @check-change="checkChange"
+              @check-click="roleClick"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <PermissioLlist
+              title="权限列表"
+              :role-list="powerList"
+              :check="true"
+              class="hucPower"
+              @Competen="Competen"
+            />
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="content-card content-card-large">
+            <LoginPolicy
+              :checked-list="loginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyCheckedList"
+            />
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <Dialog :flag="dialogVisible">
+      <div class="closeDialog">
+        <div class="title">删除账号</div>
+        <div class="content">是否确定要删除该账号？</div>
+        <div class="foot right t30">
+          <el-button
+            size="medium"
+            type="danger"
+            class="r24"
+          >删除</el-button>
+          <el-button size="medium">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import AccountGroupTree from '@/components/usergrouptree/index.vue'
+import PermissionTree from '@/components/permissiontree/index.vue'
+import RulesOfCompetency from '@/components/rulesofcompetency/index.vue'
+import LoginPolicy from '@/components/loginpolicy/index.vue'
+import RoleList from '@/components/rolelist/index.vue'
+import PermissioLlist from '@/components/permissionlist/index.vue'
+import Dialog from '@/layout/components/Dialog'
+
+import { getAccountDetails, editAccount, GetRoleByGroup } from '@/api/Account.js'
+
+export default {
+  components: {
+    AccountGroupTree,
+    PermissionTree,
+    RulesOfCompetency,
+    LoginPolicy,
+    RoleList,
+    PermissioLlist,
+    Dialog
+  },
+  data() {
+    return {
+      permissionTreeQueryId: '1',
+      rulesOfCompetency: null,
+      loginPolicyCheckedList: [],
+      loginPolicyCheckedListTemp: [],
+      accountGroupTreeData: [],
+      accountGroupTreeCheckedList: [],
+      roleListCheckedList: [],
+      pwdRules: {
+        UserName: [
+          { required: true, message: '请输入账号名称', trigger: 'blur' },
+          { min: 1, max: 32, message: '长度在 1到 32 个字符', trigger: 'blur' }
+        ],
+        UserPwd: [
+          { required: true, message: '请输入账号密码', trigger: 'blur' },
+          { min: 8, message: '长度最少8个字符', trigger: 'blur' }
+        ],
+        UserDesc: [{ min: 1, max: 128, message: '长度最多12个字符', trigger: 'blur' }]
+      },
+      accountForm: {
+        name: null,
+        pwd: null,
+        desc: null
+        // status: true,
+      },
+      accountGroupTreeProps: {
+        children: 'children',
+        label: 'GroupName'
+      }
+    }
+  },
+  methods: {
+    // 获取当前编辑的权限规则
+    getRulesOfCompetency(obj) {
+      this.rulesOfCompetency = obj
+    },
+    // 获取当前勾选的登录策略
+    getLoginPolicyCheckedList(arr) {
+      this.loginPolicyCheckedListTemp = arr
+    },
+    // 获取当前勾选的账号组
+    getAccountGroupTreeData(arr) {
+      this.accountGroupTreeData = arr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.account-edit {
+  width: 100%;
+  height: calc(100vh - 178px);
+  padding: 0 146px;
+  .account-edit-header {
+    box-sizing: border-box;
+    width: 100%;
+    height: 184px;
+    margin: 32px 0 24px;
+    padding: 32px;
+    background: #ffffff;
+    box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
+    border-radius: 16px;
+    .title {
+      display: flex;
+      justify-content: space-between;
+      flex-direction: row;
+      position: relative;
+      .account-status {
+        position: absolute;
+        left: 194px;
+        top: 6px;
+      }
+      .title-left {
+        font-size: 24px;
+        font-weight: bold;
+        color: #303133;
+      }
+      .btn-save {
+        width: 80px;
+        height: 40px;
+        background: linear-gradient(0deg, #777dba, #6983be);
+        border-radius: 6px;
+        color: #fff;
+        border: none;
+      }
+      .btn-delete {
+        width: 80px;
+        height: 40px;
+        background: #f56c6c;
+        border-radius: 6px;
+        color: #fff;
+        border: none;
+        margin-right: 24px;
+      }
+    }
+    .title-content {
+      width: 100%;
+      padding-top: 35px;
+      box-sizing: border-box;
+      .btn-reset-pwd {
+        background: #6e81bc;
+        color: #fff;
+        margin-top: 4px;
+        margin-left: -25px;
+      }
+    }
+  }
+  .content {
+    width: 100%;
+    height: calc(100% - 274px);
+    box-sizing: border-box;
+    ::v-deep .el-empty {
+      padding: 0;
+    }
+    .content-card {
+      width: 100%;
+      background: #ffffff;
+      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
+      border-radius: 16px;
+      &.content-card-large {
+        height: 720px;
+      }
+      &.content-card-medium {
+        height: 376px;
+      }
+      &.content-card-small {
+        height: 320px;
+        margin-top: 25px;
+        overflow: hidden;
+      }
+    }
+    .img-onlyRead {
+      pointer-events: none;
+    }
+    .last {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+  }
+}
+</style>

src/views/accountManagement/edit.vue

@@ -21,7 +21,7 @@
           <button
             type="submmit"
             class="saveBtn"
-            @click="editAcc"
+            @click="saveEdit"
           >保存</button>
         </div>
       </div>
@@ -61,7 +61,7 @@
               <el-button
                 class="resetPass"
                 size="small"
-                @click="rest"
+                @click="resetPwd"
               >重置密码</el-button>
             </el-col>
             <el-col :span="8">
@@ -85,20 +85,17 @@
     <div class="content">
       <!-- 用户组和角色未开启 -->
       <el-row
-        v-if="
-          systemSetuser.OpenRole === 0
-            && systemSetuser.OpenGroup === 0
-        "
+        v-if="!openGroup && !openRole"
         :gutter="24"
       >
         <el-col :span="8">
           <div class="part">
             <PermissionTree
               title="权限树"
-              :checked-keys="powerT"
+              :checked-keys="permissionTreeChckedKeys"
               :query-type="group"
               :query-id="objID"
-              @get-tree-data="getTreeDatas"
+              @get-tree-data="getPermissionTreeData"
             />
           </div>
         </el-col>
@@ -106,7 +103,7 @@
           <div class="part">
             <RulesOfCompetency
               title="权限规则"
-              @get-data="getData"
+              @get-data="getRulesData"
             />
           </div>
         </el-col>
@@ -121,22 +118,18 @@
       </el-row>
       <!-- 角色和用户组都开启 -->
       <el-row
-        v-if="
-          systemSetuser.OpenRole !== 0
-            && systemSetuser.OpenGroup !== 0
-        "
+        v-if="openGroup && openRole"
         :gutter="24"
       >
         <el-col :span="8">
           <div class="part">
             <Organization
               title="所属账号组"
-              :data="data"
+              :data="groupList"
               :default-props="defaultProps"
               :nodekey="'GroupId'"
               :checked-id-list="checkedIdList"
-              @get-checked-data="getTreeData"
-              @click="getId(arrs)"
+              @get-tree-data="getGroupTreeData"
             />
           </div>
         </el-col>
@@ -172,33 +165,29 @@
       </el-row>
       <!-- 只开启用户组 -->
       <el-row
-        v-if="
-          systemSetuser.OpenGroup !== 0
-            && systemSetuser.OpenRole === 0
-        "
+        v-if="openGroup && !openRole"
         :gutter="24"
       >
         <el-col :span="8">
           <div class="part">
             <Organization
               title="所属账号组"
-              :data="data"
+              :data="groupList"
               :default-props="defaultProps"
               :nodekey="'GroupId'"
               :checked-id-list="checkedIdList"
-              @get-checked-data="getTreeData"
-              @click="getId(arrs)"
+              @get-tree-data="getGroupTreeData"
             />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
             <PermissionTree
-              :checked-keys="powerT"
+              :checked-keys="permissionTreeChckedKeys"
               :query-type="group"
               :query-id="objID"
               title="权限树"
-              @get-tree-data="getTreeDatas"
+              @get-tree-data="getPermissionTreeData"
             />
           </div>
         </el-col>
@@ -206,7 +195,7 @@
           <div class="part2">
             <RulesOfCompetency
               title="权限规则"
-              @get-data="getData"
+              @get-data="getRulesData"
             />
           </div>
 
@@ -220,10 +209,7 @@
       </el-row>
       <!-- 只开启角色 -->
       <el-row
-        v-if="
-          systemSetuser.OpenGroup === 0
-            && systemSetuser.OpenRole != 0
-        "
+        v-if="!openGroup && openRole"
         :gutter="24"
       >
         <el-col :span="8">
@@ -291,7 +277,7 @@ import {
 // import { getUserOne } from '@/api/AccountGroup.js'
 // import { mapGetters } from 'vuex'
 // import Cookies from "js-cookie";
-import { accDeaitls, deitAcc, GetRoleByGroup } from '@/api/Account.js'
+import { getAccountDetails, editAccount, GetRoleByGroup } from '@/api/Account.js'
 export default {
   components: {
     Organization,
@@ -304,22 +290,19 @@ export default {
   },
   data() {
     return {
+      appId: 0,
       group: 'group',
       userId: this.$route.query.userid,
       GroupId: this.$route.query.GroupId,
       dialogVisible: false,
-      OpenRole: this.OpenRole,
-      OpenGroup: this.OpenGroup,
-      marginB: '20px',
-      PageIndex: 1,
-      PageSize: 12,
+      openRole: false,
+      openGroup: false,
       PwdLengthBegin: null,
       PwdLengthEnd: null,
       PwdStruc: null,
       pwd: null,
-      data: [], // 账号组
+      groupList: [], // 账号组
       orgId: '',
-      arrs: [],
       TacList: [], // 登录策略
       AuthList: [], // 授权信息
       roleList: [], // 角色
@@ -329,9 +312,9 @@ export default {
       checkedIdList: [],
       loginList: [], // 选中展示登录策略
       checkRole: [],
-      CheckedList: [],
+      CheckedList: [], // 登录策略
       rulesObj: [],
-      powerT: [],
+      permissionTreeChckedKeys: [],
       objID: '1',
       rules: {
         UserName: [
@@ -354,7 +337,6 @@ export default {
         children: 'children',
         label: 'GroupName'
       },
-      systemSetuser: null,
       treeData1: [],
       checkedAuthList: []
     }
@@ -366,16 +348,16 @@ export default {
     } else {
       obj = this.$store.state.app.systemSet
     }
+    console.log(obj)
     const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
     this.openRole = OpenRole
-    this.OpenGroup = OpenGroup
+    this.openGroup = OpenGroup
     this.PwdStruc = PwdStruc
     this.PwdLengthBegin = PwdLengthBegin
     this.PwdLengthEnd = PwdLengthEnd
     this.editAccInfo()
     const { GroupId } = this.$route.query
-    this.AppId = GroupId
-    this.systemSetuser = obj
+    this.appId = GroupId
     if (OpenRole) {
       this.title = '角色'
     }
@@ -384,22 +366,18 @@ export default {
     this.form.UserPwd = this.generatePassword(this.PwdStruc, this.PwdLengthBegin, this.PwdLengthEnd)
   },
   methods: {
-    // delate: function (index) {
-    //   this.dialogVisible = true;
-    // },
     getCheckedList(data) {
       this.CheckedList = data
     },
-
-    // 获取权限树回调
-    getTreeDatas(arr) {
+    // 获取权限树
+    getPermissionTreeData(arr) {
       this.checkedAuthList = arr
     },
-    rest() {
+    resetPwd() {
       this.form.passward = this.generatePassword(this.PwdStruc, this.PwdLengthBegin, this.PwdLengthEnd)
     },
     // 获取权限规则
-    getData(obj) {
+    getRulesData(obj) {
       this.rulesObj = obj
     },
     generatePassword(rules, minNum, maxNum) {
@@ -430,7 +408,7 @@ export default {
           item[i] += rulesArrLnArr[parseInt(Math.random() * (rulesArrLnArr.length - 0) + 0)] // 其余部分随机生成1-4的数字。
         }
       } // 打乱次序，重新排序，否则密码第四位永远是特殊符号。
-      item.sort(function() {
+      item.sort(function () {
         return 0.5 - Math.random()
       }) // 返回0 两个数位置不变；小于0 就交换位置；大于0就不交换位置
 
@@ -449,7 +427,8 @@ export default {
     },
 
     // 账号组树
-    getTreeData(arr) {
+    getGroupTreeData(arr) {
+      console.log(arr)
       this.checkTrees = arr
       this.checkTrees.forEach(item => {
         this.orgId = item.GroupId
@@ -491,16 +470,16 @@ export default {
     // 详情查询
     async editAccInfo() {
       try {
-        const res = await accDeaitls({
+        const res = await getAccountDetails({
           UserId: this.userId
         })
         if (res.code === 0) {
-          const { UserDesc, UserName, GroupList, UserPwd, TacList, AuthList, RoleList } = res.returnData
+          // console.log(res.returnData)
+          const { UserDesc, UserName, GroupList, TacList, AuthList, RoleList } = res.returnData
           this.form.name = UserName
           this.form.diesc = UserDesc
           this.checkedIdList = GroupList
           this.loginList = TacList
-          console.log(UserPwd)
           // console.log(this.checkedIdList)
           this.loginList.forEach(item => {
             if (item.IsSelected === 1) {
@@ -511,10 +490,10 @@ export default {
           this.$store.state.auth.authList = AuthList
 
           AuthList.forEach(item => {
-            this.powerT.push(item.AuthId)
+            this.permissionTreeChckedKeys.push(item.AuthId)
           })
           this.roleList = RoleList
-          this.roleList.forEach((item, index) => {
+          this.roleList?.forEach((item, index) => {
             if (item.IsSelected === 1) {
               this.checkRole.push(index)
               this.checkRoles.push(item)
@@ -530,7 +509,7 @@ export default {
     },
 
     // 账号编辑修改
-    async editAcc() {
+    async saveEdit() {
       this.treeData1 = []
       this.checkedAuthList.forEach(item => {
         this.treeData1.push(item.AuthList)
@@ -544,7 +523,7 @@ export default {
       })
 
       try {
-        const res = await deitAcc({
+        const res = await editAccount({
           UserDesc: this.form.diesc,
           UserName: this.form.name,
           UserPwd: this.form.passward,
@@ -590,10 +569,12 @@ export default {
     async queryRole() {
       try {
         const res = await GetRoleByGroup({
-          GroupId: this.orgId
+          GroupId: this.orgId,
+          GroupIds: [0]
         })
         if (res.code === 0) {
           const arr = res.returnData
+          console.log(arr)
           const userArr = []
           arr.forEach(item => {
             item.name = item.RoleName
@@ -601,7 +582,6 @@ export default {
               userArr.push(item)
             }
           })
-
           this.roleList = userArr
         } else {
           this.$message.error(res.message)

src/views/accountManagement/index.vue

@@ -233,6 +233,7 @@ export default {
         if (result.code === 0) {
           this.loading = false
           const newDatas = result.returnData.records
+          // console.log(newDatas)
           this.pages = result.returnData.pages
           newDatas.forEach(element => {
             if (element.Status === 1) {