Commit dc0a8c8b3fb25c8c1ab3a4fbe6b11b2ee3efd3cf

Authored by xp.Huang
2 parents 656b64d2 5945f8fe

Merge branch 'sqy_dev' into 'main'

'fix:修改主题色,调整页面菜单文件名称

See merge request huang/yun-teng-iot-front!137
Showing 53 changed files with 11 additions and 38 deletions
1 import { generate } from '@ant-design/colors'; 1 import { generate } from '@ant-design/colors';
2 2
3 -export const primaryColor = '#0960bd'; 3 +export const primaryColor = '#377DFF';
4 4
5 export const darkMode = 'light'; 5 export const darkMode = 'light';
6 6
@@ -10,21 +10,21 @@ export default { @@ -10,21 +10,21 @@ export default {
10 status: 'status', 10 status: 'status',
11 }, 11 },
12 notice: { 12 notice: {
13 - webSiteNotice: 'web site notice', 13 + webSiteNotice: 'platform notice',
14 noticeManagement: 'notice management', 14 noticeManagement: 'notice management',
15 myNotice: 'my notice', 15 myNotice: 'my notice',
16 }, 16 },
17 17
18 device: { 18 device: {
19 deviceManagement: 'device management', 19 deviceManagement: 'device management',
20 - device: 'device', 20 + device: 'device management',
21 deviceProfile: 'device profile', 21 deviceProfile: 'device profile',
22 }, 22 },
23 tenant: { 23 tenant: {
24 tenant: 'tenant', 24 tenant: 'tenant',
25 tenantManagement: 'tenant management', 25 tenantManagement: 'tenant management',
26 tenantSetting: 'tenant config', 26 tenantSetting: 'tenant config',
27 - tenantOEM: 'OEM customization', 27 + tenantOEM: 'platform customization',
28 tenantRule: 'tenant rule', 28 tenantRule: 'tenant rule',
29 }, 29 },
30 30
@@ -49,23 +49,9 @@ export default { @@ -49,23 +49,9 @@ export default {
49 alarmManagement: 'alarm management', 49 alarmManagement: 'alarm management',
50 geographicPosition: 'geographic position', 50 geographicPosition: 'geographic position',
51 alarmContact: 'alarm contact', 51 alarmContact: 'alarm contact',
52 - alarmCenter: 'alarm center', 52 + alarmCenter: 'alarm record',
53 }, 53 },
54 54
55 - dept: {  
56 - queryDeptName: 'dept name',  
57 - queryDeptStatus: 'status',  
58 - toolDeptList: 'dept list',  
59 - toolCreateDept: 'create dept',  
60 - toolEditDept: 'edit dept',  
61 - tableTitleDeptSort: 'sort',  
62 - tableTitleDeptCreateTime: 'create time',  
63 - tableTitleDeptOperation: 'operation',  
64 - drawerTitleDeptEnable: 'enable',  
65 - drawerTitleDeptDisable: 'disable',  
66 - drawerTitleDeptParentDept: 'parent dept',  
67 - tableTitleMemo: 'memo',  
68 - },  
69 system: { 55 system: {
70 system: 'system', 56 system: 'system',
71 accountManagement: 'account management', 57 accountManagement: 'account management',
@@ -10,13 +10,13 @@ export default { @@ -10,13 +10,13 @@ export default {
10 status: '状态', 10 status: '状态',
11 }, 11 },
12 notice: { 12 notice: {
13 - webSiteNotice: '站内通知', 13 + webSiteNotice: '平台通知',
14 noticeManagement: '通知管理', 14 noticeManagement: '通知管理',
15 myNotice: '我的通知', 15 myNotice: '我的通知',
16 }, 16 },
17 device: { 17 device: {
18 deviceManagement: '设备管理', 18 deviceManagement: '设备管理',
19 - device: '设备', 19 + device: '设备管理',
20 deviceProfile: '设备配置', 20 deviceProfile: '设备配置',
21 }, 21 },
22 22
@@ -24,7 +24,7 @@ export default { @@ -24,7 +24,7 @@ export default {
24 tenant: '租户', 24 tenant: '租户',
25 tenantManagement: '租户管理', 25 tenantManagement: '租户管理',
26 tenantSetting: '租户配置', 26 tenantSetting: '租户配置',
27 - tenantOEM: 'OEM定制', 27 + tenantOEM: '平台定制',
28 tenantRule: '租户角色', 28 tenantRule: '租户角色',
29 }, 29 },
30 organization: { 30 organization: {
@@ -34,20 +34,7 @@ export default { @@ -34,20 +34,7 @@ export default {
34 toolEditOrganization: '编辑组织', 34 toolEditOrganization: '编辑组织',
35 parentOrganization: '上级组织', 35 parentOrganization: '上级组织',
36 }, 36 },
37 - dept: {  
38 - queryDeptName: '部门名称',  
39 - queryDeptStatus: '状态',  
40 - toolDeptList: '部门列表',  
41 - toolCreateDept: '新增部门',  
42 - toolEditDept: '编辑部门',  
43 - tableTitleDeptSort: '排序',  
44 - tableTitleDeptCreateTime: '创建时间',  
45 - tableTitleDeptOperation: '操作',  
46 - drawerTitleDeptEnable: '启用',  
47 - drawerTitleDeptDisable: '停用',  
48 - drawerTitleDeptParentDept: '上级部门',  
49 - tableTitleMemo: '备注',  
50 - }, 37 +
51 RuleEngine: { 38 RuleEngine: {
52 ruleEngine: '规则引擎', 39 ruleEngine: '规则引擎',
53 sceneLinkage: '场景联动', 40 sceneLinkage: '场景联动',
@@ -62,7 +49,7 @@ export default { @@ -62,7 +49,7 @@ export default {
62 alarmManagement: '告警管理', 49 alarmManagement: '告警管理',
63 geographicPosition: '地理位置', 50 geographicPosition: '地理位置',
64 alarmContact: '告警联系人', 51 alarmContact: '告警联系人',
65 - alarmCenter: '告警中心', 52 + alarmCenter: '告警记录',
66 }, 53 },
67 system: { 54 system: {
68 system: '系统管理', 55 system: '系统管理',
@@ -78,7 +78,7 @@ const setting: ProjectConfig = { @@ -78,7 +78,7 @@ const setting: ProjectConfig = {
78 // Menu configuration 78 // Menu configuration
79 menuSetting: { 79 menuSetting: {
80 // sidebar menu bg color 80 // sidebar menu bg color
81 - bgColor: SIDE_BAR_BG_COLOR_LIST[0], 81 + bgColor: SIDE_BAR_BG_COLOR_LIST[3],
82 // Whether to fix the left menu 82 // Whether to fix the left menu
83 fixed: true, 83 fixed: true,
84 // Menu collapse 84 // Menu collapse
src/views/alarm/alarmLog/config/detail.config.ts renamed from src/views/alarm/center/config/detail.config.ts
src/views/alarm/alarmLog/cpns/AlarmDetailDrawer.vue renamed from src/views/alarm/center/cpns/AlarmDetailDrawer.vue
src/views/alarm/alarmLog/index.vue renamed from src/views/alarm/center/index.vue
src/views/alarm/contacts/ContactDrawer.vue renamed from src/views/alarm/template/ContactDrawer.vue
src/views/alarm/contacts/config.data.ts renamed from src/views/alarm/template/config.data.ts
src/views/alarm/contacts/index.vue renamed from src/views/alarm/template/index.vue
src/views/datamanager/regulationEngine/RuleEngineDrawer.vue renamed from src/views/ruleengine/regulationEngine/RuleEngineDrawer.vue
src/views/datamanager/regulationEngine/config.data.ts renamed from src/views/ruleengine/regulationEngine/config.data.ts
src/views/datamanager/regulationEngine/index.vue renamed from src/views/ruleengine/regulationEngine/index.vue
src/views/device/localtion/config.data.ts renamed from src/views/alarm/position/config.data.ts
src/views/device/localtion/index.vue renamed from src/views/alarm/position/index.vue
src/views/notice/myNotices/CatNoticeModal.vue renamed from src/views/stationnotification/mynotification/CatNoticeModal.vue
src/views/notice/myNotices/config.d.ts renamed from src/views/stationnotification/mynotification/config.d.ts
src/views/notice/myNotices/index.vue renamed from src/views/stationnotification/mynotification/index.vue
src/views/notice/notificationManager/config.d.ts renamed from src/views/stationnotification/notificationmanager/config.d.ts
src/views/notice/notificationManager/index.vue renamed from src/views/stationnotification/notificationmanager/index.vue
src/views/notice/notificationManager/useDrawer.vue renamed from src/views/stationnotification/notificationmanager/useDrawer.vue
src/views/notice/notificationManager/viewDetailDrawer.vue renamed from src/views/stationnotification/notificationmanager/viewDetailDrawer.vue
src/views/rule/dataFlow/addDataTransferDrawer.vue renamed from src/views/datamanager/datatransfer/addDataTransferDrawer.vue
src/views/rule/dataFlow/config.ts renamed from src/views/datamanager/datatransfer/config.ts
src/views/rule/dataFlow/cpns/config.ts renamed from src/views/datamanager/datatransfer/cpns/config.ts
src/views/rule/dataFlow/cpns/cpns/transferConfigApi.vue renamed from src/views/datamanager/datatransfer/cpns/cpns/transferConfigApi.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigKafka.vue renamed from src/views/datamanager/datatransfer/cpns/cpns/transferConfigKafka.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigMqtt.vue renamed from src/views/datamanager/datatransfer/cpns/cpns/transferConfigMqtt.vue
src/views/rule/dataFlow/cpns/cpns/transferConfigRabbitMq.vue renamed from src/views/datamanager/datatransfer/cpns/cpns/transferConfigRabbitMq.vue
src/views/rule/dataFlow/cpns/transferConfigMode.vue renamed from src/views/datamanager/datatransfer/cpns/transferConfigMode.vue
src/views/rule/dataFlow/cpns/transferConfigParams.vue renamed from src/views/datamanager/datatransfer/cpns/transferConfigParams.vue
src/views/rule/dataFlow/index.vue renamed from src/views/datamanager/datatransfer/index.vue
src/views/rule/linkedge/addForm/condition.vue renamed from src/views/ruleengine/scenelinkage/addForm/condition.vue
src/views/rule/linkedge/addForm/doaction.vue renamed from src/views/ruleengine/scenelinkage/addForm/doaction.vue
src/views/rule/linkedge/addForm/trigger.vue renamed from src/views/ruleengine/scenelinkage/addForm/trigger.vue
src/views/rule/linkedge/config.ts renamed from src/views/ruleengine/scenelinkage/config.ts
src/views/rule/linkedge/index.ts renamed from src/views/ruleengine/scenelinkage/index.ts
src/views/rule/linkedge/index.vue renamed from src/views/ruleengine/scenelinkage/index.vue
src/views/rule/linkedge/useDrawer.vue renamed from src/views/ruleengine/scenelinkage/useDrawer.vue
src/views/rule/script/config/config.data.ts renamed from src/views/device/transferScript/config/config.data.ts
src/views/rule/script/cpns/ScriptDrawer.vue renamed from src/views/device/transferScript/cpns/ScriptDrawer.vue
src/views/rule/script/cpns/TestScript.vue renamed from src/views/device/transferScript/cpns/TestScript.vue
src/views/rule/script/index.vue renamed from src/views/device/transferScript/index.vue
src/views/system/changePassword/index.vue renamed from src/views/system/password/index.vue
src/views/system/changePassword/pwd.data.ts renamed from src/views/system/password/pwd.data.ts
src/views/system/customize/config/AppDraw.config.ts renamed from src/views/tenant/platform/config/AppDraw.config.ts
src/views/system/customize/config/CVIDraw.config.ts renamed from src/views/tenant/platform/config/CVIDraw.config.ts
src/views/system/customize/config/enterPriseInfo.config.ts renamed from src/views/tenant/platform/config/enterPriseInfo.config.ts
src/views/system/customize/cpns/AppDraw.vue renamed from src/views/tenant/platform/cpns/AppDraw.vue
src/views/system/customize/cpns/CVIDraw.vue renamed from src/views/tenant/platform/cpns/CVIDraw.vue
src/views/system/customize/cpns/EnterpriseInfo.vue renamed from src/views/tenant/platform/cpns/EnterpriseInfo.vue
src/views/system/customize/index.vue renamed from src/views/tenant/platform/index.vue
src/views/system/customize/types/index.ts renamed from src/views/tenant/platform/types/index.ts