From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
index 9f83208..7a6779f 100644
--- a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
@@ -21,7 +21,7 @@
<a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
</a-form-item>
</a-col>
- <a-col :md="7" :sm="7" :xs="7">
+ <a-col :md="6" :sm="6" :xs="6">
<a-form-item label="鏃堕棿娈�">
<a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
鑷�
@@ -125,6 +125,7 @@
// this.$set(this.queryParam, 'tierName', val.title)
this.queryParamEquip.parentId = ''
this.queryParams.equipmentId = val.equipmentId
+ this.queryParams.equipmentName = val.equipmentName
this.queryParamEquip.equipmentId = val.equipmentId
this.searchQuery()
} else {
--
Gitblit v1.9.3