Merge branch 'main' into ft-dev

 import { generate } from '@ant-design/colors';
 import { generate } from '@ant-design/colors';
 
 
-export const primaryColor = '#0960bd';
+export const primaryColor = '#377DFF';
 
 
 export const darkMode = 'light';
 export const darkMode = 'light';
 
 

@@ -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,

@@ -10,21 +10,21 @@ export default {
     status: 'status',
     status: 'status',
   },
   },
   notice: {
   notice: {
-    webSiteNotice: 'web site notice',
+    webSiteNotice: 'platform notice',
     noticeManagement: 'notice management',
     noticeManagement: 'notice management',
     myNotice: 'my notice',
     myNotice: 'my notice',
   },
   },
 
 
   device: {
   device: {
     deviceManagement: 'device management',
     deviceManagement: 'device management',
-    device: 'device',
+    device: 'device management',
     deviceProfile: 'device profile',
     deviceProfile: 'device profile',
   },
   },
   tenant: {
   tenant: {
     tenant: 'tenant',
     tenant: 'tenant',
     tenantManagement: 'tenant management',
     tenantManagement: 'tenant management',
     tenantSetting: 'tenant config',
     tenantSetting: 'tenant config',
-    tenantOEM: 'OEM  customization',
+    tenantOEM: 'platform customization',
     tenantRule: 'tenant rule',
     tenantRule: 'tenant rule',
   },
   },
 
 
@@ -49,23 +49,9 @@ export default {
     alarmManagement: 'alarm management',
     alarmManagement: 'alarm management',
     geographicPosition: 'geographic position',
     geographicPosition: 'geographic position',
     alarmContact: 'alarm contact',
     alarmContact: 'alarm contact',
-    alarmCenter: 'alarm center',
+    alarmCenter: 'alarm record',
   },
   },
 
 
-  dept: {
-    queryDeptName: 'dept name',
-    queryDeptStatus: 'status',
-    toolDeptList: 'dept list',
-    toolCreateDept: 'create dept',
-    toolEditDept: 'edit dept',
-    tableTitleDeptSort: 'sort',
-    tableTitleDeptCreateTime: 'create time',
-    tableTitleDeptOperation: 'operation',
-    drawerTitleDeptEnable: 'enable',
-    drawerTitleDeptDisable: 'disable',
-    drawerTitleDeptParentDept: 'parent dept',
-    tableTitleMemo: 'memo',
-  },
   system: {
   system: {
     system: 'system',
     system: 'system',
     accountManagement: 'account management',
     accountManagement: 'account management',

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

@@ -10,13 +10,13 @@ export default {
     status: '状态',
     status: '状态',
   },
   },
   notice: {
   notice: {
-    webSiteNotice: '站内通知',
+    webSiteNotice: '平台通知',
     noticeManagement: '通知管理',
     noticeManagement: '通知管理',
     myNotice: '我的通知',
     myNotice: '我的通知',
   },
   },
   device: {
   device: {
     deviceManagement: '设备管理',
     deviceManagement: '设备管理',
-    device: '设备',
+    device: '设备管理',
     deviceProfile: '设备配置',
     deviceProfile: '设备配置',
   },
   },
 
 
@@ -24,7 +24,7 @@ export default {
     tenant: '租户',
     tenant: '租户',
     tenantManagement: '租户管理',
     tenantManagement: '租户管理',
     tenantSetting: '租户配置',
     tenantSetting: '租户配置',
-    tenantOEM: 'OEM定制',
+    tenantOEM: '平台定制',
     tenantRule: '租户角色',
     tenantRule: '租户角色',
   },
   },
   organization: {
   organization: {
@@ -34,20 +34,7 @@ export default {
     toolEditOrganization: '编辑组织',
     toolEditOrganization: '编辑组织',
     parentOrganization: '上级组织',
     parentOrganization: '上级组织',
   },
   },
-  dept: {
-    queryDeptName: '部门名称',
-    queryDeptStatus: '状态',
-    toolDeptList: '部门列表',
-    toolCreateDept: '新增部门',
-    toolEditDept: '编辑部门',
-    tableTitleDeptSort: '排序',
-    tableTitleDeptCreateTime: '创建时间',
-    tableTitleDeptOperation: '操作',
-    drawerTitleDeptEnable: '启用',
-    drawerTitleDeptDisable: '停用',
-    drawerTitleDeptParentDept: '上级部门',
-    tableTitleMemo: '备注',
-  },
+
   RuleEngine: {
   RuleEngine: {
     ruleEngine: '规则引擎',
     ruleEngine: '规则引擎',
     sceneLinkage: '场景联动',
     sceneLinkage: '场景联动',
@@ -62,7 +49,7 @@ export default {
     alarmManagement: '告警管理',
     alarmManagement: '告警管理',
     geographicPosition: '地理位置',
     geographicPosition: '地理位置',
     alarmContact: '告警联系人',
     alarmContact: '告警联系人',
-    alarmCenter: '告警中心',
+    alarmCenter: '告警记录',
   },
   },
   system: {
   system: {
     system: '系统管理',
     system: '系统管理',

@@ -78,7 +78,7 @@ const setting: ProjectConfig = {
   // Menu configuration
   // Menu configuration
   menuSetting: {
   menuSetting: {
     // sidebar menu bg color
     // sidebar menu bg color
-    bgColor: SIDE_BAR_BG_COLOR_LIST[0],
+    bgColor: SIDE_BAR_BG_COLOR_LIST[3],
     //  Whether to fix the left menu
     //  Whether to fix the left menu
     fixed: true,
     fixed: true,
     // Menu collapse
     // Menu collapse

@@ -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();