Front_Team/CID
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-04-15 09:17:04 +08:00
parent 571dd5b753 f6926db4ea
commit 9c14c3b8f8
15 changed files with 185 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/package/function.mjs
View File

@@ -285,6 +285,40 @@ export const appList = [
},
],
},
{
name: 'spdm_JobList',
zhCn: '作业列表',
en: 'Job List',
pages: [
{
name: 'spdmJobList',
zhCn: '作业列表',
en: 'Job List',
path: '/spdm/job/list',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Tickets',
},
},
],
},
{
name: 'spdm_JobResources',
zhCn: '计算资源',
en: 'Job Resources',
pages: [
{
name: 'spdmJobResources',
zhCn: '计算资源',
en: 'Job Resources',
path: '/spdm/job/resources',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-DataAnalysis',
},
},
],
},
{
name: 'spdm_DataOverview',
zhCn: '数据总览',
@@ -2110,7 +2144,7 @@ export const navList = [
name: 'spdmJob',
zhCn: '作业管理',
en: 'Job Management',
subApps: ['spdm_JobSubmit'],
subApps: ['spdm_JobSubmit', 'spdm_JobList', 'spdm_JobResources'],
meta: {
icon: 'ele-Files',
},

6
scripts/package/i18n/en.ts
View File

@@ -25,6 +25,8 @@ export default {
spdm_TaskExecution: 'Task Execution',
spdm_ReportWork: 'Report Work',
spdm_JobSubmit: 'Job Submit',
spdm_JobList: 'Job List',
spdm_JobResources: 'Job Resources',
spdm_DataOverview: 'Data Overview',
spdm_DataAnalysis: 'Data Query',
spdm_DataPermission: 'Data Permission',
@@ -137,6 +139,8 @@ export default {
spdm_TaskExecution: 'Task Execution',
spdm_ReportWork: 'Report Work',
spdm_JobSubmit: 'Job Submit',
spdm_JobList: 'Job List',
spdm_JobResources: 'Job Resources',
spdm_DataOverview: 'Data Overview',
spdm_DataAnalysis: 'Data Query',
spdm_DataPermission: 'Data Permission',
@@ -252,6 +256,8 @@ export default {
spdmTaskExecution: 'Task Execution',
spdmReportWork: 'Report Work',
spdmJobSubmit: 'Job Submit',
spdmJobList: 'Job List',
spdmJobResources: 'Job Resources',
spdmDataOverview: 'Data Overview',
spdmDataAnalysis: 'Data Query',
spdmDataPermission: 'Data Permission',

4
scripts/package/i18n/zh-cn.ts
View File

@@ -33,6 +33,8 @@ export default {
spdm_TaskExecution: '仿真执行',
spdm_ReportWork: '报工列表',
spdm_JobSubmit: '作业提交',
spdm_JobList: '作业列表',
spdm_JobResources: '计算资源',
spdm_DataOverview: '数据总览',
spdm_DataAnalysis: '数据查询',
spdm_DataPermission: '数据权限',
@@ -148,6 +150,8 @@ export default {
spdmTaskExecution: '仿真执行',
spdmReportWork: '报工列表',
spdmJobSubmit: '作业提交',
spdmJobList: '作业列表',
spdmJobResources: '计算资源',
spdmDataOverview: '数据总览',
spdmDataAnalysis: '数据查询',
spdmDataPermission: '数据权限',

20
scripts/package/moduleMap.mjs
View File

@@ -12,6 +12,8 @@ export const appMap = {
spdm_TaskExecution: {"name":"moduleApps.spdm_TaskExecution","zhCn":"仿真执行","en":"Task Execution","pages":[{"name":"spdmTaskExecution","zhCn":"仿真执行","en":"Task Execution","path":"/spdm/task/execution","meta":{"icon":"ele-Operation"}}]},
spdm_ReportWork: {"name":"moduleApps.spdm_ReportWork","zhCn":"报工列表","en":"Report Work","pages":[{"name":"spdmReportWork","zhCn":"报工列表","en":"Report Work","path":"/spdm/task/reportWork","meta":{"icon":"ele-Tickets"}}]},
spdm_JobSubmit: {"name":"moduleApps.spdm_JobSubmit","zhCn":"作业提交","en":"Job Submit","pages":[{"name":"spdmJobSubmit","zhCn":"作业提交","en":"Job Submit","path":"/spdm/job/submit","meta":{"icon":"ele-DocumentAdd"}}]},
spdm_JobList: {"name":"moduleApps.spdm_JobList","zhCn":"作业列表","en":"Job List","pages":[{"name":"spdmJobList","zhCn":"作业列表","en":"Job List","path":"/spdm/job/list","meta":{"icon":"ele-Tickets"}}]},
spdm_JobResources: {"name":"moduleApps.spdm_JobResources","zhCn":"计算资源","en":"Job Resources","pages":[{"name":"spdmJobResources","zhCn":"计算资源","en":"Job Resources","path":"/spdm/job/resources","meta":{"icon":"ele-DataAnalysis"}}]},
spdm_DataOverview: {"name":"moduleApps.spdm_DataOverview","zhCn":"数据总览","en":"Data Overview","pages":[{"name":"spdmDataOverview","zhCn":"数据总览","en":"Data Overview","path":"/spdm/data/overview","meta":{"icon":"ele-DataAnalysis"}}]},
spdm_DataAnalysis: {"name":"moduleApps.spdm_DataAnalysis","zhCn":"数据查询","en":"Data Query","pages":[{"name":"spdmDataAnalysis","zhCn":"数据查询","en":"Data Query","path":"/spdm/data/analysis","meta":{"icon":"ele-Search"}}]},
spdm_DataPermission: {"name":"moduleApps.spdm_DataPermission","zhCn":"数据权限","en":"Data Permission","pages":[{"name":"spdmDataPermission","zhCn":"数据权限","en":"Data Permission","path":"/spdm/data/permission","meta":{"icon":"ele-Warning"}}]},
@@ -113,7 +115,7 @@ export const appMap = {
export const navMap = {
spdmProject: {"name":"moduleRoutes.spdmProject","zhCn":"项目管理","en":"Project Management","subApps":["spdm_AllProject","spdm_ChargeProject","spdm_FllowProject","spdm_ProjectDashboard"],"meta":{"icon":"ele-House"}},
spdmTask: {"name":"moduleRoutes.spdmTask","zhCn":"任务管理","en":"Task Management","subApps":["spdm_TaskSponsor","spdm_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_ReportWork"],"meta":{"icon":"ele-Calendar"}},
spdmJob: {"name":"moduleRoutes.spdmJob","zhCn":"作业管理","en":"Job Management","subApps":["spdm_JobSubmit"],"meta":{"icon":"ele-Files"}},
spdmJob: {"name":"moduleRoutes.spdmJob","zhCn":"作业管理","en":"Job Management","subApps":["spdm_JobSubmit","spdm_JobList","spdm_JobResources"],"meta":{"icon":"ele-Files"}},
spdmData: {"name":"moduleRoutes.spdmData","zhCn":"数据管理","en":"Data Management","subApps":["spdm_DataOverview","spdm_DataAnalysis","spdm_DataPermission","spdm_DataTrain","spdm_DataForecast"],"meta":{"icon":"ele-TakeawayBox"}},
spdmSimulation: {"name":"moduleRoutes.spdmSimulation","zhCn":"流程管理","en":"Process Management","subApps":["spdm_SimulationProcess","spdm_SystemApplication"],"meta":{"icon":"ele-Finished"}},
spdmCompetenceCenter: {"name":"moduleRoutes.spdmCompetenceCenter","zhCn":"能力中心","en":"Capability Center","subApps":["spdm_CompetenceCenterCondition","spdm_CompetenceCenterStandardScene","spdm_CompetenceCenterKnowledge","spdm_CompetenceCenterParameter","spdm_CompetenceCenterReport","spdm_CompetenceCenterAnimation","spdm_CompetenceCenterRobot","spdm_CompetenceCenterIndustrialDesign","spdm_CompetenceCenterToleranceAnalysis","spdm_CompetenceCenterExceptionCase"],"meta":{"icon":"ele-Reading"}},
@@ -257,6 +259,22 @@ export const pageMap = {
"code": "spdm_JobSubmit_view"
}
},
"spdmJobList": {
"path": "/spdm/job/list",
"name": "moduleRoutes.spdmJobList",
"meta": {
"icon": "ele-Tickets",
"code": "spdm_JobList_view"
}
},
"spdmJobResources": {
"path": "/spdm/job/resources",
"name": "moduleRoutes.spdmJobResources",
"meta": {
"icon": "ele-DataAnalysis",
"code": "spdm_JobResources_view"
}
},
"spdmDataOverview": {
"path": "/spdm/data/overview",
"name": "moduleRoutes.spdmDataOverview",

2
scripts/package/sql/sys_app.sql
View File

@@ -21,6 +21,8 @@ INSERT INTO `sys_app` VALUES (6037428677, 'spdm_TaskAll');
INSERT INTO `sys_app` VALUES (4023091864, 'spdm_TaskExecution');
INSERT INTO `sys_app` VALUES (9129218323, 'spdm_ReportWork');
INSERT INTO `sys_app` VALUES (7649132234, 'spdm_JobSubmit');
INSERT INTO `sys_app` VALUES (8120117172, 'spdm_JobList');
INSERT INTO `sys_app` VALUES (9791851730, 'spdm_JobResources');
INSERT INTO `sys_app` VALUES (6871282497, 'spdm_DataOverview');
INSERT INTO `sys_app` VALUES (8526152209, 'spdm_DataAnalysis');
INSERT INTO `sys_app` VALUES (5988284884, 'spdm_DataPermission');

10
scripts/package/sql/sys_function.sql
View File

@@ -74,6 +74,16 @@ INSERT INTO `sys_function` VALUES (4066120840, 'spdm_JobSubmit_add', 'spdm_JobSu
INSERT INTO `sys_function` VALUES (2226302877, 'spdm_JobSubmit_edit', 'spdm_JobSubmit');
INSERT INTO `sys_function` VALUES (2586941479, 'spdm_JobSubmit_del', 'spdm_JobSubmit');
INSERT INTO `sys_function` VALUES (6962497137, 'spdm_JobSubmit_export', 'spdm_JobSubmit');
INSERT INTO `sys_function` VALUES (2740604080, 'spdm_JobList_view', 'spdm_JobList');
INSERT INTO `sys_function` VALUES (5264956150, 'spdm_JobList_add', 'spdm_JobList');
INSERT INTO `sys_function` VALUES (5271808882, 'spdm_JobList_edit', 'spdm_JobList');
INSERT INTO `sys_function` VALUES (9084169291, 'spdm_JobList_del', 'spdm_JobList');
INSERT INTO `sys_function` VALUES (700385260, 'spdm_JobList_export', 'spdm_JobList');
INSERT INTO `sys_function` VALUES (6325477794, 'spdm_JobResources_view', 'spdm_JobResources');
INSERT INTO `sys_function` VALUES (4946297060, 'spdm_JobResources_add', 'spdm_JobResources');
INSERT INTO `sys_function` VALUES (4670044203, 'spdm_JobResources_edit', 'spdm_JobResources');
INSERT INTO `sys_function` VALUES (7957499194, 'spdm_JobResources_del', 'spdm_JobResources');
INSERT INTO `sys_function` VALUES (3541404326, 'spdm_JobResources_export', 'spdm_JobResources');
INSERT INTO `sys_function` VALUES (3116478448, 'spdm_DataOverview_view', 'spdm_DataOverview');
INSERT INTO `sys_function` VALUES (3485528822, 'spdm_DataOverview_add', 'spdm_DataOverview');
INSERT INTO `sys_function` VALUES (7134401498, 'spdm_DataOverview_edit', 'spdm_DataOverview');

6
src/i18n/pages/route/en.ts
View File

@@ -25,6 +25,8 @@ export default {
spdm_TaskExecution: 'Task Execution',
spdm_ReportWork: 'Report Work',
spdm_JobSubmit: 'Job Submit',
spdm_JobList: 'Job List',
spdm_JobResources: 'Job Resources',
spdm_DataOverview: 'Data Overview',
spdm_DataAnalysis: 'Data Query',
spdm_DataPermission: 'Data Permission',
@@ -137,6 +139,8 @@ export default {
spdm_TaskExecution: 'Task Execution',
spdm_ReportWork: 'Report Work',
spdm_JobSubmit: 'Job Submit',
spdm_JobList: 'Job List',
spdm_JobResources: 'Job Resources',
spdm_DataOverview: 'Data Overview',
spdm_DataAnalysis: 'Data Query',
spdm_DataPermission: 'Data Permission',
@@ -252,6 +256,8 @@ export default {
spdmTaskExecution: 'Task Execution',
spdmReportWork: 'Report Work',
spdmJobSubmit: 'Job Submit',
spdmJobList: 'Job List',
spdmJobResources: 'Job Resources',
spdmDataOverview: 'Data Overview',
spdmDataAnalysis: 'Data Query',
spdmDataPermission: 'Data Permission',

4
src/i18n/pages/route/zh-cn.ts
View File

@@ -33,6 +33,8 @@ export default {
spdm_TaskExecution: '仿真执行',
spdm_ReportWork: '报工列表',
spdm_JobSubmit: '作业提交',
spdm_JobList: '作业列表',
spdm_JobResources: '计算资源',
spdm_DataOverview: '数据总览',
spdm_DataAnalysis: '数据查询',
spdm_DataPermission: '数据权限',
@@ -148,6 +150,8 @@ export default {
spdmTaskExecution: '仿真执行',
spdmReportWork: '报工列表',
spdmJobSubmit: '作业提交',
spdmJobList: '作业列表',
spdmJobResources: '计算资源',
spdmDataOverview: '数据总览',
spdmDataAnalysis: '数据查询',
spdmDataPermission: '数据权限',

16
src/router/menus.ts
View File

@@ -135,6 +135,22 @@ export default [
"icon": "ele-DocumentAdd",
"code": "spdm_JobSubmit_view"
}
},
{
"name": "moduleApps.spdm_JobList",
"path": "/spdm/job/list",
"meta": {
"icon": "ele-Tickets",
"code": "spdm_JobList_view"
}
},
{
"name": "moduleApps.spdm_JobResources",
"path": "/spdm/job/resources",
"meta": {
"icon": "ele-DataAnalysis",
"code": "spdm_JobResources_view"
}
}
]
},

12
src/router/modules.ts
View File

@@ -95,6 +95,18 @@ export default [
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-DocumentAdd","code":"spdm_JobSubmit_view"},
},
{
path: '/spdm/job/list',
name: 'moduleRoutes.spdmJobList',
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-Tickets","code":"spdm_JobList_view"},
},
{
path: '/spdm/job/resources',
name: 'moduleRoutes.spdmJobResources',
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-DataAnalysis","code":"spdm_JobResources_view"},
},
{
path: '/spdm/data/overview',
name: 'moduleRoutes.spdmDataOverview',

12
src/router/powers.ts
View File

@@ -9,7 +9,7 @@ export interface IPowerItem {
children: {id: IFunctionId; label: string}[];
}
export const appIds = ["4776298884","144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","7649132234","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","4600352034","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","1073400191","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"];
export const appIds = ["4776298884","144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","7649132234","8120117172","9791851730","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","4600352034","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","1073400191","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"];
export const appIdMap = new Set(appIds);
export const filterFunctionCodesIsApp = (codeList: string[]) => {
@@ -84,6 +84,16 @@ export default <IPowerItem[]>[
label: 'moduleApps.spdm_JobSubmit',
children: [{"id":"8692288874","label":"moduleFuncs.view"},{"id":"4066120840","label":"moduleFuncs.add"},{"id":"2226302877","label":"moduleFuncs.edit"},{"id":"2586941479","label":"moduleFuncs.del"},{"id":"6962497137","label":"moduleFuncs.export"}],
},
{
id: '8120117172',
label: 'moduleApps.spdm_JobList',
children: [{"id":"2740604080","label":"moduleFuncs.view"},{"id":"5264956150","label":"moduleFuncs.add"},{"id":"5271808882","label":"moduleFuncs.edit"},{"id":"9084169291","label":"moduleFuncs.del"},{"id":"700385260","label":"moduleFuncs.export"}],
},
{
id: '9791851730',
label: 'moduleApps.spdm_JobResources',
children: [{"id":"6325477794","label":"moduleFuncs.view"},{"id":"4946297060","label":"moduleFuncs.add"},{"id":"4670044203","label":"moduleFuncs.edit"},{"id":"7957499194","label":"moduleFuncs.del"},{"id":"3541404326","label":"moduleFuncs.export"}],
},
{
id: '6871282497',
label: 'moduleApps.spdm_DataOverview',

16
src/spdm/config.ts
View File

@@ -5,10 +5,10 @@
// export const CODE_ENV = 'production'; // 生产环境
// 测试环境
export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址
export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl
export const TENANT_NAME = 'lyric'; // 租户：利元亨
export const CODE_ENV = 'test'; // 测试环境
// export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址
// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl
// export const TENANT_NAME = 'lyric'; // 租户：利元亨
// export const CODE_ENV = 'test'; // 测试环境
// // 190.100
// export const SPDM_URL = 'http://192.168.190.100:3000'; // SPDM项目地址
@@ -24,7 +24,7 @@ export const CODE_ENV = 'test'; // 测试环境
// // 本地环境
// // export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地）
// export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地）
// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl
// export const TENANT_NAME = 'lyric'; // 租户：利元亨
// export const CODE_ENV = 'local-dev'; // 本地开发环境
export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地）
export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl
export const TENANT_NAME = 'lyric'; // 租户：利元亨
export const CODE_ENV = 'local-dev'; // 本地开发环境

34
src/spdm/function.mjs
View File

@@ -33,6 +33,40 @@ export const appList = [
},
],
},
{
name: 'spdm_JobList',
zhCn: '作业列表',
en: 'Job List',
pages: [
{
name: 'spdmJobList',
zhCn: '作业列表',
en: 'Job List',
path: '/spdm/job/list',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-Tickets',
},
},
],
},
{
name: 'spdm_JobResources',
zhCn: '计算资源',
en: 'Job Resources',
pages: [
{
name: 'spdmJobResources',
zhCn: '计算资源',
en: 'Job Resources',
path: '/spdm/job/resources',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-DataAnalysis',
},
},
],
},
{
name: 'spdm_TaskSponsor',
zhCn: '我提出的',

16
src/spdm/moduleMap.mjs
View File

@@ -119,6 +119,22 @@ export const pageMap = {
code: 'spdm_Job_submit',
},
},
spdmJobList: {
path: '/spdm/job/list',
name: 'moduleRoutes.spdmJobList',
meta: {
icon: 'ele-Tickets',
code: 'spdm_Job_list',
},
},
spdmJobResources: {
path: '/spdm/job/resources',
name: 'moduleRoutes.spdmJobResources',
meta: {
icon: 'ele-DataAnalysis',
code: 'spdm_Job_resources',
},
},
spdmTaskWorkLoad: {
path: '/spdm/task/workLoad',
name: 'moduleRoutes.spdmTaskWorkLoad',

2
src/spdm/views/home/components/TaskList.vue
View File

@@ -51,6 +51,7 @@ const status: TaskStatus = {
6: '已关闭',
7: '已延期',
8: '已闭环',
9: '已撤回',
};
const statusType: TaskStatus = {
1: 'info',
@@ -61,6 +62,7 @@ const statusType: TaskStatus = {
6: 'info',
7: 'danger',
8: 'success',
9: 'info',
};
const tableColumns = ref([
{