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

Merge branch 'hotfix' of http://192.168.65.198:3000/Front_Team/SPDM into hotfix

Browse Source
This commit is contained in:
zhouyang
2026-03-19 16:44:42 +08:00
parent 16be13e40f e133b49b5b
commit db4a951543
9 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/treeCaseTable/loadCaseTable.vue
View File

@@ -23,7 +23,7 @@
:icon="Plus"
@click="addRowFun(NODE_TYPE.TASK)"
:disabled="addNodeDisabled[NODE_TYPE.TASK]"
>{{ belongProject ? '任务' : $t('工况库.工况') }}</el-button
>{{ belongProject ? '任务' : $t('工况库.场景') }}</el-button
>
<el-button
:icon="Plus"

2
src/components/common/treeCaseTable/nodeDetailDialog.vue
View File

@@ -233,7 +233,7 @@ const prepareFromProps = () => {
if (props.belongProject) {
text += t('通用.任务');
} else {
text += t('工况库.工况');
text += t('工况库.场景');
}
targetTableName = props.modalTableNameList?.[1] || targetTableName;
targetItemNum = props.itemNumList?.[1] || targetItemNum;

2
src/utils/enum/node.ts
View File

@@ -173,6 +173,6 @@ export const poolNodeExtraPropPickMap = {
export const nodeTypeList: DictItem[] = [
{ label: '分类', value: NODE_TYPE.CATEGORY },
{ label: '工况', value: NODE_TYPE.TASK },
{ label: '场景', value: NODE_TYPE.TASK },
{ label: '指标', value: NODE_TYPE.PERFORMANCE },
];

7
src/utils/i18n/en.ts
View File

@@ -24,6 +24,7 @@ const lang = {
审批类型: 'Approval Type',
任务: 'Task',
请输入: 'Please Enter ',
请输入关键字: 'Please enter keyword',
请选择: 'Please Select ',
请选择时间: 'Please select time',
操作成功: 'Operation Successful',
@@ -141,7 +142,7 @@ const lang = {
工位: 'Workspace',
学科: 'Discipline',
节点: 'Node',
工况: 'Task',
场景: 'Scene',
指标: 'Performance',
需按照配置顺序逐层添加: 'Please add in configured order',
请按照顺序添加: 'Please add in order ({order})',
@@ -151,7 +152,7 @@ const lang = {
编号不能为空: 'Code cannot be empty for: {names}',
存在重复的编号: 'Duplicate codes found: {codes}',
删除: 'Delete',
创建清单库: 'Create Pool',
创建地图库: 'Create Map Pool',
导入Excel: 'Import Excel',
模板: 'Template',
导入类型: 'Import Type',
@@ -166,7 +167,7 @@ const lang = {
'You have unsaved changes! Do you want to submit them for review before leaving?',
当前有修改未保存是否先提交评审:
'You have unsaved changes! Do you want to submit them for review first?',
工况清单库: 'Task Pool',
仿真地图库: 'Simulation Map Pool',
版本: 'Version',
显示配置: 'View Config',
审批: 'Approve',

7
src/utils/i18n/zh.ts
View File

@@ -24,6 +24,7 @@ const lang = {
审批类型: '审批类型',
任务: '任务',
请输入: '请输入',
请输入关键字: '请输入关键字',
请选择: '请选择',
请选择时间: '请选择时间',
操作成功: '操作成功',
@@ -140,7 +141,7 @@ const lang = {
工位: '工位',
学科: '学科',
节点: '节点',
工况: '工况',
场景: '场景',
指标: '指标',
需按照配置顺序逐层添加: '需按照配置顺序逐层添加',
请按照顺序添加: '请按照顺序（{order}）添加',
@@ -150,7 +151,7 @@ const lang = {
编号不能为空: '以下节点编号不能为空：{names}',
存在重复的编号: '存在重复的编号：{codes}',
删除: '删除',
创建清单库: '创建清单库',
创建地图库: '创建地图库',
导入Excel: '导入Excel',
模板: '模板',
导入类型: '导入类型',
@@ -163,7 +164,7 @@ const lang = {
提交评审: '提交评审',
当前有修改未保存是否将修改提交评审后离开: '当前有修改未保存！是否将修改提交评审后离开！',
当前有修改未保存是否先提交评审: '当前有修改未保存！是否先提交评审？',
工况清单库: '工况清单库',
仿真地图库: '仿真地图库',
版本: '版本',
显示配置: '显示配置',
审批: '审批',

6
src/views/competenceCenter/condition/components/taskPool.vue
View File

@@ -5,7 +5,7 @@
<el-space class="space">
<template v-if="pageType === 'loadcase'">
<el-button icon="plus" @click="addPoolFun">
{{ $t('工况库.创建清单库') }}
{{ $t('工况库.创建地图库') }}
</el-button>
</template>
<el-button type="primary" icon="finished" @click="openAddApproveUserFun">
@@ -16,7 +16,7 @@
</el-button>
<div class="pool-select select-form">
<el-form :inline="true">
<el-form-item :label="$t('工况库.工况清单库')" :label-width="100">
<el-form-item :label="$t('工况库.仿真地图库')" :label-width="100">
<el-select
v-model="currentPoolBrief"
:props="{ label: 'poolName', value: 'value' }"
@@ -129,7 +129,7 @@
<div class="contain" v-if="pageType !== 'loadcase'">
<div class="pool-select">
<el-form :inline="true">
<el-form-item :label="$t('工况库.工况清单库')" :label-width="100">
<el-form-item :label="$t('工况库.仿真地图库')" :label-width="100">
<el-select
v-model="currentPoolBrief"
:props="{ label: 'poolName', value: 'value' }"

2
src/views/index/approvalPreview/components/taskPool.vue
View File

@@ -4,7 +4,7 @@
<div class="label">
<span v-if="isCreatePool">{{ $t('工况库.新增') }}</span
><span v-else>{{ $t('工况库.编辑') }}</span
>{{ $t('工况库.工况清单库') }}：
>{{ $t('工况库.仿真地图库') }}：
</div>
<div class="content">
<span size="large" type="success" v-if="isCreatePool"> {{ poolName }}</span>

8
src/views/task/dashboard/components/simulationLoop.vue
View File

@@ -12,7 +12,7 @@
>
<template #formSlot>
<el-form label-position="top">
<el-form-item :label="$t('工况库.工况清单库')">
<el-form-item :label="$t('工况库.仿真地图库')">
<poolSelect v-model="confidencePoolName" />
</el-form-item>
</el-form>
@@ -30,7 +30,7 @@
>
<template #formSlot>
<el-form label-position="top">
<el-form-item :label="$t('工况库.工况清单库')">
<el-form-item :label="$t('工况库.仿真地图库')">
<poolSelect v-model="workspacePoolName" />
</el-form-item>
</el-form>
@@ -49,7 +49,7 @@
>
<template #formSlot>
<el-form label-position="top">
<el-form-item :label="$t('工况库.工况清单库')">
<el-form-item :label="$t('工况库.仿真地图库')">
<poolSelect v-model="difficultyPoolName" />
</el-form-item>
</el-form>
@@ -67,7 +67,7 @@
>
<template #formSlot>
<el-form label-position="top">
<el-form-item :label="$t('工况库.工况清单库')">
<el-form-item :label="$t('工况库.仿真地图库')">
<poolSelect v-model="trendPoolName" />
</el-form-item>
<el-form-item :label="$t('通用.时间范围')">

2
src/views/task/projectList/components/taskDialog.vue
View File

@@ -54,7 +54,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="工况清单库：" v-show="planMode === 'lib'">
<el-form-item label="仿真地图库：" v-show="planMode === 'lib'">
<el-select
class="loadcase-lib"
:teleported="false"