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/equipmentChange/EquipmentChangeDetailModal.vue |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue b/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
index 77e4976..9a5e818 100644
--- a/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
+++ b/src/views/eam/modules/equipmentChange/EquipmentChangeDetailModal.vue
@@ -15,13 +15,13 @@
         <a-row>
           <a-col :span='24'>
             <a-form-model-item label='鍗曟嵁鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
-              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
+              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿' :disabled="disableSubmit"></a-input>
             </a-form-model-item>
           </a-col>
 
           <a-col :span='24'>
             <a-form-model-item label='澶囨敞' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='remark'>
-              <a-textarea v-model='model.remark' rows="3" placeholder='璇疯緭鍏ュ娉�'></a-textarea>
+              <a-textarea v-model='model.remark' rows="3" placeholder='璇疯緭鍏ュ娉�' :disabled="disableSubmit"></a-textarea>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -31,6 +31,7 @@
       type='primary'
       :style="{ marginRight: '8px',marginBottom:'8px' }"
       :loading='confirmLoading'
+      :disabled="disableSubmit"
       @click='selectInspectionProjects()'
     >璁惧淇℃伅
     </a-button>
@@ -67,6 +68,7 @@
             placeholder='璇烽�夋嫨'
             v-if="col.dataIndex === 'afterDepartId'"
             :options='record.departVoList'
+            :disabled="disableSubmit"
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
           />
@@ -84,6 +86,7 @@
             v-if="col.dataIndex === 'afterManager'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.userVoList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -102,6 +105,7 @@
             v-if="col.dataIndex === 'afterUsageDepartId'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.departVoList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -120,6 +124,7 @@
           <a-input
             :value='text'
             placeholder="璇疯緭鍏ヨ矗浠荤彮缁�"
+            :disabled="disableSubmit"
             v-if="col.dataIndex === 'afterTeamId'"
             @change='(e)=>handleChange(e, record.key, col, index)'
           />
@@ -139,6 +144,7 @@
             v-if="col.dataIndex === 'afterFunctionary'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.userVoList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -150,6 +156,7 @@
             v-if="col.dataIndex == 'changeReason'"
             :maxLength="500"
             auto-size
+            :disabled="disableSubmit"
             placeholder="璇疯緭鍏ュ彉鍔ㄥ師鍥�"
             @change='(e)=>handleChange(e, record.key, col, index)'
           />
@@ -158,6 +165,7 @@
             :value='text'
             v-if="col.dataIndex === 'afterLocation'"
             placeholder='璇疯緭鍏ュ彉鍔ㄥ悗浣嶇疆'
+            :disabled="disableSubmit"
             @change='(e)=>handleChange(e, record.key, col, index)'
           />
 
@@ -165,6 +173,7 @@
             v-if="col.dataIndex === 'afterTechnologyStatus'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.technologyStatusList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -174,6 +183,7 @@
             v-if="col.dataIndex === 'afterEquipmentStatus'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.equipmentStatusList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -182,6 +192,7 @@
             v-if="col.dataIndex === 'changeType'"
             :value='text'
             placeholder='璇烽�夋嫨'
+            :disabled="disableSubmit"
             :options='record.changeTypeList'
             @change='(e) => handleChange(e, record.key, col, index)'
             style='width: 100%'
@@ -195,6 +206,7 @@
       >
         <a-popconfirm
           title='纭畾鍒犻櫎鍚�?'
+          :disabled="disableSubmit"
           @confirm='() => handleDelete(text,record, index)'
         >
           <a>鍒犻櫎</a>
@@ -212,6 +224,7 @@
       <a-button
         @click='handleOk()'
         type='primary'
+        :disabled="disableSubmit"
         :loading='confirmLoading'
       >纭畾
       </a-button>
@@ -258,7 +271,7 @@
           width: 50
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           width: 150,
           align: 'center',
           dataIndex: 'equipmentNum'

--
Gitblit v1.9.3