Merge branch 'main' of http://123.132.248.154:10000/gitY/LanLingXiangMu

src/api/demo/system.ts

@@ -139,6 +139,7 @@ enum Api {
   CaseOffenceMinerals = '/api/DroneCaseInfoMinerals/CaseOffenceMinerals',
   // 非法采矿-统计列表New
   CaseOffenceMineralsNew = '/api/DroneCaseInfoMinerals/CaseOffenceMineralsNew',
+  GetDronssnydList = '/api/DroneSsny/GetDronssnydList',
 }
 export const getPositionsTree = (params?: AccountParams) =>
   defHttp.get<AccountListGetResultModel>({ url: Api.PositionsTree, params });
@@ -409,6 +410,12 @@ export function homePageLoadCaseInfoTuBanList(type,params) {
     params,
   });
 }
+export function getDronssnydList(params) {
+  return defHttp.get({
+    url: Api.GetDronssnydList,
+    params,
+  });
+}
 export function loadCaseInfoTuBanList(params) {
   return defHttp.get({
     url: Api.LoadCaseInfoTuBanList,

src/views/sys/exception/Converge/SearchComponent.vue

@@ -21,7 +21,7 @@
     <div class="search-container">
       <div class="search-input">
         <a-input
-          placeholder="请输入图斑号或位置"
+          placeholder="请输入项目名称或位置名称"
           v-model:value="keyword"
           allow-clear
           @blur="onInputBlue"
@@ -67,7 +67,7 @@
   import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons-vue';
   import axios from 'axios';
   import { getLoadDroneCaseInfoDetail, getPolygonCenter } from '@/api/tiankongdi/index';
-  import { homePageLoadCaseInfoTuBanList } from '@/api/demo/system';
+  import { getDronssnydList} from '@/api/demo/system';
   import { getLoadCaseInfoMineralsTuBanList } from '@/api/minerals/index';
   import { WktToGeojson } from '@/components/MapboxMaps/src/WktGeojsonTransform';
   import { transformGCJ2WGS } from '@/utils/EpsgTransform';
@@ -194,53 +194,30 @@
   const keyword = ref('');
 
   async function searchArea() {
-    if (keyword.value.match(/^[0-9A-Z]+(-\d)*$/)) {
+      // 清空结果
       searchResult.value = [];
-      if (subjectName.value == '非法采矿') {
+      
-        let mainRes = await getLoadCaseInfoMineralsTuBanList({
+      // 项目搜索
-          tubannum_base: keyword.value,
+      let ress = await getDronssnydList({xiangmumc:keyword.value,page:1,limit:10});
-          page: 1,
+      
-          limit: 10,
+      if(ress.items.length>0){
-        });
+        ress?.items?.forEach((item,index)=>{
-        searchResult.value = [];
-        mainRes?.items?.forEach((item, index) => {
             let obj = {
-            id: item.tubannum_base,
+              id: item.xiangmu_name,
-            county: item.weizhixianname_base,
-            street: item.weizhizhenname_base,
-            location: null,
-            type: 'main',
-          };
-          searchResult.value.push(obj);
-        });
-      } else {
-        let res = await homePageLoadCaseInfoTuBanList(subjectName.value, {
-          caseNo: keyword.value,
-          page: 1,
-          limit: 10,
-        });
-        res?.items?.forEach((item, index) => {
-          let obj = {
-            id: item.caseno,
-            county: item.countyname,
               street: item.streetname,
-            location: null,
+              location: "",
             };
             searchResult.value.push(obj);
-        });
+        })
       }
-      showSearchResult.value = true;
+
-    } else {
       // 地名搜索
-      axios
+      axios.get(
-        .get(
         'https://restapi.amap.com/v5/place/text?&key=ee7f561fae9249aeb971bcc661083438&keywords=' +
           keyword.value +
           '&region=371300&citylimit=true&page_num=1&page_size=10',
-        )
+      ).then((res) => {
-        .then((res) => {
         if (res.data.info == 'OK') {
-            searchResult.value = [];
           res.data?.pois?.forEach((item, index) => {
             let obj = {
               id: item.name,
@@ -254,15 +231,14 @@
         }
       });
   }
-  }
 
   watch(
     () => keyword.value,
     (newVal) => {
-      if (!newVal) {
+      // if (!newVal) {
-        showSearchResult.value = false;
+      //   showSearchResult.value = false;
-        searchResult.value = [];
+      //   searchResult.value = [];
-      }
+      // }
     },
   );
   // 抛出函数

src/views/sys/exception/Converge/index.vue

@@ -128,7 +128,7 @@
       },
       maxZoom: 22,
       minZoom: 8,
-      zoom: 9.6,
+      zoom: 9.8,
       pitch: 0,
       center: [117.97256,34.85481],
     }); 
@@ -753,7 +753,7 @@
         'line-color': '#42befb', // 设置线的颜色
         'line-width': 1, // 设置线的宽度
       },
-      minzoom: 10,
+      minzoom: 9,
       maxzoom: 24,
     })
     map.addSource("zhenjiepoint", {
@@ -778,7 +778,7 @@
         'text-halo-color': '#fff',
         'text-halo-width': 2,
       },
-      minzoom: 10,
+      minzoom: 9,
       maxzoom: 24,
     });
   };

src/views/sys/exception/mapComponent/layers/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <div :class="`layer-list-container ${openLayer? '': 'layer-list-container-close'}`" >
+    <div :class="`layer-list-container ${openLayer? '': 'layer-list-container-close'}`" v-show="false">
-        <div class="title">
+        <div class="title" >
           图层资源
           <div class="hidden-button" @click="openLayer = !openLayer">
             <!-- <Icon v-if="openLayer" :icon="'ic:outline-unfold-less'" :size="18"/> -->
@@ -10,7 +10,7 @@
           </div>
         </div>
         <div class="layers-container">
-          <p class="cate-name">
+          <p class="cate-name" v-if="false">
             历史影像
             <div style="float:right;position:relative;top:-4px;">
               <a-button style="flaot:right;" @click="drawPolygon" v-if="!drawState" size="small" type="primary">历史影像查询</a-button>
@@ -18,7 +18,7 @@
             </div>
           </p>
 
-          <div class="case-list">
+          <div class="case-list" v-if="false">
               <div class="case-item" v-for="item in historyLayerList" :key="index" >
                 <img src="/statistical/prove-icon.png" alt="" />
                   <a-checkbox v-model:checked="item.checked" @change="layerChange(item,'historyLayer')" >
@@ -38,11 +38,9 @@
               </div>
           </div>
 
+          <p class="cate-name" v-if="false" >专题图层</p>
 
-
+          <div class="case-list" v-if="false" >
-          <p class="cate-name">专题图层</p>
-
-          <div class="case-list">
             <div class="case-item" v-for="item in speciaLayerList" :key="index" >
               <img src="/statistical/prove-icon.png" alt="" />
               <a-checkbox v-model:checked="item.checked" @change="layerChange(item,'speciaLayer')" >
@@ -110,12 +108,13 @@
             id:"Data",
             name:"图斑数据",
             checked:false,
-        },
-        {
-            id:"Monitor",
-            name:"视频监控",
-            checked:false,
         }
+        // ,
+        // {
+        //     id:"Monitor",
+        //     name:"视频监控",
+        //     checked:false,
+        // }
     ])
 
     const historyLayerList = ref([