From 513e1bdf4b2703409d9e4dbb776e67ffa0c134a6 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 09:52:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web

---
 src/views/search/search.vue |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/search/search.vue b/src/views/search/search.vue
index 28b2faf..546e6f9 100644
--- a/src/views/search/search.vue
+++ b/src/views/search/search.vue
@@ -7,20 +7,37 @@
         placeholder="璇疯緭鍏ュ湴鍚�"
       >
         <template #suffix>
-          <el-icon title="娓呴櫎" @click="setSearchClose" class="el-input__icon">
+          <el-icon
+            title="娓呴櫎"
+            @click="setSearchClose"
+            class="el-input__icon"
+          >
             <Close />
           </el-icon>
         </template>
         <template #prefix>
-          <el-icon @click="setSearchClick" title="鏌ヨ" class="el-input__icon">
+          <el-icon
+            @click="setSearchClick"
+            title="鏌ヨ"
+            class="el-input__icon"
+          >
             <search />
           </el-icon>
         </template>
       </el-input>
     </div>
-    <div v-if="searchFLag" class="search_content">
-      <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item title="鏌ヨ缁撴灉" name="1">
+    <div
+      v-if="searchFLag"
+      class="search_content"
+    >
+      <el-collapse
+        v-model="activeNames"
+        @change="handleChange"
+      >
+        <el-collapse-item
+          title="鏌ヨ缁撴灉"
+          name="1"
+        >
           <div class="search_content_text">鎬绘煡璇㈢粨鏋�:{{ listData.count }}</div>
           <div class="search_content_text paging">
             鎬婚〉鏁帮細{{ listData.page }}
@@ -70,7 +87,7 @@
                 @click="setPointLocal(item)"
               >
                 <div class="table_th_x">{{ flag + 1 }}</div>
-                <div class="table_th">{{ item.enName }}</div>
+                <div class="table_th">{{ item.name }}</div>
               </div>
             </div>
           </div>
@@ -95,7 +112,7 @@
   ArrowRight,
   DArrowRight,
 } from "@element-plus/icons-vue";
-import config from "@/assets/js/Map/config";
+// import config from "../../../public/config/config.js";
 import { dataQuery_selectByPage } from "@/api/api.js";
 import { ElMessage } from "element-plus";
 let searchValue = ref("");
@@ -109,15 +126,13 @@
   pageSize: 10,
 });
 const imageLabel = null;
-const NumhandleChange = (value: number) => {
-  console.log(value);
-};
-const handleChange = (val: string[]) => {
-  console.log(val);
-};
+const NumhandleChange = (value: number) => {};
+const handleChange = (val: string[]) => {};
 const setPoitCannel = () => {
-  imageLabel.deleteObject();
-  imageLabel = null;
+  if (imageLabel) {
+    imageLabel.deleteObject();
+    imageLabel = null;
+  }
 };
 const setPointLocal = (res) => {
   if (imageLabel) {
@@ -126,7 +141,7 @@
   var position = { X: res.lon, Y: res.lat, Altitude: 10 };
   imageLabel = window.sgworld.Creator.CreateImageLabel(
     position,
-    config.StaticFileBaseUrl + "/Workers/image/mark.png",
+    config.StaticFileBaseUrl + "/Workers/image/location.png",
     {},
     0,
     "鏍囩鐐�"
@@ -185,7 +200,7 @@
     filter: "name like '" + searchValue.value + "'",
     pageIndex: listData.value.pageIndex,
     pageSize: listData.value.pageSize,
-    name: "lunarplacenane",
+    name: "lunarplacename",
     hasGeom: 1,
   };
   const data = await dataQuery_selectByPage(obj);
@@ -206,7 +221,8 @@
   // height: auto;
   position: absolute;
   top: 0;
-  right: -277px;
+  right: -270px;
+  z-index: 101;
 }
 .searchInput {
   width: 243px;
@@ -220,6 +236,7 @@
   width: 243px;
   //   background: rgba(7, 8, 14, 0.8);
   border-radius: 4px;
+  z-index: 40px;
   .el-collapse,
   /deep/ .el-collapse-item__wrap {
     border: 0;

--
Gitblit v1.9.3