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/mdc/base/modules/EquipmentList/UserModal.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 1ff4d17..b942765 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -78,7 +78,7 @@
 
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="璁惧鍔熺巼" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="璁惧鍔熺巼(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ヨ澶囧姛鐜�"
                        v-model="model.devicePower"/>
             </a-form-model-item>
@@ -143,7 +143,7 @@
     </a-spin>
 
 
-    <div class="drawer-bootom-button" v-show="!disableSubmit">
+    <div class="drawer-bottom-button" v-show="!disableSubmit">
       <a-popconfirm title="纭畾鏀惧純鎿嶄綔锛�" @confirm="close" okText="纭畾" cancelText="鍙栨秷">
         <a-button style="margin-right: .8rem">鍙栨秷</a-button>
       </a-popconfirm>
@@ -228,7 +228,7 @@
         },
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
         },
         wrapperCol: {
           xs: { span: 24 },
@@ -611,7 +611,7 @@
     padding-bottom:10px;
   }
 
-  .drawer-bootom-button {
+  .drawer-bottom-button {
     position: absolute;
     bottom: -8px;
     width: 100%;

--
Gitblit v1.9.3