Merge remote-tracking branch 'origin/master'

doc/已更新脚本

@@ -1437,4 +1437,29 @@ INSERT INTO `sys_dictionary_item` VALUES ('1ecc5294-51f6-1111-4455-e63f7ac78005'
 -- 2024-7-24 数据大屏路由与权限
 INSERT INTO sys_function_code VALUES ('T011004', '数据大屏', 'T0110', 4);
 INSERT INTO `sys_menu` VALUES ('T011004', 4, '数据大屏', NULL, 'views/dataMap/dataScreenIndex', '/dataScreenIndex', 'T0110', NULL, 0, 1, 1, 'T011004', 1, NULL, 1);
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011004');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011004');
+
+
+-- 2024-8-1 数据大屏菜单调整
+INSERT INTO sys_function_code VALUES ('T0111', '数据可视化大屏', 'T01', 11);
+INSERT INTO sys_function_code VALUES ('T011101', '总体概括', 'T0111', 1);
+INSERT INTO sys_function_code VALUES ('T011102', '企业情况', 'T0111', 2);
+INSERT INTO sys_function_code VALUES ('T011103', '求职情况', 'T0111', 3);
+INSERT INTO sys_function_code VALUES ('T011104', '服务情况', 'T0111', 4);
+INSERT INTO `sys_menu` VALUES ('T0111', 11, '数据可视化大屏', 'FundFilled', NULL, '/dataScreen', 'T01', NULL, 0, 1, 0, 'T0111', 1, NULL, NULL);
+INSERT INTO `sys_menu` VALUES ('T011101', 1, '总体概括', NULL, 'views/dataScreen/html/index', '/dataScreen/dataScreenIndex', 'T0111', NULL, 0, 1, 1, 'T011101', 1, NULL, 1);
+INSERT INTO `sys_menu` VALUES ('T011102', 2, '企业情况', NULL, 'views/dataScreen/html/company', '/dataScreen/dataScreenCompany', 'T0111', NULL, 0, 1, 1, 'T011102', 1, NULL, 1);
+INSERT INTO `sys_menu` VALUES ('T011103', 3, '求职情况', NULL, 'views/dataScreen/html/jobUser', '/dataScreen/dataScreenJobUser', 'T0111', NULL, 0, 1, 1, 'T011103', 1, NULL, 1);
+INSERT INTO `sys_menu` VALUES ('T011104', 4, '服务情况', NULL, 'views/dataScreen/html/sysService', '/dataScreen/dataScreenSysService', 'T0111', NULL, 0, 1, 1, 'T011104', 1, NULL, 1);
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T0111');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011101');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011102');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011103');
+insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011104');
+# 修改地图菜单
+UPDATE sys_menu SET MenuName = '就业驿站数据地图' WHERE MenuNo = 'T0110';
+UPDATE sys_function_code SET FunctionName = '就业驿站数据地图' WHERE FunctionCode = 'T0110';
+# 删除数据大屏原菜单
+DELETE FROM sys_menu WHERE MenuNo = 'T011004';
+DELETE FROM sys_function_code WHERE FunctionCode = 'T011004';
+DELETE FROM sys_role_sys_function_code WHERE FunctionCode = 'T011004';

doc/待更新脚本.txt

@@ -1,24 +0,0 @@
-INSERT INTO sys_function_code VALUES ('T0111', '数据可视化大屏', 'T01', 11);
-INSERT INTO sys_function_code VALUES ('T011101', '总体概括', 'T0111', 1);
-INSERT INTO sys_function_code VALUES ('T011102', '企业情况', 'T0111', 2);
-INSERT INTO sys_function_code VALUES ('T011103', '求职情况', 'T0111', 3);
-INSERT INTO sys_function_code VALUES ('T011104', '服务情况', 'T0111', 4);
-INSERT INTO `sys_menu` VALUES ('T0111', 11, '数据可视化大屏', 'FundFilled', NULL, '/dataScreen', 'T01', NULL, 0, 1, 0, 'T0111', 1, NULL, NULL);
-INSERT INTO `sys_menu` VALUES ('T011101', 1, '总体概括', NULL, 'views/dataScreen/html/index', '/dataScreen/dataScreenIndex', 'T0111', NULL, 0, 1, 1, 'T011101', 1, NULL, 1);
-INSERT INTO `sys_menu` VALUES ('T011102', 2, '企业情况', NULL, 'views/dataScreen/html/company', '/dataScreen/dataScreenCompany', 'T0111', NULL, 0, 1, 1, 'T011102', 1, NULL, 1);
-INSERT INTO `sys_menu` VALUES ('T011103', 3, '求职情况', NULL, 'views/dataScreen/html/jobUser', '/dataScreen/dataScreenJobUser', 'T0111', NULL, 0, 1, 1, 'T011103', 1, NULL, 1);
-INSERT INTO `sys_menu` VALUES ('T011104', 4, '服务情况', NULL, 'views/dataScreen/html/sysService', '/dataScreen/dataScreenSysService', 'T0111', NULL, 0, 1, 1, 'T011104', 1, NULL, 1);
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T0111');
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011101');
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011102');
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011103');
-insert into sys_role_sys_function_code (`RoleID`, `FunctionCode`) values('20afde90-a81a-11ed-a6c5-7085c2a9999e','T011104');
-# 修改地图菜单
-UPDATE sys_menu SET MenuName = '就业驿站数据地图' WHERE MenuNo = 'T0110';
-UPDATE sys_function_code SET FunctionName = '就业驿站数据地图' WHERE FunctionCode = 'T0110';
-# 删除数据大屏原菜单
-DELETE FROM sys_menu WHERE MenuNo = 'T011004';
-DELETE FROM sys_function_code WHERE FunctionCode = 'T011004';
-DELETE FROM sys_role_sys_function_code WHERE FunctionCode = 'T011004';