diff --git a/config/locales/sys_dict_data_en.csv b/config/locales/sys_dict_data_en.csv index 59fb8e7a..fec79a39 100644 --- a/config/locales/sys_dict_data_en.csv +++ b/config/locales/sys_dict_data_en.csv @@ -528,6 +528,6 @@ Note: Please pass the value of the parameter interva according to the time unit 4020,4020,job.genNeStateAlarmRemark,"Health status inspection of network elements, generating alarms in case of abnormalities.",i18n_en,,,1,supervisor,1.70E+12,,0, 4021,4021,menu.neUser.nssf,NSSF Subscription Info,i18n_en,,,1,supervisor,1.70E+12,,0, 4022,4022,menu.neUser.nssfAmf,NSSF Available AMFs,i18n_en,,,1,supervisor,1.70E+12,,0, -4023,4023,menu.monitor.topology,NE Management Topology,i18n_en,,,1,supervisor,1.70E+12,,0, +4023,4023,menu.monitor.topology,Topology Info,i18n_en,,,1,supervisor,1.70E+12,,0, 4024,4024,menu.monitor.topologyBuild,Topological Graph Build,i18n_en,,,1,supervisor,1.70E+12,,0, 4025,4025,log.operate.title.chartGraph,Topological Graph,i19n_en,,,2,supervisor,1.7E+12,,1, diff --git a/config/locales/sys_dict_data_zh.csv b/config/locales/sys_dict_data_zh.csv index 91b2c81f..50091e8d 100644 --- a/config/locales/sys_dict_data_zh.csv +++ b/config/locales/sys_dict_data_zh.csv @@ -305,7 +305,7 @@ dict_code,dict_sort,dict_label,dict_value,dict_type,tag_class,tag_type,status,cr 1658,1658,config..export.type,系统内置,i18n_zh,,,1,supervisor,1.70E+12,,0, 1659,1659,config..export.remark,参数说明,i18n_zh,,,1,supervisor,1.70E+12,,0, 1660,1660,config.sys.titleValue,AGrandEMS,i18n_zh,,,1,supervisor,1.70E+12,,0, -1661,1661,config.sys.copyrightValue,Copyright @2023 千通科技,i18n_zh,,,1,supervisor,1.70E+12,,0, +1661,1661,config.sys.copyrightValue,Copyright ©2023 千通科技,i18n_zh,,,1,supervisor,1.70E+12,,0, 1662,1662,config.noData,没有可访问参数配置数据！,i18n_zh,,,1,supervisor,1.70E+12,,0, 1663,1663,config.errKey,无效 key,i18n_zh,,,1,supervisor,1.70E+12,,0, 1664,1664,config.errValueEq,变更状态与旧值相等！,i18n_zh,,,1,supervisor,1.70E+12,,0, @@ -528,6 +528,6 @@ interval单位分钟，平均分钟资源情况 2020,2020,job.genNeStateAlarmRemark,"网元健康状态巡检,异常时产生告警",i18n_zh,,,1,supervisor,1.70E+12,,0, 2021,2021,menu.neUser.nssf,NSSF在线订阅数,i18n_zh,,,1,supervisor,1.70E+12,,0, 2022,2022,menu.neUser.nssfAmf,NSSF可用的注册AMF,i18n_zh,,,1,supervisor,1.70E+12,,0, -2023,2023,menu.monitor.topology,网元管理拓扑,i18n_zh,,,1,supervisor,1.70E+12,,0, +2023,2023,menu.monitor.topology,拓扑信息,i18n_zh,,,1,supervisor,1.70E+12,,0, 2024,2024,menu.monitor.topologyBuild,拓扑图组编辑,i18n_zh,,,1,supervisor,1.70E+12,,0, 2025,2025,log.operate.title.chartGraph,拓扑图组,i18n_zh,,,1,supervisor,1.7E+12,,0, diff --git a/config/locales/sys_menu.csv b/config/locales/sys_menu.csv index 780eab67..c845f9f0 100644 --- a/config/locales/sys_menu.csv +++ b/config/locales/sys_menu.csv @@ -171,7 +171,7 @@ menu_id,menu_name,parent_id,menu_sort,path,component,is_frame,is_cache,menu_type 2095,menu.log.set,2089,15,logSet,logManage/logSet/index,1,0,M,1,1,logManage:logSet:index,icon-you,supervisor,1.70E+12,,0,menu.log.setRemark 2096,menu.monitor.sessionUser,2,10,session,monitor/session/index,1,0,M,0,0,monitor:session:index,icon-gerenzhanghu,supervisor,1.70E+12,,0,menu.monitor.sessionUserRemark 2097,menu.fault.history,2087,2,history-alarm,faultManage/history-alarm/index,1,1,M,1,1,faultManage/history-alarm/index,icon-huizhiguize,supervisor,1.70E+12,,0,menu.fault.historyRemark -2098,menu.fault.set,2087,3,fault-setting,faultManage/fault-setting/index,1,0,M,1,1,faultManage/fault-setting/index,icon-gonggaodayi,supervisor,1.70E+12,,0,menu.fault.setRemark +2098,menu.fault.set,2087,100,fault-setting,faultManage/fault-setting/index,1,0,M,1,1,faultManage/fault-setting/index,icon-gonggaodayi,supervisor,1.70E+12,,0,menu.fault.setRemark 2099,menu.perf,0,5,perfManage,,1,0,D,1,1,,icon-soutubiao,supervisor,1.70E+12,,0,menu.perfRemark 2100,menu.perf.task,2099,1,taskManage,perfManage/taskManage/index,1,1,M,1,1,perfManage:taskManage:index,icon-wofaqi,supervisor,1.70E+12,,0,menu.perf.taskRemark 2101,menu.perf.data,2099,2,perfData,perfManage/perfData/index,1,1,M,1,1,perfManage:perfData:index,icon-soutubiao,supervisor,1.70E+12,,0,menu.perf.dataRemark diff --git a/database/upgrade/upg_chart_graph.sql b/database/upgrade/upg_chart_graph.sql index 2f550431..4084397b 100644 --- a/database/upgrade/upg_chart_graph.sql +++ b/database/upgrade/upg_chart_graph.sql @@ -3,29 +3,29 @@ SET FOREIGN_KEY_CHECKS=0; CREATE TABLE IF NOT EXISTS `omc_db`.`chart_graph` ( `row_id` bigint NOT NULL AUTO_INCREMENT COMMENT '记录ID', `row_type` enum('node','edge','combo') NOT NULL COMMENT '记录类型', - `row_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '记录组名', - `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '元素ID', - `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node/combo 类型', + `row_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '记录组名', + `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '元素ID', + `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node/combo 类型', `depth` int DEFAULT '0' COMMENT 'node/combo 深度', `x` float DEFAULT '0' COMMENT 'node/combo 横向坐标', `y` float DEFAULT '0' COMMENT 'node/combo 纵向坐标', - `size` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '30' COMMENT 'node/combo 大小-JSON数组', - `icon` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-部分类型支持图标JSON配置', - `img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-img 图片', - `clip_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-img 图片裁剪JSON配置', - `direction` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-triangle 三角形的方向', - `source` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'edge-边起始', - `target` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'edge-边目标', - `combo_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-分组', - `padding` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '30' COMMENT 'combo-JSON分组内边距', - `parent_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-父级分组', - `children` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-JSON分组内含元素', - `style` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '元素样式-JONS配置', - `label` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '标签文本', - `label_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '标签文本-JSON配置', + `size` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '30' COMMENT 'node/combo 大小-JSON数组', + `icon` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-部分类型支持图标JSON配置', + `img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-img 图片', + `clip_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-img 图片裁剪JSON配置', + `direction` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-triangle 三角形的方向', + `source` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'edge-边起始', + `target` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'edge-边目标', + `combo_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-分组', + `padding` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '30' COMMENT 'combo-JSON分组内边距', + `parent_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-父级分组', + `children` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-JSON分组内含元素', + `style` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '元素样式-JONS配置', + `label` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标签文本', + `label_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标签文本-JSON配置', PRIMARY KEY (`row_id`), KEY `idx_group` (`row_group`) USING BTREE COMMENT '组' -) ENGINE=InnoDB AUTO_INCREMENT=456 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='图表-G6关系图数据'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT='图表-G6关系图数据'; -- 新增初始图 diff --git a/database/upgrade/upg_sys_config.sql b/database/upgrade/upg_sys_config.sql index 2eddd6b3..10018358 100644 --- a/database/upgrade/upg_sys_config.sql +++ b/database/upgrade/upg_sys_config.sql @@ -4,7 +4,6 @@ SET FOREIGN_KEY_CHECKS=0; ALTER TABLE `omc_db`.`sys_config` MODIFY COLUMN `config_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '参数键值' AFTER `config_key`; - REPLACE INTO `omc_db`.`sys_config` ( `config_id`, diff --git a/database/upgrade/upg_sys_role_menu.sql b/database/upgrade/upg_sys_role_menu.sql index cc81c505..0459ec03 100644 --- a/database/upgrade/upg_sys_role_menu.sql +++ b/database/upgrade/upg_sys_role_menu.sql @@ -1040,4 +1040,8 @@ INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2123); +INSERT INTO + `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) +VALUES (2, 2126); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/database/upgvue3/upg_chart_graph.sql b/database/upgvue3/upg_chart_graph.sql index 2f550431..4084397b 100644 --- a/database/upgvue3/upg_chart_graph.sql +++ b/database/upgvue3/upg_chart_graph.sql @@ -3,29 +3,29 @@ SET FOREIGN_KEY_CHECKS=0; CREATE TABLE IF NOT EXISTS `omc_db`.`chart_graph` ( `row_id` bigint NOT NULL AUTO_INCREMENT COMMENT '记录ID', `row_type` enum('node','edge','combo') NOT NULL COMMENT '记录类型', - `row_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '记录组名', - `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '元素ID', - `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node/combo 类型', + `row_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '记录组名', + `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '元素ID', + `type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node/combo 类型', `depth` int DEFAULT '0' COMMENT 'node/combo 深度', `x` float DEFAULT '0' COMMENT 'node/combo 横向坐标', `y` float DEFAULT '0' COMMENT 'node/combo 纵向坐标', - `size` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '30' COMMENT 'node/combo 大小-JSON数组', - `icon` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-部分类型支持图标JSON配置', - `img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-img 图片', - `clip_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-img 图片裁剪JSON配置', - `direction` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'node-triangle 三角形的方向', - `source` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'edge-边起始', - `target` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'edge-边目标', - `combo_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-分组', - `padding` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '30' COMMENT 'combo-JSON分组内边距', - `parent_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-父级分组', - `children` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'combo-JSON分组内含元素', - `style` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '元素样式-JONS配置', - `label` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '标签文本', - `label_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '标签文本-JSON配置', + `size` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '30' COMMENT 'node/combo 大小-JSON数组', + `icon` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-部分类型支持图标JSON配置', + `img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-img 图片', + `clip_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-img 图片裁剪JSON配置', + `direction` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'node-triangle 三角形的方向', + `source` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'edge-边起始', + `target` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'edge-边目标', + `combo_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-分组', + `padding` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '30' COMMENT 'combo-JSON分组内边距', + `parent_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-父级分组', + `children` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'combo-JSON分组内含元素', + `style` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '元素样式-JONS配置', + `label` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标签文本', + `label_cfg` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标签文本-JSON配置', PRIMARY KEY (`row_id`), KEY `idx_group` (`row_group`) USING BTREE COMMENT '组' -) ENGINE=InnoDB AUTO_INCREMENT=456 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='图表-G6关系图数据'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT='图表-G6关系图数据'; -- 新增初始图 diff --git a/database/upgvue3/upg_sys_role_menu.sql b/database/upgvue3/upg_sys_role_menu.sql index cc81c505..0459ec03 100644 --- a/database/upgvue3/upg_sys_role_menu.sql +++ b/database/upgvue3/upg_sys_role_menu.sql @@ -1040,4 +1040,8 @@ INSERT IGNORE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2123); +INSERT INTO + `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) +VALUES (2, 2126); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/tools/misc/tables_ic.lst b/tools/misc/tables_ic.lst index 052772a5..4c3c7642 100644 --- a/tools/misc/tables_ic.lst +++ b/tools/misc/tables_ic.lst @@ -9,4 +9,5 @@ sys_role_menu sys_user sys_user_post sys_user_role +chart_graph #end \ No newline at end of file