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/comparativeAnalysis/comparativeAnalysismain.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
index e903acd..185e5e6 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue
@@ -27,6 +27,7 @@
:data-source="driveTypeList"
placeholder="椹卞姩绫诲瀷"
:filter-option="filterOption"
+ :allowClear="true"
/>
</a-form-item>
</a-col>
@@ -61,7 +62,7 @@
<!-- table鍖哄煙-end -->
</div>
- <selectDeviceModal ref="selectDeviceModal" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"></selectDeviceModal>
+ <SelectDeviceDrawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"></SelectDeviceDrawer>
</div>
</template>
@@ -84,7 +85,7 @@
import Tooltip from 'ant-design-vue/es/tooltip'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import api from '@/api/mdc'
- import selectDeviceModal from '../../../../system/modules/SelectDeviceModal.vue'
+ import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer.vue'
export default {
name: 'comparativeAnalysismain',
@@ -98,7 +99,7 @@
JInput,
JDate,
JEllipsis,
- selectDeviceModal
+ SelectDeviceDrawer
},
props: { nodeTree: '', Type: '', nodePeople: '' },
data() {
@@ -438,11 +439,10 @@
// },
deviceSearch() {
console.log('瑙﹀彂')
- this.$refs.selectDeviceModal.visible = true
- this.$refs.selectDeviceModal.selectedRowKeys = []
- this.$refs.selectDeviceModal.selectedRows = []
- this.$refs.selectDeviceModal.checkedKeys = this.queryParam.equipmentId.split(',')
- this.$refs.selectDeviceModal.expandAll()
+ this.$refs.selectDeviceDrawer.visible = true
+ this.$refs.selectDeviceDrawer.selectedRowKeys = []
+ this.$refs.selectDeviceDrawer.selectedRows = []
+ this.$refs.selectDeviceDrawer.checkedKeys = this.queryParam.equipmentId.split(',')
},
/**
--
Gitblit v1.9.3