From d5207d8eaff6188ae0d79c07de17d0b8dbaed65a Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期一, 06 一月 2025 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/model/sche/model/ScheduleModelForm.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/model/sche/model/ScheduleModelForm.vue b/src/views/model/sche/model/ScheduleModelForm.vue
index d09e47a..b01f3d2 100644
--- a/src/views/model/sche/model/ScheduleModelForm.vue
+++ b/src/views/model/sche/model/ScheduleModelForm.vue
@@ -282,14 +282,21 @@
:data="formData.modelOut"
border
style="width: 100%; margin-top: 5px;">
- <el-table-column prop="resultKey`" label="输出key" align="center" min-width="100">
+ <el-table-column prop="resultKey" label="输出key" align="center" min-width="100">
<template #default="scope">
<el-input size="mini" v-model="scope.row.resultKey" style="width:100%;height:100%"/>
</template>
</el-table-column>
- <el-table-column prop="resultType`" label="数据类型" align="center" min-width="100">
+ <el-table-column prop="resultType" label="数据类型" align="center" min-width="150">
<template #default="scope">
- <el-input size="mini" v-model="scope.row.resultType" style="width:100%;height:100%"/>
+ <el-select v-model="scope.row.resultType" placeholder="请选择">
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.RESULT_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="resultPort" label="角标1" align="center" min-width="100">
@@ -327,6 +334,7 @@
<el-table-column prop="disturbancePointNo’" label="无扰切换点位" align="center" min-width="200">
<template #default="scope">
<el-select v-model="scope.row.disturbancePointNo"
+ clearable
filterable
placeholder="请选择">
<el-option
--
Gitblit v1.9.3