From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分,与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw

---
 src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
index d03e5f3..ca8060e 100644
--- a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
+++ b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
@@ -121,6 +121,20 @@
           </a-col>
           <a-col :span="24/2">
             <a-form-model-item
+              label="鐗堟湰"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="version"
+            >
+              <a-input
+                v-model="model.version"
+                placeholder="璇疯緭鍏ョ増鏈彿"
+                :disabled=true
+              ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <!-- <a-col :span="24/2">
+            <a-form-model-item
               label="璋冩暣鏂瑰紡"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -133,9 +147,9 @@
                 v-model="model.arrangeWay"
               />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
         </a-row>
-        <a-row>
+        <!-- <a-row>
           <a-col :span="24/2">
             <a-form-model-item
               label="閫炬湡澶勭悊鏂瑰紡"
@@ -166,7 +180,7 @@
               />
             </a-form-model-item>
           </a-col>
-        </a-row>
+        </a-row> -->
         <a-row>
           <a-col :span="24/2">
             <a-form-item
@@ -203,20 +217,7 @@
           </a-col>
         </a-row>
         <a-row>
-          <a-col :span="24/2">
-            <a-form-model-item
-              label="鐗堟湰"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              prop="version"
-            >
-              <a-input
-                v-model="model.version"
-                placeholder="璇疯緭鍏ョ増鏈彿"
-                :disabled=true
-              ></a-input>
-            </a-form-model-item>
-          </a-col>
+
           <a-col
             v-if=" model.isRevise == true"
             :span="24/2"

--
Gitblit v1.9.3