Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/components/usergrouptree/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-02-23 12:18:38
+ * @LastEditTime: 2022-03-02 10:58:29
  * @LastEditors: your name
  * @Description: 用户组树
  * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
@@ -125,7 +125,7 @@ export default {
       const tree = translateDataToTreeAll(datas, 'GroupUpid', 'GroupId')
       const obj = {
         AuthCount: 0,
-        GroupId: 0,
+        GroupId: -1,
         GroupName: '系统用户组',
         GroupUpid: 0,
         QueryTarget: 0,

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -223,6 +223,7 @@ export default {
       this.roleType = 'onlyRole'
       this.queryType = 'all'
     }
+    this.accountGroupTreeCheckedList = [this.GroupUpId]
   },
   methods: {
     // 账号组详情

src/views/accountManagement/components/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-03-02 09:40:14
+ * @LastEditTime: 2022-03-02 11:09:58
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -341,7 +341,7 @@ export default {
       loginPolicyCheckedList: [], // 登录策略初始勾选项
       loginPolicyCheckedTemp: [], // 登录策略当前勾选项
       accountGroupTreeCheckedList: [], // 账号组树初始勾选项
-      accountGroupTreeCheckedTemp: [-1], // 账号组树当前勾选项
+      accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
       roleType: '',
@@ -424,7 +424,6 @@ export default {
             })
 
           if (GroupList && GroupList.length && GroupList[0] !== -1) {
-            this.accountGroupTreeCheckedTemp = []
             this.roleType = this.openGroup ? 'roleByUpId' : 'onlyRole'
             this.queryType = this.openGroup ? 'group' : 'all'
             GroupList.forEach(group => {
@@ -436,6 +435,7 @@ export default {
           } else {
             this.roleType = 'onlyRole'
             this.queryType = 'all'
+            this.accountGroupTreeCheckedTemp.push(-1)
           }
 
           RoleList &&