From b4edf6ce42debe4edcc85414d9f6c0d41f480587 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 20 六月 2025 11:36:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue | 79 ---------------------------------------
1 files changed, 1 insertions(+), 78 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
index d291654..e24d024 100644
--- a/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
@@ -18,7 +18,7 @@
</a-col>
<a-col :md="4" :sm="4" :xs="4">
<a-form-item label="鏃ユ湡">
- <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD'
+ <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' :allow-clear="false"
@change="dataChange"/>
</a-form-item>
</a-col>
@@ -292,81 +292,6 @@
})
}
},
- searchReset() {
- this.spaceTime = []
- this.useingRates = []
- if (this.queryParams.typeTree == '1') {
- this.typeTree = this.queryParams.typeTree
- this.typeParent = this.queryParams.parentId
- this.typeEquipment = this.queryParams.equipmentId
- this.queryParams = {}
- this.queryParam = {}
- this.queryParams.typeTree = this.typeTree
- this.queryParams.parentId = this.typeParent
- if (this.queryParams.parentId != '') {
- this.queryParams.equipmentId = ''
- this.initEquipment()
- } else {
- if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
- this.queryParams.equipmentId = this.typeEquipment
- } else {
- this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- }
- }
- getAction(this.url.dayUtilizationRate, this.queryParams).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.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
- } else {
- this.typeTree = this.queryParams.typeTree
- this.typeParent = this.queryParams.parentId
- this.typeEquipment = this.queryParams.equipmentId
- this.queryParams = {}
- this.queryParam = {}
- this.dates = []
- this.queryParams.typeTree = this.typeTree
- this.queryParams.parentId = this.typeParent
- if (this.queryParams.parentId != '') {
- this.queryParams.equipmentId = ''
- this.initEquipment()
- } else {
- if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
- this.queryParams.equipmentId = this.typeEquipment
- } else {
- this.queryParams.equipmentId = this.queryParamEquip.equipmentId
- }
- }
- getAction(this.url.dayUtilizationRate, this.queryParams).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.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- }).finally(() => {
- this.loading = false
- })
- }
-
- },
initEquipment(id) {
let _this = this
getAction(this.url.getEquipmentByPid, { pid: id }).then((res) => {
@@ -423,9 +348,7 @@
},
created() {
let collectTime = moment(moment().add(-1, 'd'), 'YYYY-MM-DD')
-
this.queryParams.collectTime = collectTime
-
this.queryParam.dateTime = this.queryParams.collectTime.format('YYYYMMDD')
this.queryParams.typeTree = '1'
this.initEquipment()
--
Gitblit v1.9.3