From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index 223771c..84b8f99 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -22,7 +22,7 @@
                                  @change="dataChange"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="4" :xs="4">
+              <a-col :md="3" :sm="3" :xs="3">
                 <a-form-item label="闂撮殧">
                   <a-select default-value="2" style="width: 80px" v-model="queryParam.timeType">
                     <a-select-option :value="2">
@@ -138,6 +138,8 @@
             // this.$set(this.queryParam, 'tierName', val.title)
             this.queryParamEquip.parentId = ''
             this.queryParams.equipmentId = val.equipmentId
+            this.queryParams.equipmentName = val.equipmentName
+            console.log('XXXval=', val)
             this.queryParamEquip.equipmentId = val.equipmentId
             this.searchQuery()
           } else {

--
Gitblit v1.9.3