From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue | 97 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
index ba6250a..0ed4b81 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
@@ -5,45 +5,30 @@
<a-form :form="form">
<a-row :gutter="24">
<a-col :span="24">
- <a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
+ <a-form-item label="鐝閫夋嫨" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-input-search :readOnly="true" v-decorator="['calendarId', validatorRules.calendarId]"
@search="deviceSearch" enter-button/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨鏃堕棿"
- v-decorator="['torqueDate', validatorRules.torqueDate]"></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="['torqueValue', validatorRules.torqueValue]"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <a-col :span="12">
<a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
- v-decorator="['startDate',validatorRules.startDate]"/>
+ v-decorator="['startTime',validatorRules.startTime]" valueFormat="HH:mm:ss"/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
-
<a-col :span="12">
<a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
- v-decorator="['endDate',validatorRules.endDate]"/>
+ v-decorator="['endTime',validatorRules.endTime]" valueFormat="HH:mm:ss"/>
</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" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
</a-col>
</a-row>
@@ -88,7 +73,7 @@
span: 24
},
sm: {
- span: 6
+ span: 8
}
},
wrapperCol: {
@@ -96,7 +81,7 @@
span: 24
},
sm: {
- span: 18
+ span: 16
}
},
labelColLong: {
@@ -104,7 +89,7 @@
span: 24
},
sm: {
- span: 3
+ span: 4
}
},
wrapperColLong: {
@@ -112,7 +97,7 @@
span: 24
},
sm: {
- span: 21
+ span: 20
}
},
confirmLoading: false,
@@ -126,11 +111,35 @@
},
],
},
+ calendarId:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鐝"
+ },
+ ],
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
+ },
+ ],
+ },
},
url: {
- add: '/mdc/MdcTorqueConfig/addMdcTorqueConfig',
- edit: '/mdc/MdcTorqueConfig/editMdcTorqueConfig'
+ add: '/mdc/mdcEquipmentOvertime/add',
+ edit: '/mdc/mdcEquipmentOvertime/edit'
},
disableSubmit: true,
@@ -161,17 +170,17 @@
this.endTime = dateStrings[0];
},
getDeviceRows(val) {
- var equipmentIds;
+ var calendarId;
for(var i = 0;i<val.length;i++){
if (i == 0) {
- equipmentIds = val[i].equipmentId;
+ calendarId = val[i].id;
} else {
- equipmentIds = equipmentIds + "," + val[i].equipmentId;
+ calendarId = calendarId + "," + val[i].id;
}
}
// console.log("========",equipmentIds);
this.form.setFieldsValue({
- equipmentIds: equipmentIds,
+ calendarId: calendarId,
})
// this.form.setFieldsValue({
// equipmentId: val.equipmentId,
@@ -234,23 +243,15 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- // let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
- // let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
- // let startOne = start.replace(/:/g,'');
- // let endOne = end.replace(/:/g,'');
- // var data = new Date();
- // let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
- // let dataStart = stertDate.replace(/:/g,'');
- // if(startOne < dataStart){
- // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
- // that.confirmLoading = false
- // }else{
- // if(startOne>=endOne){
- // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
- // // console.log(this.model)
- // // this.endTime = ''
- // that.confirmLoading = false
- // }else{
+ let startOne = formData.startTime.replace(/:/g,'');
+ let endOne = formData.endTime.replace(/:/g,'')
+ if(startOne>=endOne){
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
+ that.confirmLoading = false
+ }else{
let obj
if (!this.model.id) {
obj = postAction(this.url.add, formData)
@@ -280,7 +281,7 @@
that.close()
})
}
- // }
+ }
// }
})
--
Gitblit v1.9.3