From 12fb4b8e4fb75347b25f3ba473b930408ed2ec05 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 22 九月 2023 17:49:18 +0800
Subject: [PATCH] 1、优化查询时若无选择日期的提示信息 2、增加部分加载时间较长的数据的加载动画
---
src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index 0c5a80c..fa95c5d 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -15,7 +15,7 @@
<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5" :xs="5">
+ <a-col :md="4" :sm="4" :xs="4">
<a-form-item label="鏃ユ湡">
<a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' @change="dataChange"/>
</a-form-item>
@@ -38,7 +38,7 @@
</a-select>灏忔椂
</a-form-item>
</a-col>
- <a-col :md="2" :sm="3" :xs="3">
+ <a-col :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-col>
<!--<a-col :md="2" :sm="2" :xs="2">-->
@@ -209,7 +209,7 @@
series: [
{
name: '鍒╃敤鐜�',
- type: 'bar',
+ type: 'line',
barWidth: 50,
itemStyle: {
normal: {
@@ -237,7 +237,7 @@
},
handleChange(value) {
this.queryParam.timeType = value
- console.log(this.queryParam.timeType)
+ // console.log(this.queryParam.timeType)
},
tabChange(val) {
this.activeKey = val
@@ -255,10 +255,14 @@
for(var i = 0;i<res.result.dayRateDto.length;i++){
this.useingRates.push(res.result.dayRateDto[i].utilizationRate)
}
- console.log(this,spaceTime)
+ // console.log(this,spaceTime)
this.drawTu()
} else {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -272,35 +276,47 @@
}
},
searchQuery(){
- this.spaceTime = []
- this.useingRates = []
- if(this.queryParams.typeTree == "1"){
- this.queryParams.parentId = this.queryParamEquip.parentId
- // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
+ if(this.queryParam.dateTime){
+ this.spaceTime = []
+ this.useingRates = []
+ if(this.queryParams.typeTree == "1"){
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- }else{
- this.queryParams.parentId = this.queryParamEquip.parentId
-
- // this.queryParams.equipmentId = ""
- }
- this.AnalysisList = [];
- //鑾峰彇鏌ヨ鏉′欢
- this.queryParam.parentId = this.queryParams.parentId;
- this.queryParam.equipmentId = this.queryParams.equipmentId;
- this.queryParam.typeTree = this.queryParams.typeTree
- getAction(this.url.dayUtilizationRate,this.queryParam).then((res) => {
- if(res.success){
- this.spaceTime=res.result.dateList
- for(var i = 0;i<res.result.dayRateDto.length;i++){
- this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
- }
- this.drawTu()
}else{
- this.$message.warning(res.message)
+ this.queryParams.parentId = this.queryParamEquip.parentId
+
+ // this.queryParams.equipmentId = ""
}
- }).finally(() => {
- this.loading = false
- })
+ this.AnalysisList = [];
+ //鑾峰彇鏌ヨ鏉′欢
+ this.queryParam.parentId = this.queryParams.parentId;
+ this.queryParam.equipmentId = this.queryParams.equipmentId;
+ this.queryParam.typeTree = this.queryParams.typeTree
+ getAction(this.url.dayUtilizationRate,this.queryParam).then((res) => {
+ if(res.success){
+ this.spaceTime=res.result.dateList
+ for(var i = 0;i<res.result.dayRateDto.length;i++){
+ this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate))
+ }
+ this.drawTu()
+ }else{
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ }else{
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨鏃堕棿'
+ });
+ }
+
},
searchReset() {
this.spaceTime = []
@@ -331,7 +347,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -363,7 +383,11 @@
}
this.drawTu()
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -385,10 +409,19 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
})
},
@@ -406,10 +439,18 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
}
--
Gitblit v1.9.3