Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web

WX

2023-09-13 513e1bdf4b2703409d9e4dbb776e67ffa0c134a6

 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);
@@ -221,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;