From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
index ff5ad89..0ed4b81 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item label="鐝閫夋嫨" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-input-search :readOnly="true" v-decorator="['ids', validatorRules.ids]"
+ <a-input-search :readOnly="true" v-decorator="['calendarId', validatorRules.calendarId]"
@search="deviceSearch" enter-button/>
</a-form-item>
</a-col>
@@ -15,13 +15,13 @@
<a-col :span="12">
<a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
- v-decorator="['startTime',validatorRules.startTime]"/>
+ v-decorator="['startTime',validatorRules.startTime]" valueFormat="HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
- v-decorator="['endTime',validatorRules.endTime]"/>
+ v-decorator="['endTime',validatorRules.endTime]" valueFormat="HH:mm:ss"/>
</a-form-item>
</a-col>
</a-row>
@@ -73,7 +73,7 @@
span: 24
},
sm: {
- span: 6
+ span: 8
}
},
wrapperCol: {
@@ -81,7 +81,7 @@
span: 24
},
sm: {
- span: 18
+ span: 16
}
},
labelColLong: {
@@ -89,7 +89,7 @@
span: 24
},
sm: {
- span: 3
+ span: 4
}
},
wrapperColLong: {
@@ -97,7 +97,7 @@
span: 24
},
sm: {
- span: 21
+ span: 20
}
},
confirmLoading: false,
@@ -108,6 +108,30 @@
{
required:true,
message: "璇烽�夋嫨璁惧"
+ },
+ ],
+ },
+ calendarId:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鐝"
+ },
+ ],
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
},
],
},
@@ -151,12 +175,12 @@
if (i == 0) {
calendarId = val[i].id;
} else {
- calendarId = ids + "," + val[i].id;
+ calendarId = calendarId + "," + val[i].id;
}
}
// console.log("========",equipmentIds);
this.form.setFieldsValue({
- ids: calendarId,
+ calendarId: calendarId,
})
// this.form.setFieldsValue({
// equipmentId: val.equipmentId,
@@ -219,21 +243,13 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- let start = moment(formData.startTime).format('HH:mm:ss');
- let end = moment(formData.endTime).format('HH:mm:ss');
- let startOne = start.replace(/:/g,'');
- let endOne = end.replace(/:/g,'');
- // var data = new Date();
- // let stertDate = moment(data).format("HH:mm:ss");
- // let dataStart = stertDate.replace(/:/g,'');
- // if(startOne < dataStart){
- // that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
- // that.confirmLoading = false
- // }else{
+ let startOne = formData.startTime.replace(/:/g,'');
+ let endOne = formData.endTime.replace(/:/g,'')
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
- // console.log(this.model)
- // this.endTime = ''
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
that.confirmLoading = false
}else{
let obj
--
Gitblit v1.9.3