Merge branch 'sqy_dev' into 'main'

feat:修改国际化

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

@@ -18,7 +18,7 @@ enum DeviceManagerApi {
 
 
   DEVICE_PROFILE_URL_ME = '/deviceProfile/me/list',
   DEVICE_PROFILE_URL_ME = '/deviceProfile/me/list',
 
 
-  DEVICE_ALARM_URL = '/alarm/DEVICE',
+  DEVICE_ALARM_URL = '/alarm',
 }
 }
 
 
 export const devicePage = (params: DeviceQueryParam) => {
 export const devicePage = (params: DeviceQueryParam) => {
@@ -97,16 +97,9 @@ export const getDeviceDetail = (id: string) => {
 };
 };
 
 
 // 查询设备详情中的告警
 // 查询设备详情中的告警
-export const getDeviceAlarm = (id: string, params?: DeviceProfileQueryParam) => {
-  return () => {
-    return defHttp.get(
-      {
-        url: DeviceManagerApi.DEVICE_ALARM_URL + `/${id}`,
-        params,
-      },
-      {
-        joinPrefix: false,
-      }
-    );
-  };
+export const getDeviceAlarm = (params?: DeviceProfileQueryParam) => {
+  return defHttp.get({
+    url: DeviceManagerApi.DEVICE_ALARM_URL,
+    params,
+  });
 };
 };

@@ -9,11 +9,25 @@ export default {
     sort: 'sort',
     sort: 'sort',
     status: 'status',
     status: 'status',
   },
   },
+  notice: {
+    webSiteNotice: 'web site notice',
+    noticeManagement: 'notice management',
+    myNotice: 'my notice',
+  },
+
+  device: {
+    deviceManagement: 'device management',
+    device: 'device',
+    deviceProfile: 'device profile',
+  },
   tenant: {
   tenant: {
     tenant: 'tenant',
     tenant: 'tenant',
     tenantManagement: 'tenant management',
     tenantManagement: 'tenant management',
-    tenantSetting: 'tenant setting',
+    tenantSetting: 'tenant config',
+    tenantOEM: 'OEM  customization',
+    tenantRule: 'tenant rule',
   },
   },
+
   organization: {
   organization: {
     queryOrganizationName: 'organization name',
     queryOrganizationName: 'organization name',
     toolOrganizationList: 'organization list',
     toolOrganizationList: 'organization list',
@@ -21,6 +35,22 @@ export default {
     toolEditOrganization: 'edit organization',
     toolEditOrganization: 'edit organization',
     parentOrganization: 'parent organization',
     parentOrganization: 'parent organization',
   },
   },
+  RuleEngine: {
+    ruleEngine: 'rule engine',
+    sceneLinkage: 'scene linkage',
+  },
+  message: {
+    messageManagement: 'message management',
+    messageConfig: 'message config',
+    messageTemplate: 'message template',
+    messageRecord: 'message record',
+  },
+  alarm: {
+    alarmManagement: 'alarm management',
+    geographicPosition: 'geographic position',
+    alarmContact: 'alarm contact',
+  },
+
   dept: {
   dept: {
     queryDeptName: 'dept name',
     queryDeptName: 'dept name',
     queryDeptStatus: 'status',
     queryDeptStatus: 'status',
@@ -41,6 +71,8 @@ export default {
     roleManagement: 'role management',
     roleManagement: 'role management',
     menuManagement: 'menu management',
     menuManagement: 'menu management',
     deptManagement: 'dept management',
     deptManagement: 'dept management',
+    organizationManagement: 'organization management',
+    dictManagement: 'dice management',
     modifyPassword: 'modify password',
     modifyPassword: 'modify password',
     pageSystemTitleCreateMenu: 'create menu',
     pageSystemTitleCreateMenu: 'create menu',
     pageSystemTitleCreateTenant: 'new tenant',
     pageSystemTitleCreateTenant: 'new tenant',

 export default {
 export default {
-  dashboard: 'Dashboard',
-  about: 'About',
-  workbench: 'Workbench',
-  analysis: 'Analysis',
+  dashboard: 'index',
+  workbench: 'index',
 };
 };

@@ -9,10 +9,23 @@ export default {
     sort: '排序',
     sort: '排序',
     status: '状态',
     status: '状态',
   },
   },
+  notice: {
+    webSiteNotice: '站内通知',
+    noticeManagement: '通知管理',
+    myNotice: '我的通知',
+  },
+  device: {
+    deviceManagement: '设备管理',
+    device: '设备',
+    deviceProfile: '设备配置',
+  },
+
   tenant: {
   tenant: {
     tenant: '租户',
     tenant: '租户',
     tenantManagement: '租户管理',
     tenantManagement: '租户管理',
-    tenantSetting: '租户设置',
+    tenantSetting: '租户配置',
+    tenantOEM: 'OEM定制',
+    tenantRule: '租户角色',
   },
   },
   organization: {
   organization: {
     queryOrganizationName: '组织名称',
     queryOrganizationName: '组织名称',
@@ -35,12 +48,28 @@ export default {
     drawerTitleDeptParentDept: '上级部门',
     drawerTitleDeptParentDept: '上级部门',
     tableTitleMemo: '备注',
     tableTitleMemo: '备注',
   },
   },
+  RuleEngine: {
+    ruleEngine: '规则引擎',
+    sceneLinkage: '场景联动',
+  },
+  message: {
+    messageManagement: '消息管理',
+    messageConfig: '消息配置',
+    messageTemplate: '消息模板',
+    messageRecord: '消息记录',
+  },
+  alarm: {
+    alarmManagement: '告警管理',
+    geographicPosition: '地理位置',
+    alarmContact: '告警联系人',
+  },
   system: {
   system: {
     system: '系统管理',
     system: '系统管理',
     accountManagement: '账号管理',
     accountManagement: '账号管理',
     roleManagement: '角色管理',
     roleManagement: '角色管理',
     menuManagement: '菜单管理',
     menuManagement: '菜单管理',
-    deptManagement: '部门管理',
+    organizationManagement: '组织管理',
+    dictManagement: '字典管理',
     modifyPassword: '修改密码',
     modifyPassword: '修改密码',
     pageSystemTitleCreateMenu: '新增菜单',
     pageSystemTitleCreateMenu: '新增菜单',
     pageSystemTitleCreateTenant: '新增租户',
     pageSystemTitleCreateTenant: '新增租户',

 export default {
 export default {
   dashboard: '首页',
   dashboard: '首页',
-  about: '关于',
   workbench: '首页',
   workbench: '首页',
-  analysis: '分析页',
 };
 };

@@ -75,19 +75,19 @@ export const alarmSearchSchemas: FormSchema[] = [
     field: 'icon',
     field: 'icon',
     label: '告警状态',
     label: '告警状态',
     component: 'Select',
     component: 'Select',
-    colProps: { span: 8 },
+    colProps: { span: 6 },
   },
   },
   {
   {
     field: 'icon',
     field: 'icon',
-    label: '      ',
-    component: 'DatePicker',
-    colProps: { span: 8 },
+    label: '告警类型',
+    component: 'Input',
+    colProps: { span: 6 },
   },
   },
   {
   {
     field: 'icon',
     field: 'icon',
-    label: '告警类型',
-    component: 'Input',
-    colProps: { span: 8 },
+    label: '      ',
+    component: 'DatePicker',
+    colProps: { span: 6 },
   },
   },
 ];
 ];
 export const alarmColumns: BasicColumn[] = [
 export const alarmColumns: BasicColumn[] = [

@@ -19,10 +19,7 @@
     },
     },
     setup(props) {
     setup(props) {
       const [registerTable] = useTable({
       const [registerTable] = useTable({
-        api: getDeviceAlarm(props.id, {
-          page: 0,
-          pageSize: 10,
-        }),
+        api: getDeviceAlarm,
         columns: alarmColumns,
         columns: alarmColumns,
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
@@ -32,7 +29,11 @@
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
+        beforeFetch: getDeviceId,
       });
       });
+      function getDeviceId(data) {
+        Reflect.set(data, 'deviceId', props.id);
+      }
 
 
       return {
       return {
         registerTable,
         registerTable,