From 942e784e3127a2234a3a66c761d9876a01dd7dcc Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 16 Apr 2025 20:23:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/SearchBox.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/views/Home/SearchBox.vue b/src/views/Home/SearchBox.vue
index e27cf63..46d23e7 100644
--- a/src/views/Home/SearchBox.vue
+++ b/src/views/Home/SearchBox.vue
@@ -21,7 +21,7 @@
:load="load"
:props="props"
style="width: 240px"
- @change="treeChange"
+ @node-click="handleNodeClick"
/>
</div>
</div>
@@ -47,9 +47,9 @@
const searchBoxRef = ref(null);
const selectDownRef = ref(null);
-function treeChange(value, node) {
- areaValue.value = node.label;
- store.commit('setSelectedAreaCode', value);
+function handleNodeClick(data) {
+ areaValue.value = data.name;
+ store.commit('setSelectedAreaCode', data.code);
}
const props = {
@@ -93,9 +93,7 @@
// 获取机巢搜索结果
const getDeviceList = async () => {
- const res = await selectDeviceList({
- keyword: searchKey.value,
- });
+ const res = await selectDeviceList({nickname: searchKey.value});
if (res.data.code !== 0) return;
machineNestList.value = res?.data?.data || [];
downList.value = res?.data?.data || [];
@@ -144,11 +142,12 @@
watch(searchKey, async (newVal) => {
if (optionsValue.value === '2') {
await getAddressList();
+ } else {
+ await getDeviceList();
}
}, { immediate: false });
onMounted(() => {
- getDeviceList();
document.addEventListener('click', handleClickOutside);
});
@@ -166,8 +165,8 @@
.select-down-list {
position: absolute;
top: 188px;
- left: 45%;
- transform: translateX(-45%);
+ left: 44%;
+ transform: translateX(-40%);
width: 220px;
height: 256px;
overflow-y: auto;
@@ -175,6 +174,7 @@
border-radius: 0px 0px 8px 8px;
border: 1px solid;
border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1;
+ opacity: 0.8;
&::-webkit-scrollbar {
width: 0;
display: none;
@@ -187,6 +187,11 @@
line-height: 32px;
text-align: center;
cursor: pointer;
+ &:hover {
+ background: linear-gradient( 90deg, rgba(0,122,255,0) 0%, rgba(0,98,204,0.6) 50%, rgba(0,73,153,0) 100%);
+ border: 1px solid;
+ border-image: linear-gradient(90deg, rgba(0, 199, 190, 0), rgba(48, 176, 199, 1), rgba(0, 199, 190, 0)) 1 1;
+ }
}
}
.searchBox {
--
Gitblit v1.9.3