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:
dongzhihuan
2026-01-30 10:01:35 +08:00
parent d5a37efeec 3fb5554089
commit de344ec665
15 changed files with 59 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/package/function.mjs
View File

@@ -85,31 +85,31 @@ export const appList = [
},
],
},
{
name: 'spdm_TaskConfirm',
zhCn: '未分发的',
en: 'I Confirmed',
pages: [
{
name: 'spdmTaskConfirm',
zhCn: '未分发的',
en: 'I Confirmed',
path: '/spdm/task/confirm',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-DocumentChecked',
},
},
],
},
// {
// name: 'spdm_TaskConfirm',
// zhCn: '未分发的',
// en: 'I Confirmed',
// pages: [
// {
// name: 'spdmTaskConfirm',
// zhCn: '未分发的',
// en: 'I Confirmed',
// path: '/spdm/task/confirm',
// component: () => import('/@/spdm/views/index.vue'),
// meta: {
// icon: 'ele-DocumentChecked',
// },
// },
// ],
// },
{
name: 'spdm_TaskSend',
zhCn: '已分发的',
zhCn: '我分发的',
en: 'I Distributed',
pages: [
{
name: 'spdmTaskSend',
zhCn: '已分发的',
zhCn: '我分发的',
en: 'I Distributed',
path: '/spdm/task/send',
component: () => import('/@/spdm/views/index.vue'),
@@ -1881,7 +1881,7 @@ export const navList = [
name: 'spdmTask',
zhCn: '任务管理',
en: 'Task Management',
subApps: ['spdm_TaskConfirm', 'spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_TaskWorkLoad', 'spdm_TaskWorkerLoad'],
subApps: ['spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_TaskWorkLoad', 'spdm_TaskWorkerLoad'],
meta: {
icon: 'ele-Calendar',
},

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

@@ -15,7 +15,6 @@ export default {
spdmTaskList: 'Pending Task',
spdm_ProjectProjectList: 'Project List',
spdm_ProjectDashboard: 'Simulation Dashboard',
spdm_TaskConfirm: 'I Confirmed',
spdm_TaskSend: 'I Distributed',
spdm_TaskExecute: 'I Executed',
spdm_TaskAttention: 'I Attention',
@@ -117,7 +116,6 @@ export default {
spdmTaskList: 'Pending Task',
spdm_ProjectProjectList: 'Project List',
spdm_ProjectDashboard: 'Simulation Dashboard',
spdm_TaskConfirm: 'I Confirmed',
spdm_TaskSend: 'I Distributed',
spdm_TaskExecute: 'I Executed',
spdm_TaskAttention: 'I Attention',
@@ -219,7 +217,6 @@ export default {
spdmTaskSponsor: 'Pending Task',
spdmProjectProjectList: 'Project List',
spdmProjectDashboard: 'Simulation Dashboard',
spdmTaskConfirm: 'I Confirmed',
spdmTaskSend: 'I Distributed',
spdmTaskExecute: 'I Executed',
spdmTaskAttention: 'I Attention',

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

@@ -23,8 +23,7 @@ export default {
spdmTaskList: '新增待办',
spdm_ProjectProjectList: '项目列表',
spdm_ProjectDashboard: '仿真看板',
spdm_TaskConfirm: '未分发的',
spdm_TaskSend: '已分发的',
spdm_TaskSend: '我分发的',
spdm_TaskExecute: '我执行的',
spdm_TaskAttention: '我关注的',
spdm_TaskAll: '所有任务',
@@ -125,8 +124,7 @@ export default {
spdmTaskSponsor: '新增待办',
spdmProjectProjectList: '项目列表',
spdmProjectDashboard: '仿真看板',
spdmTaskConfirm: '未分发的',
spdmTaskSend: '已分发的',
spdmTaskSend: '我分发的',
spdmTaskExecute: '我执行的',
spdmTaskAttention: '我关注的',
spdmTaskAll: '所有任务',

13
scripts/package/moduleMap.mjs
View File

@@ -2,8 +2,7 @@ export const appMap = {
spdmTaskList: {"name":"moduleApps.spdmTaskList","zhCn":"新增待办","en":"Pending Task","pages":[{"name":"spdmTaskSponsor","zhCn":"新增待办","en":"Pending Task","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}}]},
spdm_ProjectProjectList: {"name":"moduleApps.spdm_ProjectProjectList","zhCn":"项目列表","en":"Project List","pages":[{"name":"spdmProjectProjectList","zhCn":"项目列表","en":"Project List","path":"/spdm/project/projectList","meta":{"icon":"ele-MessageBox"}}]},
spdm_ProjectDashboard: {"name":"moduleApps.spdm_ProjectDashboard","zhCn":"仿真看板","en":"Simulation Dashboard","pages":[{"name":"spdmProjectDashboard","zhCn":"仿真看板","en":"Simulation Dashboard","path":"/spdm/project/dashboard","meta":{"icon":"ele-DataBoard"}}]},
spdm_TaskConfirm: {"name":"moduleApps.spdm_TaskConfirm","zhCn":"未分发的","en":"I Confirmed","pages":[{"name":"spdmTaskConfirm","zhCn":"未分发的","en":"I Confirmed","path":"/spdm/task/confirm","meta":{"icon":"ele-DocumentChecked"}}]},
spdm_TaskSend: {"name":"moduleApps.spdm_TaskSend","zhCn":"已分发的","en":"I Distributed","pages":[{"name":"spdmTaskSend","zhCn":"已分发的","en":"I Distributed","path":"/spdm/task/send","meta":{"icon":"ele-Message"}}]},
spdm_TaskSend: {"name":"moduleApps.spdm_TaskSend","zhCn":"我分发的","en":"I Distributed","pages":[{"name":"spdmTaskSend","zhCn":"我分发的","en":"I Distributed","path":"/spdm/task/send","meta":{"icon":"ele-Message"}}]},
spdm_TaskExecute: {"name":"moduleApps.spdm_TaskExecute","zhCn":"我执行的","en":"I Executed","pages":[{"name":"spdmTaskExecute","zhCn":"我执行的","en":"I Executed","path":"/spdm/task/execute","meta":{"icon":"ele-SetUp"}}]},
spdm_TaskAttention: {"name":"moduleApps.spdm_TaskAttention","zhCn":"我关注的","en":"I Attention","pages":[{"name":"spdmTaskAttention","zhCn":"我关注的","en":"I Attention","path":"/spdm/task/attention","meta":{"icon":"ele-Bell"}}]},
spdm_TaskAll: {"name":"moduleApps.spdm_TaskAll","zhCn":"所有任务","en":"All Tasks","pages":[{"name":"spdmTaskAll","zhCn":"所有任务","en":"All Tasks","path":"/spdm/task/all","meta":{"icon":"ele-DocumentCopy"}}]},
@@ -102,7 +101,7 @@ export const appMap = {
}
export const navMap = {
spdmProject: {"name":"moduleRoutes.spdmProject","zhCn":"项目管理","en":"Project Management","subApps":["spdm_ProjectProjectList","spdm_ProjectDashboard"],"meta":{"icon":"ele-House"}},
spdmTask: {"name":"moduleRoutes.spdmTask","zhCn":"任务管理","en":"Task Management","subApps":["spdm_TaskConfirm","spdm_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_TaskWorkLoad","spdm_TaskWorkerLoad"],"meta":{"icon":"ele-Calendar"}},
spdmTask: {"name":"moduleRoutes.spdmTask","zhCn":"任务管理","en":"Task Management","subApps":["spdm_TaskSend","spdm_TaskExecute","spdm_TaskAttention","spdm_TaskAll","spdm_TaskExecution","spdm_TaskWorkLoad","spdm_TaskWorkerLoad"],"meta":{"icon":"ele-Calendar"}},
spdmData: {"name":"moduleRoutes.spdmData","zhCn":"数据管理","en":"Data Management","subApps":["spdm_DataOverview","spdm_DataAnalysis","spdm_DataPermission"],"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_CompetenceCenterKnowledge","spdm_CompetenceCenterParameter","spdm_CompetenceCenterReport","spdm_CompetenceCenterAnimation"],"meta":{"icon":"ele-Reading"}},
@@ -142,14 +141,6 @@ export const pageMap = {
"code": "spdm_ProjectDashboard_view"
}
},
"spdmTaskConfirm": {
"path": "/spdm/task/confirm",
"name": "moduleRoutes.spdmTaskConfirm",
"meta": {
"icon": "ele-DocumentChecked",
"code": "spdm_TaskConfirm_view"
}
},
"spdmTaskSend": {
"path": "/spdm/task/send",
"name": "moduleRoutes.spdmTaskSend",

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

@@ -11,7 +11,6 @@ CREATE TABLE `sys_app` (
INSERT INTO `sys_app` VALUES (8676203018, 'spdmTaskList');
INSERT INTO `sys_app` VALUES (1847283493, 'spdm_ProjectProjectList');
INSERT INTO `sys_app` VALUES (9963439034, 'spdm_ProjectDashboard');
INSERT INTO `sys_app` VALUES (9053897258, 'spdm_TaskConfirm');
INSERT INTO `sys_app` VALUES (3027615800, 'spdm_TaskSend');
INSERT INTO `sys_app` VALUES (5681445577, 'spdm_TaskExecute');
INSERT INTO `sys_app` VALUES (1492688104, 'spdm_TaskAttention');

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

@@ -24,11 +24,6 @@ INSERT INTO `sys_function` VALUES (3198344357, 'spdm_ProjectDashboard_add', 'spd
INSERT INTO `sys_function` VALUES (2607763432, 'spdm_ProjectDashboard_edit', 'spdm_ProjectDashboard');
INSERT INTO `sys_function` VALUES (8976111739, 'spdm_ProjectDashboard_del', 'spdm_ProjectDashboard');
INSERT INTO `sys_function` VALUES (4749879878, 'spdm_ProjectDashboard_export', 'spdm_ProjectDashboard');
INSERT INTO `sys_function` VALUES (1954462923, 'spdm_TaskConfirm_view', 'spdm_TaskConfirm');
INSERT INTO `sys_function` VALUES (6479169439, 'spdm_TaskConfirm_add', 'spdm_TaskConfirm');
INSERT INTO `sys_function` VALUES (3010912276, 'spdm_TaskConfirm_edit', 'spdm_TaskConfirm');
INSERT INTO `sys_function` VALUES (1013076358, 'spdm_TaskConfirm_del', 'spdm_TaskConfirm');
INSERT INTO `sys_function` VALUES (4025075181, 'spdm_TaskConfirm_export', 'spdm_TaskConfirm');
INSERT INTO `sys_function` VALUES (8531630712, 'spdm_TaskSend_view', 'spdm_TaskSend');
INSERT INTO `sys_function` VALUES (7979957795, 'spdm_TaskSend_add', 'spdm_TaskSend');
INSERT INTO `sys_function` VALUES (6607794768, 'spdm_TaskSend_edit', 'spdm_TaskSend');

2
src/api/message/index.ts
View File

@@ -221,7 +221,7 @@ export const taskAdjust = async (item: any, readType: number = MessageRead.READ)
return;
}
const params = JSON.parse(item.params);
const params = JSON.parse(item.params || '{}');
if (item.msgCategory === MessageCategory.TASK) {
// 通过id查询任务详情
const res = await getObj(params.taskId);

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

@@ -15,7 +15,6 @@ export default {
spdmTaskList: 'Pending Task',
spdm_ProjectProjectList: 'Project List',
spdm_ProjectDashboard: 'Simulation Dashboard',
spdm_TaskConfirm: 'I Confirmed',
spdm_TaskSend: 'I Distributed',
spdm_TaskExecute: 'I Executed',
spdm_TaskAttention: 'I Attention',
@@ -117,7 +116,6 @@ export default {
spdmTaskList: 'Pending Task',
spdm_ProjectProjectList: 'Project List',
spdm_ProjectDashboard: 'Simulation Dashboard',
spdm_TaskConfirm: 'I Confirmed',
spdm_TaskSend: 'I Distributed',
spdm_TaskExecute: 'I Executed',
spdm_TaskAttention: 'I Attention',
@@ -219,7 +217,6 @@ export default {
spdmTaskSponsor: 'Pending Task',
spdmProjectProjectList: 'Project List',
spdmProjectDashboard: 'Simulation Dashboard',
spdmTaskConfirm: 'I Confirmed',
spdmTaskSend: 'I Distributed',
spdmTaskExecute: 'I Executed',
spdmTaskAttention: 'I Attention',

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

@@ -23,8 +23,7 @@ export default {
spdmTaskList: '新增待办',
spdm_ProjectProjectList: '项目列表',
spdm_ProjectDashboard: '仿真看板',
spdm_TaskConfirm: '未分发的',
spdm_TaskSend: '已分发的',
spdm_TaskSend: '我分发的',
spdm_TaskExecute: '我执行的',
spdm_TaskAttention: '我关注的',
spdm_TaskAll: '所有任务',
@@ -125,8 +124,7 @@ export default {
spdmTaskSponsor: '新增待办',
spdmProjectProjectList: '项目列表',
spdmProjectDashboard: '仿真看板',
spdmTaskConfirm: '未分发的',
spdmTaskSend: '已分发的',
spdmTaskSend: '我分发的',
spdmTaskExecute: '我执行的',
spdmTaskAttention: '我关注的',
spdmTaskAll: '所有任务',

4
src/main.ts
View File

@@ -98,4 +98,6 @@ app
app.component('ElFormItem', ElFormItem);
NextLoading.start();
if (location.pathname !== '/spdmApproval') { // SPDM CODE
NextLoading.start();
}

8
src/router/menus.ts
View File

@@ -47,14 +47,6 @@ export default [
"icon": "ele-Calendar"
},
"children": [
{
"name": "moduleApps.spdm_TaskConfirm",
"path": "/spdm/task/confirm",
"meta": {
"icon": "ele-DocumentChecked",
"code": "spdm_TaskConfirm_view"
}
},
{
"name": "moduleApps.spdm_TaskSend",
"path": "/spdm/task/send",

6
src/router/modules.ts
View File

@@ -17,12 +17,6 @@ export default [
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-DataBoard","code":"spdm_ProjectDashboard_view"},
},
{
path: '/spdm/task/confirm',
name: 'moduleRoutes.spdmTaskConfirm',
component: () => import('/@/spdm/views/index.vue'),
meta: {"icon":"ele-DocumentChecked","code":"spdm_TaskConfirm_view"},
},
{
path: '/spdm/task/send',
name: 'moduleRoutes.spdmTaskSend',

7
src/router/powers.ts
View File

@@ -9,7 +9,7 @@ export interface IPowerItem {
children: {id: IFunctionId; label: string}[];
}
export const appIds = ["8676203018","1847283493","9963439034","9053897258","3027615800","5681445577","1492688104","6037428677","4023091864","275283997","5823128472","6871282497","8526152209","5988284884","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","9985416320","3660213810","167651000","41522868","8465959142","2062779304","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 = ["8676203018","1847283493","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","275283997","5823128472","6871282497","8526152209","5988284884","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","9985416320","3660213810","167651000","41522868","8465959142","2062779304","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[]) => {
@@ -34,11 +34,6 @@ export default <IPowerItem[]>[
label: 'moduleApps.spdm_ProjectDashboard',
children: [{"id":"4955939539","label":"moduleFuncs.view"},{"id":"3198344357","label":"moduleFuncs.add"},{"id":"2607763432","label":"moduleFuncs.edit"},{"id":"8976111739","label":"moduleFuncs.del"},{"id":"4749879878","label":"moduleFuncs.export"}],
},
{
id: '9053897258',
label: 'moduleApps.spdm_TaskConfirm',
children: [{"id":"1954462923","label":"moduleFuncs.view"},{"id":"6479169439","label":"moduleFuncs.add"},{"id":"3010912276","label":"moduleFuncs.edit"},{"id":"1013076358","label":"moduleFuncs.del"},{"id":"4025075181","label":"moduleFuncs.export"}],
},
{
id: '3027615800',
label: 'moduleApps.spdm_TaskSend',

40
src/spdm/function.mjs
View File

@@ -50,31 +50,31 @@ export const appList = [
},
],
},
{
name: 'spdm_TaskConfirm',
zhCn: '未分发的',
en: 'I Confirmed',
pages: [
{
name: 'spdmTaskConfirm',
zhCn: '未分发的',
en: 'I Confirmed',
path: '/spdm/task/confirm',
component: () => import('/@/spdm/views/index.vue'),
meta: {
icon: 'ele-DocumentChecked',
},
},
],
},
// {
// name: 'spdm_TaskConfirm',
// zhCn: '未分发的',
// en: 'I Confirmed',
// pages: [
// {
// name: 'spdmTaskConfirm',
// zhCn: '未分发的',
// en: 'I Confirmed',
// path: '/spdm/task/confirm',
// component: () => import('/@/spdm/views/index.vue'),
// meta: {
// icon: 'ele-DocumentChecked',
// },
// },
// ],
// },
{
name: 'spdm_TaskSend',
zhCn: '已分发的',
zhCn: '我分发的',
en: 'I Distributed',
pages: [
{
name: 'spdmTaskSend',
zhCn: '已分发的',
zhCn: '我分发的',
en: 'I Distributed',
path: '/spdm/task/send',
component: () => import('/@/spdm/views/index.vue'),
@@ -474,7 +474,7 @@ export const navList = [
name: 'spdmTask',
zhCn: '任务管理',
en: 'Task Management',
subApps: ['spdm_TaskConfirm', 'spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_TaskWorkLoad', 'spdm_TaskWorkerLoad'],
subApps: ['spdm_TaskSend', 'spdm_TaskExecute', 'spdm_TaskAttention', 'spdm_TaskAll', 'spdm_TaskExecution', 'spdm_TaskWorkLoad', 'spdm_TaskWorkerLoad'],
meta: {
icon: 'ele-Calendar',
},

10
src/spdm/views/index.vue
View File

@@ -11,7 +11,8 @@
TENANT_ID,
TOKEN,
USER_ID,
USER_INFO_DATA
USER_INFO_DATA,
jump: jumpFun
}"
:plugins="[DocElementRectPlugin()]"
/>
@@ -19,7 +20,7 @@
<script setup lang="ts">
import { watch } from 'vue';
import { useRoute } from 'vue-router';
import { useRoute, useRouter } from 'vue-router';
import WujieVue from "wujie-vue3";
import Cookies from 'js-cookie';
import { SPDM_URL } from '../config';
@@ -32,6 +33,7 @@ const TOKEN = Cookies.get('cid_token');
const { bus } = WujieVue;
const route = useRoute();
const router = useRouter();
watch(
() => route,
@@ -44,4 +46,8 @@ watch(
bus.$on('SPMD_LOADED', () => {
bus.$emit('ROUTER_CHANGE', route);
});
const jumpFun = (location: any) => {
router.push(location);
}
</script>