From 221918bba28d2384d03c596a68256d7832e4a0e0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/model/sche/model/ScheduleModelForm.vue |   30 +++++++-----------------------
 1 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/views/model/sche/model/ScheduleModelForm.vue b/src/views/model/sche/model/ScheduleModelForm.vue
index d24e286..397123b 100644
--- a/src/views/model/sche/model/ScheduleModelForm.vue
+++ b/src/views/model/sche/model/ScheduleModelForm.vue
@@ -210,6 +210,7 @@
         <el-table-column
           prop=""
           label="键"
+          min-width="150"
           align="center">
           <template #default="scope">
             <el-input v-model="scope.row.key" maxlength="20" clearable :disabled="true"
@@ -219,6 +220,7 @@
         <el-table-column
           prop=""
           label="名称"
+          min-width="150"
           align="center">
           <template #default="scope">
             <el-input v-model="scope.row.name" maxlength="20" clearable :disabled="true"
@@ -228,6 +230,7 @@
         <el-table-column
           prop=""
           label="类型"
+          min-width="100"
           align="center">
           <template #default="scope">
             <el-select v-model="scope.row.valuetype" placeholder="请选择" :disabled="true">
@@ -243,34 +246,14 @@
         <el-table-column
           prop=""
           label="值"
+          min-width="300"
           align="center">
           <template #default="scope">
-            <el-input v-model="scope.row.value" maxlength="256" clearable  :disabled="scope.row.key === 'pyFile'"
+            <el-input v-model="scope.row.value" maxlength="256" clearable
+                      :disabled="scope.row.key === 'pyFile_BAK'"
                       style="width:100%;hight:100%"/>
           </template>
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop=""-->
-<!--          label="操作"-->
-<!--          width="100"-->
-<!--          align="center">-->
-<!--          <template #default="scope">-->
-<!--            <el-button-->
-<!--              @click.prevent="addRow(scope.$index, formData.settingList)"-->
-<!--              link-->
-<!--              type="primary"-->
-<!--              size="small">-->
-<!--              添加-->
-<!--            </el-button>-->
-<!--            <el-button-->
-<!--              @click.prevent="deleteRow(scope.$index, formData.settingList)"-->
-<!--              link-->
-<!--              type="primary"-->
-<!--              size="small">-->
-<!--              删除-->
-<!--            </el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
       <el-divider content-position="left">模型下发配置</el-divider>
       <el-row :gutter="20">
@@ -334,6 +317,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