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/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
index 837aebc..9b0c3eb 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
@@ -1,19 +1,19 @@
<template>
<a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading"
- :okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
+ @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
+ <a-input :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
v-decorator="['equipmentId',validatorRules.equipmentId]"/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ <a-input :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
v-decorator="['equipmentName',validatorRules.equipmentName]"/>
</a-form-item>
</a-col>
@@ -46,21 +46,21 @@
<a-col :span="12">
<a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :disabled="disableSubmit" date-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏃ユ湡"
+ <j-date date-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏃ユ湡"
v-decorator="['efficientDate', validatorRules.efficientDate]"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label='鍔犲伐鏁伴噺' :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number :min="0" :disabled="disableSubmit" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
+ <a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea :maxLength="20" :disabled="disableSubmit" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
</a-col>
</a-row>
@@ -151,6 +151,21 @@
message: ""
},
],
+ },
+ duration:{
+ rules:[
+ {required:true,message:'璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿'}
+ ]
+ },
+ efficientDate:{
+ rules:[
+ {required:true,message:'璇烽�夋嫨鏃ユ湡'}
+ ]
+ },
+ processQuantity:{
+ rules:[
+ {required:true,message:'璇烽�夋嫨鍔犲伐鏁伴噺'}
+ ]
},
// mdcRepairType:{
// rules:[
@@ -281,11 +296,20 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇敼鎴愬姛")
+
+ // that.$message.success("淇敼鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"淇敼鎴愬姛"
+ });
// that.$message.success(res.message)
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3