From cd2ce78bffb1e4cd6da08ef6759e369a06e21de2 Mon Sep 17 00:00:00 2001 From: zhouyang Date: Mon, 13 Apr 2026 20:04:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E4=B8=AD=E8=BD=A6=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E5=81=87=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=B8=8D=E4=BC=9A=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/flow/flowNodeParamTable.vue | 44 ++++- .../runDetailPage/demoFile/param.ts | 105 ++++++++++ .../components/runDetailPage/index.vue | 47 ++++- .../runPagecomponent/analysisResult.vue | 154 +++++++++++++++ .../rollingWheelForceAnalysis_Demo.vue | 113 +++++++++++ .../vehicleStabilityAnalysis_Demo.vue | 159 ++++++++++++++++ .../vibrationSignalAnalysis_Demo.vue | 180 ++++++++++++++++++ 7 files changed, 795 insertions(+), 7 deletions(-) create mode 100644 src/views/task/execution/components/runDetailPage/demoFile/param.ts create mode 100644 src/views/task/execution/components/runDetailPage/runPagecomponent/analysisResult.vue create mode 100644 src/views/task/execution/components/runDetailPage/runPagecomponent/rollingWheelForceAnalysis_Demo.vue create mode 100644 src/views/task/execution/components/runDetailPage/runPagecomponent/vehicleStabilityAnalysis_Demo.vue create mode 100644 src/views/task/execution/components/runDetailPage/runPagecomponent/vibrationSignalAnalysis_Demo.vue diff --git a/src/components/flow/flowNodeParamTable.vue b/src/components/flow/flowNodeParamTable.vue index 7c36c751..c858643c 100644 --- a/src/components/flow/flowNodeParamTable.vue +++ b/src/components/flow/flowNodeParamTable.vue @@ -24,6 +24,18 @@ @click="flowClickFun('justStartLocalAppFun')" >启动 + 计算 + 保存 启动 @@ -35,7 +47,22 @@ @click="flowClickFun('continueStartRunJobFun')" >完成 - 日志 + 日志 + + + 参数操作 + + + @@ -177,8 +204,9 @@ *   - {{ row.componentName }} + {{ row?.children[0]?.defaultValue || '配置' }} + {{ row.label }} @@ -629,6 +657,10 @@ watch( nextTick(() => { baseTableRef.value.setDataFun(tableData.value); }); + + setTimeout(() => { + baseTableRef.value.tableRef.setAllTreeExpand(true); + }, 200); } }, { @@ -692,6 +724,14 @@ watch( margin-right: 10px; } +.ml10 { + margin-left: 10px; +} + +.w70p{ + width: 60%; +} + .input-grid { display: flex; align-items: center; diff --git a/src/views/task/execution/components/runDetailPage/demoFile/param.ts b/src/views/task/execution/components/runDetailPage/demoFile/param.ts new file mode 100644 index 00000000..e52890b4 --- /dev/null +++ b/src/views/task/execution/components/runDetailPage/demoFile/param.ts @@ -0,0 +1,105 @@ +// 轨道参数 +export const OrbitalParameters = [ + { + label: '基础配置一', + name: '', + value: '', + type: 'text', + children: [ + { + label: '轨道结构形式', + name: '', + value: '', + type: 'select', + selectOption: [ + { + name: '道床版面支撑', + value: 1, + }, + ], + }, + { + label: '轨道板纵连形式', + name: '', + value: '', + type: 'select', + selectOption: [ + { + name: '纵连', + value: 1, + }, + ], + }, + { + label: '底座板纵连形式', + name: '', + value: '', + type: 'select', + selectOption: [ + { + name: '纵连', + value: 1, + }, + ], + }, + ], + }, + { + label: '混泥土板阻尼参数一', + name: '', + value: '', + type: 'text', + children: [ + { + label: '混泥土板阻尼参数一', + name: '', + value: '', + type: 'text', + }, + ], + }, + { + label: '轨道结构参数一', + name: '', + value: '', + type: 'text', + children: [], + }, +]; + +// 列车参数 +export const TrainParameters = []; + +// 基础结构参数 +export const FoundationStructureParameters = []; + +// 隧道外围土体参数 +export const TheTunnelPeripherySoilParameters = []; + +export const testOption = { + xAxis: { + type: 'category', + data: ['0', '1', '2', '3', '4', '5'], + axisTick: { + show: true, // 是否显示刻度线 + inside: true, // 刻度线朝内(true)或朝外(false) + alignWithLabel: true, // 刻度线与标签对齐 + interval: 0, // 显示间隔(0表示全部显示) + }, + }, + yAxis: { + type: 'value', + min: 0, // 最小值 + max: 5, // 最大值 + axisTick: { + show: true, // 是否显示刻度线 + inside: true, // 刻度线朝内(true)或朝外(false) + alignWithLabel: true, // 刻度线与标签对齐 + interval: 0, // 显示间隔(0表示全部显示) + }, + axisLine: { + show: true, + }, + }, + series: [], +}; diff --git a/src/views/task/execution/components/runDetailPage/index.vue b/src/views/task/execution/components/runDetailPage/index.vue index 25394955..5c1267cb 100644 --- a/src/views/task/execution/components/runDetailPage/index.vue +++ b/src/views/task/execution/components/runDetailPage/index.vue @@ -2,7 +2,7 @@
+ + + + +
@@ -171,6 +188,22 @@ :run-info="runInfo" :online-file-param="onlineFileParam" > + + + + + +
@@ -395,6 +428,10 @@ import dayjs from 'dayjs'; import { base64ToStrFun, isJSONFun } from '@/utils/file'; import simulationParam from './runPagecomponent/simulationParam.vue'; import dataAchieve from './runPagecomponent/dataAchieve.vue'; +import analysisResult from './runPagecomponent/analysisResult.vue'; +import vehicleStabilityAnalysis_Demo from './runPagecomponent/vehicleStabilityAnalysis_Demo.vue'; +import rollingWheelForceAnalysis_Demo from './runPagecomponent/rollingWheelForceAnalysis_Demo.vue'; +import vibrationSignalAnalysis_Demo from './runPagecomponent/vibrationSignalAnalysis_Demo.vue'; const props = defineProps({ runInfo: { @@ -1323,10 +1360,10 @@ const timer = ref(null); onMounted(async () => { await getDictionaryDataFun(); emitter.on('UPLOAD_FINISHED', uploadFinishedFun); - // 1分钟一次流程信息 - timer.value = setInterval(() => { - refreshFun(); - }, 60 * 1000); + // // 1分钟一次流程信息 + // timer.value = setInterval(() => { + // refreshFun(); + // }, 60 * 1000); }); onBeforeUnmount(() => { diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/analysisResult.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/analysisResult.vue new file mode 100644 index 00000000..ec310d17 --- /dev/null +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/analysisResult.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/rollingWheelForceAnalysis_Demo.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/rollingWheelForceAnalysis_Demo.vue new file mode 100644 index 00000000..fa63e2c5 --- /dev/null +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/rollingWheelForceAnalysis_Demo.vue @@ -0,0 +1,113 @@ + + + + + + diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/vehicleStabilityAnalysis_Demo.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/vehicleStabilityAnalysis_Demo.vue new file mode 100644 index 00000000..98ba9b88 --- /dev/null +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/vehicleStabilityAnalysis_Demo.vue @@ -0,0 +1,159 @@ + + + + + + diff --git a/src/views/task/execution/components/runDetailPage/runPagecomponent/vibrationSignalAnalysis_Demo.vue b/src/views/task/execution/components/runDetailPage/runPagecomponent/vibrationSignalAnalysis_Demo.vue new file mode 100644 index 00000000..91e18e64 --- /dev/null +++ b/src/views/task/execution/components/runDetailPage/runPagecomponent/vibrationSignalAnalysis_Demo.vue @@ -0,0 +1,180 @@ + + + + + + From f81cae3f251770268274ee09a899549c618f3cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E4=BF=9D=E6=9E=97?= Date: Tue, 14 Apr 2026 09:05:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tenants/lyric/router/routerData.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tenants/lyric/router/routerData.ts b/src/tenants/lyric/router/routerData.ts index a3a490f3..7f9a79ef 100644 --- a/src/tenants/lyric/router/routerData.ts +++ b/src/tenants/lyric/router/routerData.ts @@ -127,7 +127,7 @@ export default [ title: '我提出的', path: '/task/sponsor', name: 'TaskSponsor', - component: () => import('@/tenants/lyric/views/task/demand.vue'), + component: () => import('@/views/task/simulationTask/newDemand/index.vue'), }, { title: '我分发的', From 4fcdf08dc85c7cf6ef59ebfc55ec2696ba816bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E4=BF=9D=E6=9E=97?= Date: Tue, 14 Apr 2026 11:04:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/enum/task.ts | 12 ++++++++++++ src/views/task/simulationTask/executeTask/index.vue | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/utils/enum/task.ts b/src/utils/enum/task.ts index b1292f5d..f5301384 100644 --- a/src/utils/enum/task.ts +++ b/src/utils/enum/task.ts @@ -18,6 +18,8 @@ export enum TASK_PROCESS_STATUS { POSTPONED = '7', /** 已闭环 */ CLOSED_LOOP = '8', + /** 已撤回 */ + CANCELED = '9', } /** 任务状态颜色映射 */ @@ -90,6 +92,7 @@ export const TASK_PROCESS_STATUS_OBJ: any = { [TASK_PROCESS_STATUS.CLOSED]: '已关闭', [TASK_PROCESS_STATUS.POSTPONED]: '已延期', [TASK_PROCESS_STATUS.CLOSED_LOOP]: '已闭环', + [TASK_PROCESS_STATUS.CANCELED]: '已撤回', }; export const TASK_PROCESS_STATUS_OPTIONS = ( @@ -188,6 +191,7 @@ export const disposeDisabledExeStatus = ( ) { return true; } + // 上传试验相关文件后,任务状态就会 自动 变成已闭环,已完成就不允许再改了 if (status === TASK_PROCESS_STATUS.COMPLETED) { return true; } @@ -201,6 +205,7 @@ export const disposeDisabledExeStatus = ( TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED, TASK_PROCESS_STATUS.COMPLETED, + TASK_PROCESS_STATUS.CANCELED, ].includes(option.value); } else { return [TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED].includes(option.value); @@ -211,6 +216,7 @@ export const disposeDisabledExeStatus = ( TASK_PROCESS_STATUS.PAUSED, TASK_PROCESS_STATUS.CLOSED, TASK_PROCESS_STATUS.COMPLETED, + TASK_PROCESS_STATUS.CANCELED, ].includes(option.value); } if (status === TASK_PROCESS_STATUS.PAUSED) { @@ -219,4 +225,10 @@ export const disposeDisabledExeStatus = ( if (status === TASK_PROCESS_STATUS.REJECTED) { return true; } + if (status === TASK_PROCESS_STATUS.CANCELED) { + return true; + } + if (status === TASK_PROCESS_STATUS.CLOSED_LOOP) { + return true; + } }; diff --git a/src/views/task/simulationTask/executeTask/index.vue b/src/views/task/simulationTask/executeTask/index.vue index b15d3b4f..659fe6c2 100644 --- a/src/views/task/simulationTask/executeTask/index.vue +++ b/src/views/task/simulationTask/executeTask/index.vue @@ -296,8 +296,9 @@ const actionList = ref([ }, hide: (row: any) => { return ( - row.exeStatus === TASK_PROCESS_STATUS.COMPLETED || - row.exeStatus === TASK_PROCESS_STATUS.REJECTED + row.exeStatus === TASK_PROCESS_STATUS.REJECTED || + row.exeStatus === TASK_PROCESS_STATUS.CLOSED_LOOP || + row.exeStatus === TASK_PROCESS_STATUS.CANCELED ); }, },