修改账号编辑页面

src/components/usergrouptree/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-02-15 13:50:24
+ * @LastEditTime: 2022-02-15 17:35:48
  * @LastEditors: your name
  * @Description: 用户组树
  * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
@@ -29,10 +29,10 @@
           @check-change="currentChange"
         >
           <span
-            slot-scope="{ scope }"
+            slot-scope="{ data }"
             class="custom-tree-node"
           >
-            {{ scope.GroupName }}
+            {{ data.GroupName }}
           </span>
         </el-tree>
       </el-scrollbar>

src/router/routes/routes-file-five.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 10:05:44
- * @LastEditTime: 2022-02-14 10:16:54
+ * @LastEditTime: 2022-02-15 17:33:05
  * @LastEditors: your name
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \src\router\routes\routes-file-five.js
@@ -61,7 +61,7 @@ const accountRoutes = {
   {
     path: 'accountAdd',
     name: 'accountAdd',
-    component: () => import('@/views/accountManagement/add'),
+    component: () => import('@/views/accountManagement/accountEdit'),
     meta: {
       title: '新增账号'
     }
@@ -69,7 +69,7 @@ const accountRoutes = {
   {
     path: 'accountEdit',
     name: 'accountEdit',
-    component: () => import('@/views/accountManagement/edit'),
+    component: () => import('@/views/accountManagement/accountEdit'),
     meta: {
       title: '编辑账号'
     }

src/utils/pwdRules.js

@@ -0,0 +1,57 @@
+/*
+ * @Author: Badguy
+ * @Date: 2022-02-15 17:16:32
+ * @LastEditTime: 2022-02-15 17:25:14
+ * @LastEditors: your name
+ * @Description: 账号管理方法
+ * have a nice day!
+ */
+
+export function generatePassword(rules, minNum, maxNum) {
+  var rulesArr = rules.split('')
+  var rulesArrLnArr = []
+  var pwd = ''
+  var numbers = '0123456789'
+  var lower = 'abcdefghijklmnopqrstuvwxyz'
+  var upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  var others = '~!@#$%^&*()_'
+
+  function rand(min, max) {
+    return Math.random() * (max - min) + min
+  }
+  var pwdLen = parseInt(rand(minNum, maxNum)) // 随机生成密码长度10-12位。
+  // alert("密码长度：" + pwdLen);
+  var item = new Array(pwdLen) // 存放密码的类型 数字（1），小写（2），大写（3），特殊字符（4）
+  for (let i = 0; i < rulesArr.length; i++) {
+    if (rulesArr[i] === '1') {
+      rulesArrLnArr.push(i + 1 + '')
+    }
+  }
+  for (let i = 0; i < rulesArrLnArr.length; i++) {
+    item[rulesArrLnArr[i]] = rulesArrLnArr[i] + ''
+    console.log(`rulesArrLnArr[i]`, rulesArrLnArr[i])
+  }
+  for (let i = 0; i < pwdLen; i++) {
+    if (rulesArrLnArr.indexOf(i + '') === -1) {
+      item[i] = ''
+      item[i] += rulesArrLnArr[parseInt(Math.random() * (rulesArrLnArr.length - 0) + 0)] // 其余部分随机生成1-4的数字。
+    }
+  }
+  // 打乱次序，重新排序，否则密码第四位永远是特殊符号。
+  item.sort(function () {
+    return 0.5 - Math.random()
+  }) // 返回0 两个数位置不变；小于0 就交换位置；大于0就不交换位置
+
+  for (let j = 0; j < pwdLen; j++) {
+    if (item[j] === '4') {
+      pwd += numbers.charAt(Math.random() * (numbers.length - 1) + 1)
+    } else if (item[j] === '1') {
+      pwd += lower.charAt(Math.random() * (lower.length - 1) + 1)
+    } else if (item[j] === '2') {
+      pwd += upper.charAt(Math.random() * (upper.length - 1) + 1)
+    } else if (item[j] === '3') {
+      pwd += others.charAt(Math.random() * (others.length - 1) + 1)
+    }
+  }
+  return pwd
+}

src/views/accountManagement/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-02-15 15:01:16
+ * @LastEditTime: 2022-02-15 17:38:03
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -104,7 +104,7 @@
               query-type="all"
               :query-id="permissionTreeQueryId"
               :checked-keys="permissionTreeChckedKeys"
-              @get-tree-data="getPermissionTreeData"
+              @get-tree-data="getPermissionTreeChecked"
             />
           </div>
         </el-col>
@@ -120,7 +120,7 @@
           <div class="content-card content-card-large">
             <LoginPolicy
               :checked-list="loginPolicyCheckedList"
-              @get-checked-list="getLoginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyChecked"
             />
           </div>
         </el-col>
@@ -137,7 +137,7 @@
               nodekey="GroupId"
               :default-props="accountGroupTreeProps"
               :checked-id-list="accountGroupTreeCheckedList"
-              @get-tree-data="getAccountGroupTreeData"
+              @get-tree-data="getAccountGroupChecked"
             />
           </div>
         </el-col>
@@ -145,21 +145,21 @@
           <div class="content-card content-card-large">
             <RoleList
               title="角色列表"
-              :data-list="roleListCheckedList"
+              role-type="roleByUpId"
               :group-ids="accountGroupTreeCheckedList"
-              :check-box-list="checkRole"
+              :check-box-list="roleListCheckedList"
               :number="8"
-              @check-click="roleClick"
-              @check-change="checkChange"
+              @check-change="getRoleListChecked"
+              @check-click="selectRole"
             />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card content-card-medium">
-            <PermissioLlist
+            <PermissionList
               title="权限列表"
-              class="hucPower"
-              :role-list="powerList"
+              class="permission-list"
+              :role-list="permissionList"
               :check="true"
               @Competen="Competen"
             />
@@ -167,7 +167,7 @@
           <div class="content-card content-card-small">
             <LoginPolicy
               :checked-list="loginPolicyCheckedList"
-              @get-checked-list="getLoginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyChecked"
             />
           </div>
         </el-col>
@@ -184,7 +184,7 @@
               nodekey="GroupId"
               :default-props="accountGroupTreeProps"
               :checked-id-list="accountGroupTreeCheckedList"
-              @get-tree-data="getAccountGroupTreeData"
+              @get-tree-data="getAccountGroupChecked"
             />
           </div>
         </el-col>
@@ -195,7 +195,7 @@
               query-type="group"
               :query-id="permissionTreeQueryId"
               :checked-keys="permissionTreeChckedKeys"
-              @get-tree-data="getPermissionTreeData"
+              @get-tree-data="getPermissionTreeChecked"
             />
           </div>
         </el-col>
@@ -210,7 +210,7 @@
           <div class="content-card content-card-small">
             <LoginPolicy
               :checked-list="loginPolicyCheckedList"
-              @get-checked-list="getLoginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyChecked"
             />
           </div>
         </el-col>
@@ -224,21 +224,21 @@
           <div class="content-card content-card-large">
             <RoleList
               title="角色列表"
-              :data-list="roleListCheckedList"
-              :check-box-list="checkRole"
+              role-type="onlyRole"
+              :check-box-list="roleListCheckedList"
               :number="8"
-              @check-change="checkChange"
-              @check-click="roleClick"
+              @check-change="getRoleListChecked"
+              @check-click="selectRole"
             />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card content-card-large">
-            <PermissioLlist
+            <PermissionList
               title="权限列表"
-              :role-list="powerList"
+              :role-list="permissionList"
               :check="true"
-              class="hucPower"
+              class="permission-list"
               @Competen="Competen"
             />
           </div>
@@ -247,7 +247,7 @@
           <div class="content-card content-card-large">
             <LoginPolicy
               :checked-list="loginPolicyCheckedList"
-              @get-checked-list="getLoginPolicyCheckedList"
+              @get-checked-list="getLoginPolicyChecked"
             />
           </div>
         </el-col>
@@ -276,10 +276,12 @@ 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 PermissionList from '@/components/permissionlist/index.vue'
 import Dialog from '@/layout/components/Dialog'
 
-import { getAccountDetails, editAccount, GetRoleByGroup } from '@/api/Account.js'
+import { RoleAuths } from '@/api/apiAuthority'
+import { getAccountDetails, editAccount } from '@/api/Account.js'
+import { generatePassword } from '@/utils/pwdRules'
 
 export default {
   components: {
@@ -288,18 +290,33 @@ export default {
     RulesOfCompetency,
     LoginPolicy,
     RoleList,
-    PermissioLlist,
+    PermissionList,
     Dialog
   },
   data() {
     return {
+      appId: 0,
+      userId: this.$route.query.userId,
+      groupId: this.$route.query.groupId,
+      openRole: 0,
+      openGroup: 0,
+      pwdStruc: '',
+      pwdLengthBegin: 0,
+      pwdLengthEnd: 0,
+      pwd: '',
       permissionTreeQueryId: '1',
-      rulesOfCompetency: null,
-      loginPolicyCheckedList: [],
-      loginPolicyCheckedListTemp: [],
-      accountGroupTreeData: [],
-      accountGroupTreeCheckedList: [],
-      roleListCheckedList: [],
+      permissionTreeChckedKeys: [], // 权限树初始勾选项
+      permissionTreeChckedTemp: [], // 权限树当前勾选项
+      rulesOfCompetency: null, // 当前编辑的权限规则
+      loginPolicyCheckedList: [], // 登录策略初始勾选项
+      loginPolicyCheckedTemp: [], // 登录策略当前勾选项
+      accountGroupTreeCheckedList: [], // 账号组树初始勾选项
+      accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
+      roleListCheckedList: [], // 角色列表初始勾选项
+      roleListCheckedTemp: [], // 角色列表当前勾选项
+      permissionList: [],
+      currentSelectedRoleId: 0,
+      dialogVisible: false,
       pwdRules: {
         UserName: [
           { required: true, message: '请输入账号名称', trigger: 'blur' },
@@ -323,18 +340,135 @@ export default {
       }
     }
   },
+  created() {
+    let obj
+    if (typeof this.$store.state.app.systemSet === 'string') {
+      obj = JSON.parse(this.$store.state.app.systemSet)
+    } else {
+      obj = this.$store.state.app.systemSet
+    }
+    // console.log(obj)
+    const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
+    this.openRole = OpenRole
+    this.openGroup = OpenGroup
+    this.pwdStruc = PwdStruc
+    this.pwdLengthBegin = PwdLengthBegin
+    this.pwdLengthEnd = PwdLengthEnd
+    this.getAccountInfo()
+    const { GroupId } = this.$route.query
+    this.appId = GroupId
+    if (OpenRole) {
+      this.title = '角色'
+    }
+  },
   methods: {
+    // 获取当前账号信息
+    async getAccountInfo() {
+      try {
+        const res = await getAccountDetails({
+          UserId: this.userId
+        })
+        if (res.code === 0) {
+          // console.log(res.returnData)
+          const { UserDesc, UserName, GroupList, TacList, AuthList, RoleList } = res.returnData
+          this.accountForm.name = UserName
+          this.accountForm.desc = UserDesc
+          this.accountGroupTreeCheckedList = GroupList
+          this.loginPolicyCheckedList = TacList
+          // console.log(this.checkedIdList)
+          this.$store.state.auth.authList = AuthList
+
+          AuthList.forEach(item => {
+            this.permissionTreeChckedKeys.push(item.AuthId)
+          })
+          this.roleListCheckedList = RoleList
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
+    },
+    resetPwd() {
+      this.accountForm.pwd = generatePassword(this.pwdStruc, this.pwdLengthBegin, this.pwdLengthEnd)
+    },
+    // 获取当前权限树勾选项
+    getPermissionTreeChecked(arr) {
+      this.permissionTreeChckedTemp = arr
+    },
     // 获取当前编辑的权限规则
     getRulesOfCompetency(obj) {
       this.rulesOfCompetency = obj
     },
     // 获取当前勾选的登录策略
-    getLoginPolicyCheckedList(arr) {
-      this.loginPolicyCheckedListTemp = arr
+    getLoginPolicyChecked(arr) {
+      this.loginPolicyCheckedTemp = arr
     },
     // 获取当前勾选的账号组
-    getAccountGroupTreeData(arr) {
-      this.accountGroupTreeData = arr
+    getAccountGroupChecked(arr) {
+      this.accountGroupTreeCheckedTemp = arr
+    },
+    // 获取当前勾选的角色列表
+    getRoleListChecked(arr) {
+      this.roleListCheckedTemp = arr
+    },
+    // 点击角色后
+    async selectRole(data) {
+      if (this.currentSelectedRoleId === data.RoleId) return
+      try {
+        const params = {
+          RoleId: data.RoleId
+        }
+        const result = await RoleAuths(params)
+        this.permissionList = result.returnData
+        this.currentSelectedRoleId = data.RoleId
+      } catch (error) {
+        console.log('RoleAuths')
+        console.log(error)
+      }
+    },
+    // 修改权限规则
+    Competen(data) {
+      console.log(data)
+    },
+    // 账号编辑修改
+    async saveEdit() {
+      const treeData = []
+      this.permissionTreeChckedTemp.forEach(item => {
+        treeData.push(item.AuthList)
+      })
+      treeData.forEach((item, index) => {
+        this.$store.getters.authArrs.forEach(item2 => {
+          if (item.AuthId === item2.AuthId) {
+            treeData[index] = item2.AuthList
+          }
+        })
+      })
+
+      try {
+        const res = await editAccount({
+          UserDesc: this.accountForm.desc,
+          UserName: this.accountForm.name,
+          UserPwd: this.accountForm.pwd,
+          AuthList: treeData,
+          RoleList: this.roleListCheckedTemp,
+          GroupId: this.groupId,
+          UserId: this.userId,
+          AuthTo: treeData,
+          GroupList: this.accountGroupTreeCheckedTemp,
+          TacList: this.loginPolicyCheckedTemp ? this.loginPolicyCheckedTemp : []
+        })
+        if (res.code === 0) {
+          this.$message.success(res.message)
+          setTimeout(() => {
+            this.$router.push('/account')
+          })
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
     }
   }
 }

src/views/accountManagement/add.vue

@@ -1,633 +0,0 @@
-<template>
-  <div class="pageBody">
-    <div class="topPart">
-      <div class="title">
-        <div class="tltleLeft">新增账号</div>
-        <div>
-          <button
-            type="submmit"
-            class="saveBtn"
-            @click="addAcc"
-          >保存</button>
-        </div>
-      </div>
-      <div class="titleContent">
-        <el-form
-          ref="form"
-          :model="form"
-          label-width="80px"
-        >
-          <el-row :gutter="40">
-            <el-col :span="5">
-              <el-form-item
-                label="账号名称"
-                prop="name"
-              >
-                <el-input
-                  v-model="form.UserName"
-                  maxlength="32"
-                  placeholder="请输入名称"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item
-                label="登录密码"
-                prop="UserPwd"
-              >
-                <el-input
-                  v-model="form.UserPwd"
-                  placeholder="fLqec84dU3"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item
-                label="描述"
-                prop="UserDesc"
-              >
-                <el-input
-                  v-model="form.UserDesc"
-                  maxlength="128"
-                  placeholder="描述内容描述内容描述内容描述内容描述内容描述内容"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <div class="content">
-      <!-- 用户组和角色未开启 -->
-      <el-row
-        v-if="
-          systemSetuser.OpenRole === 0 &&
-            systemSetuser.OpenGroup === 0
-        "
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Permissiontree
-              :checked-keys="checkedKeys"
-              :query-type="group"
-              :query-id="objID"
-              title="权限树"
-              @get-tree-data="getTreeDatas"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <Rulesofcompetency
-              title="权限规则"
-              @get-data="getData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <loginpolicy @get-checked-list="getCheckedList" />
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 只开启用户组 -->
-      <el-row
-        v-if="
-          systemSetuser.OpenRole === 0
-            && systemSetuser.OpenGroup !== 0
-        "
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="data"
-              :default-props="defaultProps"
-              :nodekey="'GroupId'"
-              :checked-id-list="checkedIdList"
-              @get-checked-data="getTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <Permissiontree
-              :checked-keys="checkedKeys"
-              :query-type="group"
-              :query-id="objID"
-              title="权限树"
-              @get-tree-data="getTreeDatas"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part2">
-            <Rulesofcompetency
-              title="权限规则"
-              @get-data="getData"
-            />
-          </div>
-
-          <div class="part3">
-            <loginpolicy @get-checked-list="getCheckedList" />
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 只开启角色 -->
-      <el-row
-        v-if="
-          systemSetuser.OpenRole !== 0
-            && systemSetuser.OpenGroup === 0
-        "
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Rolelists
-              title="角色列表"
-              :data-list="roleList"
-              :number="8"
-              @check-click="roleClick"
-              @check-change="checkChange"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <permissionlist
-              title="权限列表"
-              :role-list="powerList"
-              :check="true"
-              class="hucPower"
-              @Competen="Competen"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <loginpolicy @getCheckedList="getCheckedList" />
-          </div>
-        </el-col>
-      </el-row>
-
-      <!-- 角色和用户组都开启 -->
-      <el-row
-        v-if="
-          systemSetuser.OpenRole !== 0
-            && systemSetuser.OpenGroup !== 0
-        "
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="data"
-              :default-props="defaultProps"
-              :nodekey="'GroupId'"
-              :checked-id-list="checkedIdList"
-              @get-checked-data="getTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <Rolelists
-              title="角色列表"
-              :data-list="roleList"
-              :number="8"
-              @checkClick="roleClick"
-              @check-change="checkChange"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part2">
-            <permissionlist
-              title="权限列表"
-              class="hucPower"
-              :role-list="powerList"
-              :check="true"
-              @Competen="Competen"
-            />
-          </div>
-          <div class="part3">
-            <loginpolicy @getCheckedList="getCheckedList" />
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-import Organization 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 Rolelists from '@/components/rolelist/index.vue'
-import permissionlist from '@/components/permissionlist/index.vue'
-import { addAccount, GetRoleByGroup } from '@/api/Account'
-import { RoleAuths } from '@/api/apiAuthority'
-import treeData from './minixs/treeData'
-// import { getUserOne } from '@/api/AccountGroup.js'
-// import { mapGetters } from 'vuex'
-export default {
-  components: {
-    Organization,
-    Permissiontree,
-    Rulesofcompetency,
-    Rolelists,
-    permissionlist,
-    loginpolicy
-  },
-  mixins: [treeData],
-  data() {
-    return {
-      checkedAuthList: [],
-      GroupId: this.$route.query.GroupId,
-      dialogVisible: false,
-      marginB: '20px',
-      // GroupId: null,
-      OpenRole: 1,
-      OpenGroup: 0,
-      data: [], // 账号组
-      TacList: [], // 登录策略
-      AuthList: [], // 授权信息
-      roleList: [], // 角色
-      PageIndex: 1,
-      PageSize: 100,
-      checkRoles: [], // 选中的角色
-      treeData: [], // 权限树数据
-      treeData1: [], // 权限树数据
-      powerList: [], // 权限列表
-      loginList: [], // 选中展示登录策略
-      objID: '1',
-      group: 'group',
-      orgId: '', // 账号组点击id
-      checkedIdList: [],
-      CheckedList: [],
-      checkedKeys: [],
-      powerT: [],
-      PwdLengthBegin: null,
-      PwdLengthEnd: null,
-      PwdStruc: null,
-      pwd: null,
-      form: {
-        UserName: null, // 账号名字
-        UserPwd: null, // 密码
-        UserDesc: null, // 描述
-        GroupId: '' // 账号组Id
-      },
-      rules: {
-        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: '长度最多128个字符', trigger: 'blur' }]
-      },
-      defaultProps: {
-        children: 'children',
-        label: 'GroupName'
-      },
-      systemSetuser: null,
-      AppId: ''
-    }
-  },
-  watch: {
-    dataList: {
-      handler(val) {
-        const arr = val.children
-        this.decompose(arr, this.AppId)
-        if (Array.isArray(this.dataObj)) {
-          this.data = this.dataObj
-        } else {
-          this.data = [this.dataObj]
-        }
-        this.RoleList.forEach(item => {
-          this.groupRoleList.forEach((value, index) => {
-            if (item.RoleId === value.RoleId) {
-              this.checkedRoleKeys.push(index)
-            }
-          })
-        })
-      },
-      deep: true
-    }
-  },
-  mounted() {
-    this.form.UserPwd = this.generatePassword(this.PwdStruc, this.PwdLengthBegin, this.PwdLengthEnd)
-  },
-  created() {
-    const { GroupId } = this.$route.query
-    this.AppId = GroupId
-    this.objID = GroupId
-    let obj
-    if (typeof this.$store.state.app.systemSet === 'string') {
-      obj = JSON.parse(this.$store.state.app.systemSet)
-    } else {
-      obj = this.$store.state.app.systemSet
-    }
-    this.systemSetuser = obj
-    const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
-    this.openRole = OpenRole
-    this.OpenGroup = OpenGroup
-    this.PwdStruc = PwdStruc
-    this.PwdLengthBegin = PwdLengthBegin
-    this.PwdLengthEnd = PwdLengthEnd
-    if (OpenRole) {
-      this.title = '角色'
-    }
-  },
-  methods: {
-    // 账号新增
-    async addAcc() {
-      this.checkedAuthList.forEach(item => {
-        this.treeData1.push(item.AuthList)
-      })
-      this.treeData1.forEach((item, index) => {
-        this.$store.getters.authArrs.forEach(item2 => {
-          if (item.AuthId === item2.AuthId) {
-            this.treeData1[index] = item2.AuthList
-          }
-        })
-      })
-      try {
-        const res = await addAccount({
-          UserName: this.form.UserName,
-          UserPwd: this.form.UserPwd,
-          UserDesc: this.form.UserDesc,
-          GroupList: this.checkTrees,
-          RoleList: this.checkRoles,
-          UserId: this.userId,
-          AuthTo: this.treeData1,
-          TacList: this.CheckedList ? this.CheckedList : [],
-          AuthList: this.treeData1
-        })
-        if (res.code === 0) {
-          this.$message.success(res.message)
-          setTimeout(() => {
-            this.$router.push('/account')
-          }, 2000)
-        } else {
-          this.$message.error(res.message)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-      }
-    },
-    delete(index) {
-      this.dialogVisible = true
-    },
-
-    // 获取权限树回调
-    getTreeDatas(arr) {
-      //  this.treeData = arr;
-      this.checkedAuthList = arr
-    },
-    getCheckedList(data) {
-      this.CheckedList = data
-    },
-    // 获取选中的树数据
-    getTreeData(arr) {
-      this.checkTrees = arr
-
-      this.checkTrees.forEach(item => {
-        this.orgId = item.GroupId
-      })
-      // let objArr = arr[arr.length - 1];
-      // if (objArr) {
-      //   this.objID = objArr.GroupId + "";
-      //   this.RoleBox();
-      // } else {
-      //   this.queryRole();
-      // }
-      if (this.checkTrees !== '') {
-        this.queryRole()
-      } else {
-        this.roleList = []
-      }
-    },
-
-    // 获取权限规则
-    getData(obj) {
-      this.rulesObj = obj
-    },
-    // 获取指定数据
-    decompose(data, id) {
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].GroupId === id) {
-          this.dataObj = data[i]
-        } else if (data[i].children && data[i].children.length > 0) {
-          this.decompose(data[i].children, id)
-        }
-      }
-    },
-
-    // 点击角色后
-    roleClick(data) {
-      try {
-        const params = {
-          RoleId: data.RoleId
-        }
-        RoleAuths(params).then(result => {
-          this.powerList = result.returnData
-        })
-      } catch (error) {
-        console.log('RoleAuths')
-        console.log(error)
-      }
-    },
-    Competen(data) {
-      this.$emit('Competen', data)
-    },
-    // 角色列表
-    async queryRole() {
-      try {
-        const res = await GetRoleByGroup({
-          GroupId: this.orgId
-        })
-        if (res.code === 0) {
-          const arr = res.returnData
-          const userArr = []
-          arr.forEach(item => {
-            item.name = item.RoleName
-            if (item.IsSelected) {
-              userArr.push(item)
-            }
-          })
-          this.roleList = userArr
-        } else {
-          this.$message.error(res.message)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-      }
-    },
-    generatePassword(rules, minNum, maxNum) {
-      var rulesArr = rules.split('')
-      var rulesArrLnArr = []
-      var pwd = ''
-      var numbers = '0123456789'
-      var lower = 'abcdefghijklmnopqrstuvwxyz'
-      var upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-      var others = '~!@#$%^&*()_'
-
-      function rand(min, max) {
-        return Math.random() * (max - min) + min
-      }
-      var pwdLen = parseInt(rand(minNum, maxNum)) // 随机生成密码长度10-12位。 //  alert("密码长度：" + pwdLen);
-      var item = new Array(pwdLen) // 存放密码的类型 数字（1），小写（2），大写（3），特殊字符（4）
-      for (let i = 0; i < rulesArr.length; i++) {
-        if (rulesArr[i] === '1') {
-          rulesArrLnArr.push(i + 1 + '')
-        }
-      }
-      for (let i = 0; i < rulesArrLnArr.length; i++) {
-        item[rulesArrLnArr[i]] = rulesArrLnArr[i] + ''
-      }
-      for (let i = 0; i < pwdLen; i++) {
-        if (rulesArrLnArr.indexOf(i + '') === -1) {
-          item[i] = ''
-          item[i] += rulesArrLnArr[parseInt(Math.random() * (rulesArrLnArr.length - 0) + 0)] // 其余部分随机生成1-4的数字。
-        }
-      } // 打乱次序，重新排序，否则密码第四位永远是特殊符号。
-      item.sort(function() {
-        return 0.5 - Math.random()
-      }) // 返回0 两个数位置不变；小于0 就交换位置；大于0就不交换位置
-
-      for (let j = 0; j < pwdLen; j++) {
-        if (item[j] === '4') {
-          pwd += numbers.charAt(Math.random() * (numbers.length - 1) + 1)
-        } else if (item[j] === '2') {
-          pwd += lower.charAt(Math.random() * (lower.length - 1) + 1)
-        } else if (item[j] === '1') {
-          pwd += upper.charAt(Math.random() * (upper.length - 1) + 1)
-        } else if (item[j] === '3') {
-          pwd += others.charAt(Math.random() * (others.length - 1) + 1)
-        }
-      }
-      return pwd
-    },
-
-    // 角色选取
-    checkChange(arr) {
-      const datas = []
-      for (let i = 0; i < arr.length; i++) {
-        datas.push(this.roleList[arr[i]])
-      }
-      this.checkRoles = datas
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.pageBody {
-  width: 100%;
-  height: calc(100vh - 178px);
-  padding: 30px 64px;
-  .topPart {
-    box-sizing: border-box;
-    width: 100%;
-    height: 184px;
-    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;
-      .isUsed {
-        position: absolute;
-        left: 194px;
-        top: 6px;
-      }
-      .tltleLeft {
-        font-size: 24px;
-        font-weight: bold;
-        color: #303133;
-      }
-      .saveBtn {
-        width: 80px;
-        height: 40px;
-        background: linear-gradient(0deg, #777dba, #6983be);
-        border-radius: 6px;
-        color: #fff;
-        border: none;
-      }
-      .delBtn {
-        width: 80px;
-        height: 40px;
-        background: #f56c6c;
-        border-radius: 6px;
-        color: #fff;
-        border: none;
-        margin-right: 24px;
-      }
-    }
-    .titleContent {
-      width: 100%;
-      padding-top: 35px;
-      box-sizing: border-box;
-      .resetPass {
-        background: #6e81bc;
-        color: #fff;
-        margin-top: 4px;
-        margin-left: -25px;
-      }
-    }
-  }
-  .content {
-    width: 100%;
-    height: calc(100% - 184px);
-    padding-top: 24px;
-    box-sizing: border-box;
-    // .el-row {
-    //   height: 100%;
-    //   .el-col {
-    //     height: 100%;
-    //   }
-    // }
-    .part {
-      width: 100%;
-      height: 856px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-    }
-    .last {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-    }
-    .part2 {
-      width: 100%;
-      height: 512px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-    }
-    .part3 {
-      width: 100%;
-      height: 320px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-      margin-top: 25px;
-      overflow: hidden;
-    }
-  }
-}
-</style>

src/views/accountManagement/edit.vue

@@ -1,702 +0,0 @@
-<template>
-  <div class="account-edit">
-    <div class="account-edit-header">
-      <div class="title">
-        <div class="tltleLeft">编辑账号</div>
-        <!-- <div class="isUsed">
-          是否启用
-          <el-radio
-            v-model="form.isUsed"
-            v-if="form.isUsed == 1 || form.isUsed == 3"
-            :label="1"
-            >是</el-radio
-          >
-          <el-radio v-model="form.isUsed" v-if="form.isUsed == 2" :label="2"
-            >是</el-radio
-          >
-          <el-radio v-model="form.isUsed" :label="3">否</el-radio>
-        </div> -->
-        <div>
-          <!-- <button type="submmit" class="delBtn" @click="delate">删除</button> -->
-          <button
-            type="submmit"
-            class="saveBtn"
-            @click="saveEdit"
-          >保存</button>
-        </div>
-      </div>
-      <div class="titleContent">
-        <el-form
-          ref="form"
-          :model="form"
-          label-width="80px"
-        >
-          <el-row :gutter="40">
-            <el-col :span="5">
-              <el-form-item
-                label="账号名称"
-                prop="name"
-              >
-                <el-input
-                  v-model="form.name"
-                  maxlength="32"
-                  placeholder="请输入名称"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item
-                label="登录密码"
-                prop="passward"
-              >
-                <el-input
-                  v-model="form.passward"
-                  placeholder="*******"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="2">
-              <el-button
-                class="resetPass"
-                size="small"
-                @click="resetPwd"
-              >重置密码</el-button>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item
-                label="描述"
-                prop="diesc"
-              >
-                <el-input
-                  v-model="form.diesc"
-                  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="part">
-            <PermissionTree
-              title="权限树"
-              :checked-keys="permissionTreeChckedKeys"
-              :query-type="group"
-              :query-id="objID"
-              @get-tree-data="getPermissionTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <RulesOfCompetency
-              title="权限规则"
-              @get-data="getRulesData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <LoginPolicy
-              :checked-list="loginList"
-              @get-checked-list="getCheckedList"
-            />
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 角色和用户组都开启 -->
-      <el-row
-        v-if="openGroup && openRole"
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="groupList"
-              :default-props="defaultProps"
-              :nodekey="'GroupId'"
-              :checked-id-list="checkedIdList"
-              @get-tree-data="getGroupTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <RoleLists
-              title="角色列表"
-              :data-list="roleList"
-              :check-box-list="checkRole"
-              :number="8"
-              @check-click="roleClick"
-              @check-change="checkChange"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part2">
-            <PermissioLlist
-              title="权限列表"
-              class="hucPower"
-              :role-list="powerList"
-              :check="true"
-              @Competen="Competen"
-            />
-          </div>
-          <div class="part3">
-            <LoginPolicy
-              :checked-list="loginList"
-              @get-checked-list="getCheckedList"
-            />
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 只开启用户组 -->
-      <el-row
-        v-if="openGroup && !openRole"
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <Organization
-              title="所属账号组"
-              :data="groupList"
-              :default-props="defaultProps"
-              :nodekey="'GroupId'"
-              :checked-id-list="checkedIdList"
-              @get-tree-data="getGroupTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <PermissionTree
-              :checked-keys="permissionTreeChckedKeys"
-              :query-type="group"
-              :query-id="objID"
-              title="权限树"
-              @get-tree-data="getPermissionTreeData"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part2">
-            <RulesOfCompetency
-              title="权限规则"
-              @get-data="getRulesData"
-            />
-          </div>
-
-          <div class="part3">
-            <LoginPolicy
-              :checked-list="loginList"
-              @get-checked-list="getCheckedList"
-            />
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 只开启角色 -->
-      <el-row
-        v-if="!openGroup && openRole"
-        :gutter="24"
-      >
-        <el-col :span="8">
-          <div class="part">
-            <RoleLists
-              title="角色列表"
-              :data-list="roleList"
-              :check-box-list="checkRole"
-              :number="8"
-              @check-change="checkChange"
-              @check-click="roleClick"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <PermissioLlist
-              title="权限列表"
-              :role-list="powerList"
-              :check="true"
-              class="hucPower"
-              @Competen="Competen"
-            />
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="part">
-            <LoginPolicy
-              :checked-list="loginList"
-              @get-checked-list="getCheckedList"
-            />
-          </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 Organization 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 RoleLists from '@/components/rolelist/index.vue'
-import PermissioLlist from '@/components/permissionlist/index.vue'
-import Dialog from '@/layout/components/Dialog'
-import {
-  // QueryRole,
-  RoleAuths
-} from '@/api/apiAuthority'
-// import { getUserOne } from '@/api/AccountGroup.js'
-// import { mapGetters } from 'vuex'
-// import Cookies from "js-cookie";
-import { getAccountDetails, editAccount, GetRoleByGroup } from '@/api/Account.js'
-export default {
-  components: {
-    Organization,
-    PermissionTree,
-    RulesOfCompetency,
-    LoginPolicy,
-    RoleLists,
-    PermissioLlist,
-    Dialog
-  },
-  data() {
-    return {
-      appId: 0,
-      group: 'group',
-      userId: this.$route.query.userid,
-      GroupId: this.$route.query.GroupId,
-      dialogVisible: false,
-      openRole: false,
-      openGroup: false,
-      PwdLengthBegin: null,
-      PwdLengthEnd: null,
-      PwdStruc: null,
-      pwd: null,
-      groupList: [], // 账号组
-      orgId: '',
-      TacList: [], // 登录策略
-      AuthList: [], // 授权信息
-      roleList: [], // 角色
-      checkRoles: [], // 选中的角色
-      treeData: [], // 权限树数据
-      powerList: [], // 权限列表
-      checkedIdList: [],
-      loginList: [], // 选中展示登录策略
-      checkRole: [],
-      CheckedList: [], // 登录策略
-      rulesObj: [],
-      permissionTreeChckedKeys: [],
-      objID: '1',
-      rules: {
-        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' }]
-      },
-      form: {
-        name: null,
-        passward: null,
-        diesc: null
-        // isUsed: true,
-      },
-      defaultProps: {
-        children: 'children',
-        label: 'GroupName'
-      },
-      treeData1: [],
-      checkedAuthList: []
-    }
-  },
-  created() {
-    let obj
-    if (typeof this.$store.state.app.systemSet === 'string') {
-      obj = JSON.parse(this.$store.state.app.systemSet)
-    } else {
-      obj = this.$store.state.app.systemSet
-    }
-    console.log(obj)
-    const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
-    this.openRole = OpenRole
-    this.openGroup = OpenGroup
-    this.PwdStruc = PwdStruc
-    this.PwdLengthBegin = PwdLengthBegin
-    this.PwdLengthEnd = PwdLengthEnd
-    this.editAccInfo()
-    const { GroupId } = this.$route.query
-    this.appId = GroupId
-    if (OpenRole) {
-      this.title = '角色'
-    }
-  },
-  mounted() {
-    this.form.UserPwd = this.generatePassword(this.PwdStruc, this.PwdLengthBegin, this.PwdLengthEnd)
-  },
-  methods: {
-    getCheckedList(data) {
-      this.CheckedList = data
-    },
-    // 获取权限树
-    getPermissionTreeData(arr) {
-      this.checkedAuthList = arr
-    },
-    resetPwd() {
-      this.form.passward = this.generatePassword(this.PwdStruc, this.PwdLengthBegin, this.PwdLengthEnd)
-    },
-    // 获取权限规则
-    getRulesData(obj) {
-      this.rulesObj = obj
-    },
-    generatePassword(rules, minNum, maxNum) {
-      var rulesArr = rules.split('')
-      var rulesArrLnArr = []
-      var pwd = ''
-      var numbers = '0123456789'
-      var lower = 'abcdefghijklmnopqrstuvwxyz'
-      var upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-      var others = '~!@#$%^&*()_'
-
-      function rand(min, max) {
-        return Math.random() * (max - min) + min
-      }
-      var pwdLen = parseInt(rand(minNum, maxNum)) // 随机生成密码长度10-12位。 // alert("密码长度：" + pwdLen);
-      var item = new Array(pwdLen) // 存放密码的类型 数字（1），小写（2），大写（3），特殊字符（4）
-      for (let i = 0; i < rulesArr.length; i++) {
-        if (rulesArr[i] === '1') {
-          rulesArrLnArr.push(i + 1 + '')
-        }
-      }
-      for (let i = 0; i < rulesArrLnArr.length; i++) {
-        item[rulesArrLnArr[i]] = rulesArrLnArr[i] + ''
-      }
-      for (let i = 0; i < pwdLen; i++) {
-        if (rulesArrLnArr.indexOf(i + '') === -1) {
-          item[i] = ''
-          item[i] += rulesArrLnArr[parseInt(Math.random() * (rulesArrLnArr.length - 0) + 0)] // 其余部分随机生成1-4的数字。
-        }
-      } // 打乱次序，重新排序，否则密码第四位永远是特殊符号。
-      item.sort(function () {
-        return 0.5 - Math.random()
-      }) // 返回0 两个数位置不变；小于0 就交换位置；大于0就不交换位置
-
-      for (let j = 0; j < pwdLen; j++) {
-        if (item[j] === '4') {
-          pwd += numbers.charAt(Math.random() * (numbers.length - 1) + 1)
-        } else if (item[j] === '2') {
-          pwd += lower.charAt(Math.random() * (lower.length - 1) + 1)
-        } else if (item[j] === '1') {
-          pwd += upper.charAt(Math.random() * (upper.length - 1) + 1)
-        } else if (item[j] === '3') {
-          pwd += others.charAt(Math.random() * (others.length - 1) + 1)
-        }
-      }
-      return pwd
-    },
-
-    // 账号组树
-    getGroupTreeData(arr) {
-      console.log(arr)
-      this.checkTrees = arr
-      this.checkTrees.forEach(item => {
-        this.orgId = item.GroupId
-        if (item[0]) {
-          item.disabled = true
-        }
-      })
-      this.checkedIdList = arr
-      // let objArr = arr[arr.length - 1];
-      // if (objArr) {
-      //   this.objID = objArr.GroupId + "";
-      //   this.queryRole();
-      // }
-      if (this.checkTrees !== '') {
-        this.queryRole()
-      } else {
-        this.roleList = []
-      }
-    },
-
-    // 点击角色后
-    roleClick(data) {
-      try {
-        const params = {
-          RoleId: data.RoleId
-        }
-        RoleAuths(params).then(result => {
-          this.powerList = result.returnData
-        })
-      } catch (error) {
-        console.log('RoleAuths')
-        console.log(error)
-      }
-    },
-    Competen(data) {
-      this.$emit('Competen', data)
-    },
-
-    // 详情查询
-    async editAccInfo() {
-      try {
-        const res = await getAccountDetails({
-          UserId: this.userId
-        })
-        if (res.code === 0) {
-          // 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(this.checkedIdList)
-          this.loginList.forEach(item => {
-            if (item.IsSelected === 1) {
-              this.CheckedList.push(item)
-            }
-          })
-
-          this.$store.state.auth.authList = AuthList
-
-          AuthList.forEach(item => {
-            this.permissionTreeChckedKeys.push(item.AuthId)
-          })
-          this.roleList = RoleList
-          this.roleList?.forEach((item, index) => {
-            if (item.IsSelected === 1) {
-              this.checkRole.push(index)
-              this.checkRoles.push(item)
-            }
-          })
-          this.queryRole()
-        } else {
-          this.$message.error(res.message)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-      }
-    },
-
-    // 账号编辑修改
-    async saveEdit() {
-      this.treeData1 = []
-      this.checkedAuthList.forEach(item => {
-        this.treeData1.push(item.AuthList)
-      })
-      this.treeData1.forEach((item, index) => {
-        this.$store.getters.authArrs.forEach(item2 => {
-          if (item.AuthId === item2.AuthId) {
-            this.treeData1[index] = item2.AuthList
-          }
-        })
-      })
-
-      try {
-        const res = await editAccount({
-          UserDesc: this.form.diesc,
-          UserName: this.form.name,
-          UserPwd: this.form.passward,
-          AuthList: this.treeData1,
-          RoleList: this.checkRoles,
-          GroupId: this.GroupId,
-          UserId: this.userId,
-          AuthTo: this.treeData1,
-          GroupList: this.checkedIdList,
-          TacList: this.CheckedList ? this.CheckedList : []
-        })
-        if (res.code === 0) {
-          this.$message.success(res.message)
-          setTimeout(() => {
-            this.$router.push('/account')
-          })
-        } else {
-          this.$message.error(res.message)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-      }
-    },
-
-    // 角色选取
-    checkChange(arr) {
-      const datas = []
-      const arrs = []
-      for (let i = 0; i < arr.length; i++) {
-        datas.push(this.roleList[arr[i]])
-      }
-      datas.forEach(item => {
-        const RoleC = {
-          IsSelected: 1,
-          RoleId: item.RoleId,
-          RoleName: item.RoleName
-        }
-        arrs.push(RoleC)
-      })
-      this.checkRoles = arrs
-    },
-    // 角色列表
-    async queryRole() {
-      try {
-        const res = await GetRoleByGroup({
-          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
-            if (item.IsSelected) {
-              userArr.push(item)
-            }
-          })
-          this.roleList = userArr
-        } else {
-          this.$message.error(res.message)
-        }
-      } catch (error) {
-        console.log('出错了', error)
-      }
-    }
-  }
-}
-</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;
-      .isUsed {
-        position: absolute;
-        left: 194px;
-        top: 6px;
-      }
-      .tltleLeft {
-        font-size: 24px;
-        font-weight: bold;
-        color: #303133;
-      }
-      .saveBtn {
-        width: 80px;
-        height: 40px;
-        background: linear-gradient(0deg, #777dba, #6983be);
-        border-radius: 6px;
-        color: #fff;
-        border: none;
-      }
-      .delBtn {
-        width: 80px;
-        height: 40px;
-        background: #f56c6c;
-        border-radius: 6px;
-        color: #fff;
-        border: none;
-        margin-right: 24px;
-      }
-    }
-    .titleContent {
-      width: 100%;
-      padding-top: 35px;
-      box-sizing: border-box;
-      .resetPass {
-        background: #6e81bc;
-        color: #fff;
-        margin-top: 4px;
-        margin-left: -25px;
-      }
-    }
-  }
-  .content {
-    width: 100%;
-    height: calc(100% - 274px);
-    box-sizing: border-box;
-    // .el-row {
-    //   height: 100%;
-    //   .el-col {
-    //     height: 100%;
-    //   }
-    // }
-    ::v-deep .el-empty {
-      padding: 0;
-    }
-    .part {
-      width: 100%;
-      height: 720px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-    }
-    .img-onlyRead {
-      pointer-events: none;
-    }
-    .last {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-    }
-    .part2 {
-      width: 100%;
-      height: 376px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-    }
-    .part3 {
-      width: 100%;
-      height: 320px;
-      background: #ffffff;
-      box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 16px;
-      margin-top: 25px;
-      overflow: hidden;
-    }
-  }
-}
-</style>

src/views/accountManagement/index.vue

@@ -212,13 +212,13 @@ export default {
       this.UserId = userid
       this.$router.push({
         path: 'accountEdit',
-        query: { userid: this.UserId }
+        query: { userId: this.UserId }
       })
     },
     addAccount() {
       this.$router.push({
         path: 'accountAdd',
-        query: { GroupId: -1 }
+        query: { groupId: -1 }
       })
     },
     // 获取列表

src/views/accountManagement/minixs/pwdRules.js

@@ -1,118 +0,0 @@
-//16进制（数值+字母）
-function random1(len) {
-  var pwd = "";
-  for (var idx = 0; idx < len; idx++) {
-    pwd = pwd + ((Math.random() * 16) & (0x5 | 0x9)).toString(16);
-  }
-  return pwd;
-}
-
-function random2(formation, len) {
-  //ASCII 33 ~ 126
-  // 33-47，58-64，91-96，123-126 特殊符号
-  // 48-57 数字
-  // 65-90 大写字母
-  // 97-122 小写字母
-  let pwd = "",
-    f_i = 0;
-  for (let i = 0; i < len; i++) {
-    for (;; f_i++) {
-      let _i = f_i % 4;
-      if (formation[_i] == 1) {
-        switch (_i) {
-          case 0: // 大写字母
-            pwd = pwd + String.fromCharCode(parseInt(Math.random() * 26 + 65));
-            break;
-          case 1: // 小写字母
-            pwd = pwd + String.fromCharCode(parseInt(Math.random() * 26 + 97));
-            break;
-          case 2: // 特殊符号
-            pwd = pwd + String.fromCharCode(parseInt(Math.random() * 15 + 33));
-            break;
-          case 3: // 数字
-            pwd = pwd + String.fromCharCode(parseInt(Math.random() * 10 + 48));
-            break;
-        }
-        f_i++;
-        break;
-      }
-    }
-  }
-  console.log(pwd);
-}
-//纯数字
-function random3(len) {
-  var pwd = "";
-  for (var idx = 0; idx < len; idx++) {
-    var seed = parseInt(Math.random() * 9);
-    pwd = pwd + seed;
-  }
-  return pwd;
-}
-
-function create() {
-  var result = document.getElementById("result1");
-  for (var i = 0; i < 10; i++) {
-    result.innerText = result.innerText + random1(6) + "\n";
-  }
-  var result = document.getElementById("result2");
-  for (var i = 0; i < 10; i++) {
-    result.innerText = result.innerText + random2(6) + "\n";
-  }
-  var result = document.getElementById("result3");
-  for (var i = 0; i < 10; i++) {
-    result.innerText = result.innerText + random3(6) + "\n";
-  }
-}
-
-function generatePassword(rules, minNum, maxNum) {
-  var rulesArr = rules.split("");
-  var rulesArrLnArr = [];
-  var pwd = "";
-  var numbers = "0123456789";
-  var lower = "abcdefghijklmnopqrstuvwxyz";
-  var upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  var others = "~!@#$%^&*()_";
-
-  function rand(min, max) {
-    return Math.random() * (max - min) + min;
-  }
-  var pwdLen = parseInt(rand(minNum, maxNum)); //随机生成密码长度10-12位。
-  // alert("密码长度：" + pwdLen);
-  var item = new Array(pwdLen); //存放密码的类型 数字（1），小写（2），大写（3），特殊字符（4）
-  for (let i = 0; i < rulesArr.length; i++) {
-    if (rulesArr[i] == "1") {
-      rulesArrLnArr.push(i + 1 + "");
-    }
-  }
-  for (let i = 0; i < rulesArrLnArr.length; i++) {
-    item[rulesArrLnArr[i]] = rulesArrLnArr[i] + "";
-    console.log(`rulesArrLnArr[i]`, rulesArrLnArr[i]);
-  }
-  for (i = 0; i < pwdLen; i++) {
-    if (rulesArrLnArr.indexOf(i + "") == -1) {
-      item[i] = "";
-      item[i] +=
-        rulesArrLnArr[
-          parseInt(Math.random() * (rulesArrLnArr.length - 0) + 0)
-        ]; //其余部分随机生成1-4的数字。
-    }
-  }
-  //打乱次序，重新排序，否则密码第四位永远是特殊符号。
-  item.sort(function () {
-    return 0.5 - Math.random();
-  }); //返回0 两个数位置不变；小于0 就交换位置；大于0就不交换位置
-
-  for (j = 0; j < pwdLen; j++) {
-    if (item[j] == "4") {
-      pwd += numbers.charAt(Math.random() * (numbers.length - 1) + 1);
-    } else if (item[j] == "1") {
-      pwd += lower.charAt(Math.random() * (lower.length - 1) + 1);
-    } else if (item[j] == "2") {
-      pwd += upper.charAt(Math.random() * (upper.length - 1) + 1);
-    } else if (item[j] == "3") {
-      pwd += others.charAt(Math.random() * (others.length - 1) + 1);
-    }
-  }
-  return pwd;
-}

src/views/accountManagement/minixs/treeData.js → src/views/accountManagement/mixins/treeData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-12-22 17:00:22
- * @LastEditTime: 2022-01-06 16:10:10
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-02-15 17:28:46
+ * @LastEditors: your name
  * @Description: 获取权限树
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\minixs\treeData.js
  */
@@ -18,7 +18,7 @@ export default {
     return {
       dataList: {
         GroupId: -1,
-        GroupName: "系统权限组",
+        GroupName: '系统权限组',
         GroupUpid: -2,
         UserCount: 0,
         AuthCount: 0,
@@ -36,15 +36,15 @@ export default {
     async getGroupTree(name = '') {
       try {
         const result = await GetGroupTree({
-          "QueryName": name
+          'QueryName': name
         })
         if (result.code === 0 && result.returnData.length) {
           result.returnData.forEach(item => {
-            item.flag = item.Status == 1 ? true : false
+            item.flag = item.Status === 1 ? true : false
           })
           const obj = {
             GroupId: -1,
-            GroupName: "系统权限组",
+            GroupName: '系统权限组',
             GroupUpid: -2,
             UserCount: 0,
             AuthCount: 0,
@@ -53,20 +53,20 @@ export default {
             children: translateDataToTreeAll(result.returnData, 'GroupUpid', 'GroupId')
           }
           this.dataList = obj
-          this.dataArr = result.returnData;
+          this.dataArr = result.returnData
           this.dataArr.push({
             GroupId: -1,
-            GroupName: "系统权限组",
+            GroupName: '系统权限组',
             GroupUpid: -2,
             UserCount: 0,
             AuthCount: 0,
             Status: 1,
-            QueryTarget: 0,
+            QueryTarget: 0
           })
         } else {
           const obj = {
             GroupId: -1,
-            GroupName: "系统权限组",
+            GroupName: '系统权限组',
             GroupUpid: -2,
             UserCount: 0,
             AuthCount: 0,