Merge remote-tracking branch 'origin/master'

zkqy-admin/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -0,0 +1,1127 @@
+[
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 100,
+        "menuName": "用户管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 1,
+        "path": "user",
+        "component": "system/user/index",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:list",
+        "icon": "user",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 101,
+        "menuName": "角色管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 2,
+        "path": "role",
+        "component": "system/role/index",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:list",
+        "icon": "peoples",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 102,
+        "menuName": "菜单管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 3,
+        "path": "menu",
+        "component": "system/menu/index",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:menu:list",
+        "icon": "tree-table",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 103,
+        "menuName": "部门管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 4,
+        "path": "dept",
+        "component": "system/dept/index",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:dept:list",
+        "icon": "tree",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 104,
+        "menuName": "岗位管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 5,
+        "path": "post",
+        "component": "system/post/index",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:list",
+        "icon": "post",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1000,
+        "menuName": "用户查询",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 1,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:query",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1001,
+        "menuName": "用户新增",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 2,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:add",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1002,
+        "menuName": "用户修改",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 3,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:edit",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1003,
+        "menuName": "用户删除",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 4,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:remove",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1004,
+        "menuName": "用户导出",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 5,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:export",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1005,
+        "menuName": "用户导入",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 6,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:import",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1006,
+        "menuName": "重置密码",
+        "parentName": null,
+        "parentId": 100,
+        "orderNum": 7,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:resetPwd",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1007,
+        "menuName": "角色查询",
+        "parentName": null,
+        "parentId": 101,
+        "orderNum": 1,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:query",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1008,
+        "menuName": "角色新增",
+        "parentName": null,
+        "parentId": 101,
+        "orderNum": 2,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:add",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1009,
+        "menuName": "角色修改",
+        "parentName": null,
+        "parentId": 101,
+        "orderNum": 3,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:edit",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1010,
+        "menuName": "角色删除",
+        "parentName": null,
+        "parentId": 101,
+        "orderNum": 4,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:remove",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1011,
+        "menuName": "角色导出",
+        "parentName": null,
+        "parentId": 101,
+        "orderNum": 5,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:role:export",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1016,
+        "menuName": "部门查询",
+        "parentName": null,
+        "parentId": 103,
+        "orderNum": 1,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:dept:query",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1017,
+        "menuName": "部门新增",
+        "parentName": null,
+        "parentId": 103,
+        "orderNum": 2,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:dept:add",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1018,
+        "menuName": "部门修改",
+        "parentName": null,
+        "parentId": 103,
+        "orderNum": 3,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:dept:edit",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1019,
+        "menuName": "部门删除",
+        "parentName": null,
+        "parentId": 103,
+        "orderNum": 4,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:dept:remove",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1020,
+        "menuName": "岗位查询",
+        "parentName": null,
+        "parentId": 104,
+        "orderNum": 1,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:query",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1021,
+        "menuName": "岗位新增",
+        "parentName": null,
+        "parentId": 104,
+        "orderNum": 2,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:add",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1022,
+        "menuName": "岗位修改",
+        "parentName": null,
+        "parentId": 104,
+        "orderNum": 3,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:edit",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1023,
+        "menuName": "岗位删除",
+        "parentName": null,
+        "parentId": 104,
+        "orderNum": 4,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:remove",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-05-25 16:54:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1024,
+        "menuName": "岗位导出",
+        "parentName": null,
+        "parentId": 104,
+        "orderNum": 5,
+        "path": "",
+        "component": "",
+        "query": "",
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "F",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:post:export",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-06-16 14:31:40",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1073,
+        "menuName": "数据引擎",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 3,
+        "path": "data",
+        "component": null,
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "M",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "drag",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-06-16 14:58:41",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1078,
+        "menuName": "数据表",
+        "parentName": null,
+        "parentId": 1073,
+        "orderNum": 1,
+        "path": "createTable",
+        "component": "tool/datasheet/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "",
+        "icon": "documentation",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-06-19 13:39:54",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1082,
+        "menuName": "流程引擎",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 4,
+        "path": "processModeling",
+        "component": null,
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "M",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "cascader",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-06-19 13:40:44",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1083,
+        "menuName": "流程建模",
+        "parentName": null,
+        "parentId": 1082,
+        "orderNum": 2,
+        "path": "bpmnPro",
+        "component": "system/bpmnPro/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "",
+        "icon": "component",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-06-19 15:35:07",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1084,
+        "menuName": "数据建模",
+        "parentName": null,
+        "parentId": 1073,
+        "orderNum": 2,
+        "path": "datamodeling",
+        "component": "dataEngine/datamodeling/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "form",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-07-07 14:04:16",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1103,
+        "menuName": "表单引擎",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 5,
+        "path": "system/fromModel/index",
+        "component": null,
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "M",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "form",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-07-07 14:05:32",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1104,
+        "menuName": "表单建模",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 1,
+        "path": "formBuild",
+        "component": "system/fromModel/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "system:fromModeling:index",
+        "icon": "druid",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-07-12 09:46:30",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1106,
+        "menuName": "表单列表",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 2,
+        "path": "dragform",
+        "component": "dragform/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "clipboard",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-07-17 10:28:35",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1107,
+        "menuName": "表格列表",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 3,
+        "path": "tablelist",
+        "component": "dragform/tableList",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "education",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-08-08 17:38:07",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1109,
+        "menuName": "字典管理",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 6,
+        "path": "tenantDict",
+        "component": "system/tenant/dict/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:tenantDict:list",
+        "icon": "dict",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-09-11 17:26:08",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 1172,
+        "menuName": "表格编辑",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 1,
+        "path": "tableMange",
+        "component": "tableMange/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "",
+        "icon": "bug",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 2811,
+        "menuName": "流程设计",
+        "parentName": null,
+        "parentId": 1082,
+        "orderNum": 1,
+        "path": "process",
+        "component": "bpmprocess/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "job",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 3811,
+        "menuName": "联动表格",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 5,
+        "path": "relateTable",
+        "component": "relateTable/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-call-activity",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 3806,
+        "menuName": "动态表格",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 6,
+        "path": "relateTableEdit",
+        "component": "relateTable/relateTableEdit",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "1",
+        "status": "0",
+        "perms": "",
+        "icon": "#",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 3989,
+        "menuName": "操作按钮",
+        "parentName": null,
+        "parentId": 1103,
+        "orderNum": 1,
+        "path": "excuteBtnMange/index",
+        "component": "system/excuteBtnMange/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "button",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4216,
+        "menuName": "管道管理",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 2,
+        "path": "processMange",
+        "component": null,
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "M",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-end-event-error",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4218,
+        "menuName": "管道流程",
+        "parentName": null,
+        "parentId": 4216,
+        "orderNum": 1,
+        "path": "asd",
+        "component": "bussiness/processMange",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-intermediate-event-throw-link",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4219,
+        "menuName": "管道展示",
+        "parentName": null,
+        "parentId": 4216,
+        "orderNum": 2,
+        "path": "progressShow",
+        "component": "bussiness/progressShow",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-end-event-signal",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-08-08 17:38:07",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 5008,
+        "menuName": "工程部署",
+        "parentName": null,
+        "parentId": 1,
+        "orderNum": 7,
+        "path": "engineering",
+        "component": "system/engineeringManage/index",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "system:user:engineering",
+        "icon": "download",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    }
+]

zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysUser.java

@@ -132,7 +132,7 @@ public class SysUser extends BaseEntity
 
     public boolean isTenantAdmin() {
         // 租户管理员的账号类型是01
-        System.err.println("当前用户类型："+("01".equals(this.userType) && this.tenantId != null));
+//        System.err.println("当前用户类型："+("01".equals(this.userType) && this.tenantId != null));
         return "01".equals(this.userType) && this.tenantId != null;
     }
 

zkqy-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -77,8 +77,8 @@
 		from sys_menu m
 				 left join sys_tenant_menu tm on tm.menu_id = m.menu_id
 		where tm.tenant_id = #{tenantId}
-		  and m.menu_name not in ('数据引擎','流程引擎','表单引擎','门户引擎')
-		  and parent_id not in (select menu_id from  sys_menu where menu_name in ("数据引擎","流程引擎","表单引擎","门户引擎"))
+		  and m.menu_name not in ('数据引擎','流程引擎','表单引擎')
+		  and parent_id not in (select menu_id from  sys_menu where menu_name in ("数据引擎","流程引擎","表单引擎"))
 		order by parent_id, order_num
 
 	</select>
@@ -112,7 +112,7 @@
 		where m.menu_type in ('M', 'C')
 		  and m.status = 0
 		  and tm.tenant_id = #{tenantId}
-		  and m.menu_name in ('数据引擎', '流程引擎', '表单引擎','门户引擎')
+		  and m.menu_name in ('数据引擎', '流程引擎', '表单引擎')
 
 
 		UNION
@@ -141,7 +141,7 @@
 		  and tm.tenant_id = #{tenantId}
 		  and m.parent_id in (select menu_id
 							  from sys_menu
-							  where menu_name in ("数据引擎", "流程引擎", "表单引擎","门户引擎"))
+							  where menu_name in ("数据引擎", "流程引擎", "表单引擎"))
 
 	</select>
 

zkqy-ui/.env.production

@@ -6,3 +6,10 @@ ENV = 'production'
 
 #管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
+
+#数据擎模块IP
+VUE_APP_BASE_API2 = 'http://62.234.61.92:8099/'
+#表单引擎模块IP
+VUE_APP_BASE_API3 = 'http://62.234.61.92:8088/'
+#流程引擎模块IP
+VUE_APP_BASE_API4 = 'http://62.234.61.92:8055/'

zkqy-ui/babel.config.js

@@ -10,7 +10,4 @@ module.exports = {
       'plugins': ['dynamic-import-node']
     }
   },
-  plugins: [
-    ["@babel/plugin-proposal-optional-chaining"]  //解析 可选链式语法
-  ]
 }

zkqy-ui/package.json

@@ -52,6 +52,7 @@
     "bpmn-js-token-simulation": "^0.27.0",
     "bpmn-moddle": "^6.0.0",
     "bpmnlint": "^7.8.0",
+    "bpmnlint-utils": "^1.1.1",
     "camunda-bpmn-moddle": "^7.0.1",
     "circular-json": "^0.5.9",
     "clipboard": "^2.0.8",

zkqy-ui/src/components/updateModule/bpmn-js/lib/features/context-pad/ContextPadProvider.js

@@ -31,10 +31,10 @@ import {
  * A provider for BPMN 2.0 elements context pad
  */
 export default function ContextPadProvider(
-    config, injector, eventBus,
-    contextPad, modeling, elementFactory,
-    connect, create, popupMenu,
-    canvas, rules, translate) {
+  config, injector, eventBus,
+  contextPad, modeling, elementFactory,
+  connect, create, popupMenu,
+  canvas, rules, translate) {
 
   config = config || {};
 
@@ -56,9 +56,9 @@ export default function ContextPadProvider(
     this._autoPlace = injector.get('autoPlace', false);
   }
 
-  eventBus.on('create.end', 250, function(event) {
+  eventBus.on('create.end', 250, function (event) {
     var context = event.context,
-        shape = context.shape;
+      shape = context.shape;
 
     if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
       return;
@@ -87,7 +87,7 @@ ContextPadProvider.$inject = [
   'translate'
 ];
 
-ContextPadProvider.prototype.getMultiElementContextPadEntries = function(elements) {
+ContextPadProvider.prototype.getMultiElementContextPadEntries = function (elements) {
   var modeling = this._modeling;
 
   var actions = {};
@@ -99,7 +99,7 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
         className: 'bpmn-icon-trash',
         title: this._translate('Remove'),
         action: {
-          click: function(event, elements) {
+          click: function (event, elements) {
             modeling.removeElements(elements.slice());
           }
         }
@@ -114,14 +114,14 @@ ContextPadProvider.prototype.getMultiElementContextPadEntries = function(element
  * @param {djs.model.Base[]} elements
  * @return {boolean}
  */
-ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
+ContextPadProvider.prototype._isDeleteAllowed = function (elements) {
 
   var baseAllowed = this._rules.allowed('elements.delete', {
     elements: elements
   });
 
   if (isArray(baseAllowed)) {
-    return every(baseAllowed, function(element) {
+    return every(baseAllowed, function (element) {
       return includes(baseAllowed, element);
     });
   }
@@ -129,18 +129,18 @@ ContextPadProvider.prototype._isDeleteAllowed = function(elements) {
   return baseAllowed;
 };
 
-ContextPadProvider.prototype.getContextPadEntries = function(element) {
+ContextPadProvider.prototype.getContextPadEntries = function (element) {
   var contextPad = this._contextPad,
-      modeling = this._modeling,
+    modeling = this._modeling,
 
-      elementFactory = this._elementFactory,
-      connect = this._connect,
-      create = this._create,
-      popupMenu = this._popupMenu,
-      canvas = this._canvas,
-      rules = this._rules,
-      autoPlace = this._autoPlace,
-      translate = this._translate;
+    elementFactory = this._elementFactory,
+    connect = this._connect,
+    create = this._create,
+    popupMenu = this._popupMenu,
+    canvas = this._canvas,
+    rules = this._rules,
+    autoPlace = this._autoPlace,
+    translate = this._translate;
 
   var actions = {};
 
@@ -155,7 +155,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   function removeElement(e, element) {
-    modeling.removeElements([ element ]);
+    modeling.removeElements([element]);
   }
 
   function getReplaceMenuPosition(element) {
@@ -163,10 +163,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     var Y_OFFSET = 5;
 
     var diagramContainer = canvas.getContainer(),
-        pad = contextPad.getPad(element).html;
+      pad = contextPad.getPad(element).html;
 
     var diagramRect = diagramContainer.getBoundingClientRect(),
-        padRect = pad.getBoundingClientRect();
+      padRect = pad.getBoundingClientRect();
 
     var top = padRect.top - diagramRect.top;
     var left = padRect.left - diagramRect.left;
@@ -206,7 +206,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     }
 
 
-    var append = autoPlace ? function(event, element) {
+    var append = autoPlace ? function (event, element) {
       var shape = elementFactory.createShape(assign({ type: type }, options));
 
       autoPlace.append(element, shape);
@@ -226,7 +226,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 
   function splitLaneHandler(count) {
 
-    return function(event, element) {
+    return function (event, element) {
 
       // actual split
       modeling.splitLane(element, count);
@@ -238,7 +238,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
 
-  if (isAny(businessObject, [ 'bpmn:Lane', 'bpmn:Participant' ]) && isExpanded(element)) {
+  if (isAny(businessObject, ['bpmn:Lane', 'bpmn:Participant']) && isExpanded(element)) {
 
     var childLanes = getChildLanes(element);
 
@@ -248,7 +248,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-above',
         title: translate('Add Lane above'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'top');
           }
         }
@@ -290,7 +290,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-lane-insert-below',
         title: translate('Add Lane below'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
             modeling.addLane(element, 'bottom');
           }
         }
@@ -336,10 +336,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
       });
     } else
 
-    if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
+      if (isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')) {
 
-      assign(actions, {
-        'append.compensation-activity':
+        assign(actions, {
+          'append.compensation-activity':
             appendAction(
               'bpmn:Task',
               'bpmn-icon-task',
@@ -348,37 +348,37 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
                 isForCompensation: true
               }
             )
-      });
-    } else
-
-    if (!is(businessObject, 'bpmn:EndEvent') &&
-        !businessObject.isForCompensation &&
-        !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
-        !isEventSubProcess(businessObject)) {
-
-      assign(actions, {
-        'append.end-event': appendAction(
-          'bpmn:EndEvent',
-          'bpmn-icon-end-event-none',
-          translate('Append EndEvent')
-        ),
-        'append.gateway': appendAction(
-          'bpmn:ExclusiveGateway',
-          'bpmn-icon-gateway-none',
-          translate('Append Gateway')
-        ),
-        'append.append-task': appendAction(
-          'bpmn:Task',
-          'bpmn-icon-task',
-          translate('Append Task')
-        ),
-        'append.intermediate-event': appendAction(
-          'bpmn:IntermediateThrowEvent',
-          'bpmn-icon-intermediate-event-none',
-          translate('Append Intermediate/Boundary Event')
-        )
-      });
-    }
+        });
+      } else
+
+        if (!is(businessObject, 'bpmn:EndEvent') &&
+          !businessObject.isForCompensation &&
+          !isEventType(businessObject, 'bpmn:IntermediateThrowEvent', 'bpmn:LinkEventDefinition') &&
+          !isEventSubProcess(businessObject)) {
+
+          assign(actions, {
+            'append.end-event': appendAction(
+              'bpmn:EndEvent',
+              'bpmn-icon-end-event-none',
+              translate('Append EndEvent')
+            ),
+            // 'append.gateway': appendAction(
+            //   'bpmn:ExclusiveGateway',
+            //   'bpmn-icon-gateway-none',
+            //   translate('Append Gateway')
+            // ),
+            // 'append.append-task': appendAction(
+            //   'bpmn:Task',
+            //   'bpmn-icon-task',
+            //   translate('Append Task')
+            // ),
+            // 'append.intermediate-event': appendAction(
+            //   'bpmn:IntermediateThrowEvent',
+            //   'bpmn-icon-intermediate-event-none',
+            //   translate('Append Intermediate/Boundary Event')
+            // )
+          });
+        }
   }
 
   if (!popupMenu.isEmpty(element, 'bpmn-replace')) {
@@ -390,7 +390,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-screw-wrench',
         title: translate('Change type'),
         action: {
-          click: function(event, element) {
+          click: function (event, element) {
 
             var position = assign(getReplaceMenuPosition(element), {
               cursor: { x: event.x, y: event.y }
@@ -431,10 +431,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
         className: 'bpmn-icon-connection-multi',
         title: translate(
           'Connect using ' +
-            (businessObject.isForCompensation
-              ? ''
-              : 'Sequence/MessageFlow or ') +
-            'Association'
+          (businessObject.isForCompensation
+            ? ''
+            : 'Sequence/MessageFlow or ') +
+          'Association'
         ),
         action: {
           click: startConnect,
@@ -458,7 +458,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
     });
   }
 
-  if (isAny(businessObject, [ 'bpmn:DataObjectReference', 'bpmn:DataStoreReference' ])) {
+  if (isAny(businessObject, ['bpmn:DataObjectReference', 'bpmn:DataStoreReference'])) {
     assign(actions, {
       'connect': {
         group: 'connect',
@@ -479,7 +479,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
   }
 
   // delete element entry, only show if allowed by rules
-  var deleteAllowed = rules.allowed('elements.delete', { elements: [ element ] });
+  var deleteAllowed = rules.allowed('elements.delete', { elements: [element] });
 
   if (isArray(deleteAllowed)) {
 
@@ -512,7 +512,7 @@ function isEventType(eventBo, type, definition) {
   var isDefinition = false;
 
   var definitions = eventBo.eventDefinitions || [];
-  forEach(definitions, function(def) {
+  forEach(definitions, function (def) {
     if (def.$type === definition) {
       isDefinition = true;
     }

zkqy-ui/src/main.js

@@ -2,16 +2,22 @@ import Vue from 'vue'
 import { useAntd } from 'k-form-design/packages/core/useComponents'
 import KFormDesign from 'k-form-design/packages/use.js'
 import 'k-form-design/lib/k-form-design.css'
+// require('k-form-design/lib/k-form-design.css')
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
+// require('./assets/styles/element-variables.scss')
 
 // 以下为bpmn工作流绘图工具的样式
 import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+// require('bpmn-js/dist/assets/diagram-js.css')  // 左边工具栏以及编辑节点的样式
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
 // import 'bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css'
 // 左边工具栏以及编辑节点的样式
 // import 'bpmn-js-properties-panel/dist/assets/properties-panel.css'
@@ -20,6 +26,7 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
 // bpmnPro start
 import { vuePlugin } from "@packages/highlight";
 import "highlight.js/styles/atom-one-dark-reasonable.css";
+// require("highlight.js/styles/atom-one-dark-reasonable.css");
 Vue.use(vuePlugin);
 
 import Common from "@packages/common";
@@ -29,12 +36,15 @@ import ResetPopover from "@utils/resetPopover";
 Vue.directive("r-popover", ResetPopover);
 
 import "@packages/theme/index.scss";
+// require("@packages/theme/index.scss");
 
 // bpmnPro end
 
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/zkqy.scss' // zkqy css
+// require('@/assets/styles/index.scss')  // global css
+// require('@/assets/styles/zkqy.scss')  // zkqy css
 import App from './App'
 import store from './store'
 
@@ -45,6 +55,8 @@ import { download } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
+// require('./assets/icons')  // icon
+// require('./permission')  // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/zkqy";

zkqy-ui/src/router/index.js

@@ -191,8 +191,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/data/index'),
-        component: (resolve) => require(['@/views/system/data/index'], resolve),
+        component: () => import('@/views/system/data/index'),
+        // component: (resolve) => require(['@/views/system/data/index'], resolve),
         name: 'AuthRole',
         meta: { title: '数据源配置', activeMenu: '/system/data' }
       }
@@ -206,8 +206,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/user/authRole'),
-        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+        component: () => import('@/views/system/user/authRole'),
+        // component: (resolve) => require(['@/views/system/user/authRole'], resolve),
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user' }
       }
@@ -221,8 +221,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'fromModel/:index',
-        // component: () => import('@/views/system/fromModel/index'),
-        component: (resolve) => require(['@/views/system/fromModel/index'], require),
+        component: () => import('@/views/system/fromModel/index'),
+        // component: (resolve) => require(['@/views/system/fromModel/index'], resolve),
         name: 'fromModel',
         meta: { title: '表单建模', activeMenu: '/system/fromModel/index' }
       },
@@ -243,8 +243,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'user/:roleId(\\d+)',
-        // component: () => import('@/views/system/role/authUser'),
-        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+        component: () => import('@/views/system/role/authUser'),
+        // component: (resolve) => require(['@/views/system/role/authUser'], resolve),
         name: 'AuthUser',
         meta: { title: '分配用户', activeMenu: '/system/role' }
       }
@@ -258,8 +258,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/dict/data'),
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        component: () => import('@/views/system/dict/data'),
+        // component: (resolve) => require(['@/views/system/dict/data'], resolve),
         name: 'Data',
         meta: { title: '字典数据', activeMenu: '/system/dict' }
       }
@@ -274,8 +274,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/tenant/dict/data'),
-        component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
+        component: () => import('@/views/system/tenant/dict/data'),
+        // component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
         name: 'TenantData',
         meta: { title: '字典数据', activeMenu: '/system/tenant/dict' }
       }
@@ -290,8 +290,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:jobId(\\d+)',
-        // component: () => import('@/views/monitor/job/log'),
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+        component: () => import('@/views/monitor/job/log'),
+        // component: (resolve) => require(['@/views/monitor/job/log'], resolve),
         name: 'JobLog',
         meta: { title: '调度日志', activeMenu: '/monitor/job' }
       }
@@ -305,7 +305,9 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+        component: () => import('@/views/tool/gen/editTable'),
+
+        // component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
         name: 'GenEdit',
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }

zkqy-ui/src/store/modules/permission.js

@@ -127,8 +127,8 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    // return () => import(`@/views/${view}`)
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return () => import(`@/views/${view}`)
+    // return (resolve) => require([`@/views/${view}`], resolve)
   }
 }
 

zkqy-ui/src/views/bussiness/processMange.vue

@@ -242,7 +242,7 @@ import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
-import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
+// import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
 
 export default {
   name: "processMange",
@@ -267,7 +267,7 @@ export default {
     RecordQuality,
     ProductionProcesses,
     PersonalDistribution,
-    RecordSplitData,
+    // RecordSplitData,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {

zkqy-ui/src/views/system/bpmnPro/data/index.js

@@ -35,4 +35,25 @@ export const formList = [
     formKey: "KB01",
     formName: "不需表单",
   },
+  // {
+  //   formKey: "EditFinishTime",
+  //   formName: "编辑完成时间",
+  // },
+  {
+    formKey: "FinishTask",
+    formName: "完成任务",
+  },
+  {
+    formKey: "QualityControlCardSubCardProcessing",
+    formName: "质控卡分卡处理",
+  },
+  // {
+  //   formKey: "EditQualityCard",
+  //   formName: "质控卡修改",
+  // },
+  {
+    formKey: "ScrapDisposition",
+    formName: "产品报废处理",
+  },
 ]
+

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -853,7 +853,7 @@ export default {
           prop: "value",
         },
       ],
-      markList: [">", "<", "=", ">=", "<="],
+      markList: [">", "<", "=", ">=", "<=", "!="],
     };
   },
   // created() {

zkqy-ui/src/views/system/tenant/index.vue

@@ -668,6 +668,7 @@ export default {
             });
           }
         }
+        this.reset();
       });
     },
     /** 提交按钮 */

zkqy-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.110.59:8080`,
+        // target: `http://192.168.110.76:8080`,
         target: `http://62.234.61.92:8080`,
         changeOrigin: true,
         pathRewrite: {
@@ -173,3 +173,5 @@ module.exports = {
       )
   }
 }
+
+