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/equipmentScrap/EquipmentScrapModal.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue
index cf98f32..d54fbcb 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapModal.vue
@@ -5,6 +5,8 @@
     :maskClosable="false"
     switchFullscreen
     @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    :title="title"
     @cancel="handleCancel">
      <equipment-scrap-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
  </j-modal>
@@ -12,7 +14,7 @@
 
 <script>
 
-  import EquipmentScrapForm from './EquipmentScrapForm.vue'
+  import EquipmentScrapForm from  './EquipmentScrapForm'
 
   export default {
     name: 'EquipmentScrapModal',

--
Gitblit v1.9.3