Merge branch 'sqy_dev' into 'main'

'修复角色，增加修改密码menu'

See merge request huang/yun-teng-iot-front!138

@@ -32,6 +32,11 @@
           icon="ion:document-text-outline"
           icon="ion:document-text-outline"
         />
         />
         <MenuItem
         <MenuItem
+          key="changePassword"
+          :text="t('layout.header.dropdownItemChangePassword')"
+          icon="ant-design:unlock-twotone"
+        />
+        <MenuItem
           v-if="getUseLockPage"
           v-if="getUseLockPage"
           key="lock"
           key="lock"
           :text="t('layout.header.tooltipLock')"
           :text="t('layout.header.tooltipLock')"
@@ -138,6 +143,9 @@
           case 'personal':
           case 'personal':
             openPersonalFunc();
             openPersonalFunc();
             break;
             break;
+          case 'changePassword':
+            changePassword();
+            break;
         }
         }
       }
       }
 
 
@@ -161,6 +169,10 @@
         refreshPersonlData.realName = v.realName;
         refreshPersonlData.realName = v.realName;
       };
       };
 
 
+      const changePassword = () => {
+        console.log(123);
+      };
+
       return {
       return {
         updataPersonlData,
         updataPersonlData,
         refreshPersonlData,
         refreshPersonlData,

@@ -5,6 +5,7 @@ export default {
     dropdownItemDoc: '文档',
     dropdownItemDoc: '文档',
     dropdownItemLoginOut: '退出系统',
     dropdownItemLoginOut: '退出系统',
     dropdownItemPersonal: '个人中心',
     dropdownItemPersonal: '个人中心',
+    dropdownItemChangePassword: '修改密码',
 
 
     // tooltip
     // tooltip
     tooltipErrorLog: '错误日志',
     tooltipErrorLog: '错误日志',

@@ -14,12 +14,11 @@
           v-model:value="model[field]"
           v-model:value="model[field]"
           :treeData="treeData"
           :treeData="treeData"
           :replaceFields="{ title: 'menuName' }"
           :replaceFields="{ title: 'menuName' }"
-          :checkedkeys="roleMenus"
+          :checkedKeys="roleMenus"
           checkable
           checkable
           toolbar
           toolbar
           ref="treeRef"
           ref="treeRef"
           title="菜单分配"
           title="菜单分配"
-          @check="handleCheckClick"
           :defaultExpandAll="true"
           :defaultExpandAll="true"
         />
         />
       </template>
       </template>
@@ -51,7 +50,6 @@
       const treeData = ref<TreeItem[]>([]);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
       const roleMenus = ref<string[]>([]);
       const roleId = ref('');
       const roleId = ref('');
-      const allCheckedKeys = ref<string[]>([]);
       const treeRef = ref();
       const treeRef = ref();
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
         labelWidth: 90,
@@ -119,7 +117,7 @@
             remark: values.remark,
             remark: values.remark,
             status: values.status,
             status: values.status,
             roleType: RoleEnum.TENANT_ADMIN,
             roleType: RoleEnum.TENANT_ADMIN,
-            menu: allCheckedKeys.value as string[],
+            menu: treeRef.value.getCheckedKeys(),
           };
           };
           await saveOrUpdateRoleInfoWithMenu(req);
           await saveOrUpdateRoleInfoWithMenu(req);
           closeDrawer();
           closeDrawer();