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/maintenanceProject/MaintenanceProjectModel.vue |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 083f2da..0096e25 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -47,15 +47,15 @@
           </a-col> -->
           <a-col :span="12">
             <a-form-item
-              label="瀹夊叏瑕佹眰"
+              label="淇濆吇閮ㄤ綅"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
               <a-input
                 allow-clear
                 :disabled="disableSubmit"
-                :placeholder="disableSubmit?'':'璇疯緭鍏ュ畨鍏ㄨ姹�'"
-                v-decorator="['maintenanceRequire', validatorRules.maintenanceRequire ]"
+                :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
+                v-decorator="['location', validatorRules.location ]"
               />
             </a-form-item>
           </a-col>
@@ -105,7 +105,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <!-- <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item
               label="淇濆吇鏂规硶"
@@ -134,10 +134,9 @@
                 :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍏�'"
                 v-decorator="['maintenanceTool', validatorRules.maintenanceTool ]"
               />
-              <!-- dictCode="mom_eam_inspection_type,name,id,status!='0' and del_flag!='1'" -->
             </a-form-item>
           </a-col>
-        </a-row>
+        </a-row> -->
         <a-row :gutter="24">
 
           <!-- <a-col :span="12">
@@ -157,7 +156,7 @@
             </a-form-item>
           </a-col> -->
         </a-row>
-        <a-row :gutter="24">
+        <!-- <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item
               label="宸ユ椂瀹氶"
@@ -174,7 +173,7 @@
             </a-form-item>
           </a-col>
 
-        </a-row>
+        </a-row> -->
         <a-row :gutter="24">
           <a-col :span="24">
             <a-form-item

--
Gitblit v1.9.3