From a8441611deb2a51bb16a0f85e83a2750840c18f4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 09 七月 2025 16:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
index faba4d8..7a6779f 100644
--- a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
@@ -1,6 +1,6 @@
<template>
<a-spin :spinning="loading">
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<div class="com_box">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
@@ -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"/>
鑷�
@@ -46,7 +46,7 @@
</div>
<!-- table鍖哄煙-end -->
</div>
- </a-card>
+ </div>
</a-spin>
</template>
@@ -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