西海岸 BUG修改 扎点缺清除

front/src/views/home/infrastructurePage.vue

@@ -128,19 +128,19 @@
             预约
           </a-button>
         </div>
-        
+
         <!-- <div class="flex-space" style="justify-content: center;display:flex;height:40px;align-items:center;"> -->
         <a-pagination
           v-model:current="roomPage"
           v-model:pageSize="roomLimit"
           show-quick-jumper
-          :showTotal="total => `共 ${total} 项`"
+          :showTotal="(total) => `共 ${total} 项`"
           :total="roomTotal"
           :page-size-options="pageSizeOptions"
           @change="onRoomChange"
           @showSizeChange="onShowSizeChange"
           show-size-changer
-        /> 
+        />
         <!-- <el-button @click="onOkChange" class="queding" >确认</el-button>
 </div> -->
       </div>
@@ -266,7 +266,6 @@
         <a-form
           :model="formState"
           name="basic"
-       
           autocomplete="off"
           @finish="onFinish"
           @finishFailed="onFinishFailed"
@@ -2185,8 +2184,8 @@
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-        pageNum: mapSearchParam.value.pageNum,
-        pageSize: mapSearchParam.value.pageSize,
+        // pageNum: mapSearchParam.value.pageNum,
+        // pageSize: mapSearchParam.value.pageSize,
         longitude: mapSearchParam.value.gpsX || '',
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
@@ -2479,8 +2478,8 @@
   })
 </script>
 <style lang="less" scoped>
-.queding{
-  margin-left: 16px;
+  .queding {
+    margin-left: 16px;
     cursor: pointer;
     background: #0058e1;
     color: #ffffff;
@@ -2821,8 +2820,6 @@
       }
     }
 
-
-
     // :deep(.ant-pagination) {
     //   text-align: end;
     // }

front/src/views/home/infrastructurePageXha.vue

@@ -1991,8 +1991,8 @@
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-        pageNum: mapSearchParam.value.pageNum,
-        pageSize: mapSearchParam.value.pageSize,
+        // pageNum: mapSearchParam.value.pageNum,
+        // pageSize: mapSearchParam.value.pageSize,
         longitude: mapSearchParam.value.gpsX || '',
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',

front/src/views/home/videoSurveillance/index.vue

@@ -246,7 +246,7 @@ import { ElMessage } from 'element-plus'
       },
       // 查询
        querySearch (queryString, cb) {
-        console.log('querySearch',queryString, cb,this.restaurants)
+        console.log('querySearch',queryString)
         if(queryString){
           getListForPOI({keywords:queryString}).then(res => {
             if(res.data.data.rows[0]){
@@ -280,31 +280,6 @@ import { ElMessage } from 'element-plus'
           )
         }
       },
-      // 查询
-      handleEnter(queryString, cb){
-        console.log('查询',this.address,this.addressType)
-        if(this.address){
-          getListForPOI({keywords:this.address}).then(res => {
-            console.log('POI=========>',res.data.data)
-            if(res.data.data.rows[0]){
-              let arr = res.data.data.rows[0].location.split(',')
-              this.selectedAddress({location:{y:arr[1],x:arr[0]}})
-            }else{
-              ElMessage({
-                showClose: true,
-                message: '未查询到兴趣点！',
-                type: 'warning',
-              })
-            }
-          })
-        }else{
-          ElMessage({
-            showClose: true,
-            message: '请输入兴趣点！',
-            type: 'warning',
-          })
-        }
-      },
       selectedAddress(item, index) {
         mybus.emit('clearChoose')
         this.getCameraAllPage()
@@ -313,10 +288,16 @@ import { ElMessage } from 'element-plus'
         const latLng = {
           lat: item.location.y,
           lng: item.location.x,
+          lon: item.location.x,
         }
         this.hiMapFun.mapFlyTo(latLng)
         if(this.addressType=='2'){
           mybus.emit('openOperationPopup', [item]);
+        }else{
+          // this.hiMapFun.removeLayerByLayerName('potcon');
+          // this.hiMapFun.clearAllLayers();
+          // this.getCameraAllPage()
+          this.hiMapFun.addPointOnMap({feature:latLng,iconUrl:'poi-red.png',layerName:'potcon'})
         }
       },
       //框选
@@ -411,8 +392,8 @@ import { ElMessage } from 'element-plus'
             regionId:
               this.mapSearchParam.parentId ||
               '70be8c5b664f4bcf869d82f2e8335051',
-            pageNum: this.mapSearchParam.pageNum,
-            pageSize: this.mapSearchParam.type!=0?this.mapSearchParam.pageSize:10,
+            // pageNum: this.mapSearchParam.pageNum,
+            // pageSize: this.mapSearchParam.type!=0?this.mapSearchParam.pageSize:10,
             name: this.mapSearchParam.cameraName || '',
             longitude: this.mapSearchParam.gpsX || '',
             latitude: this.mapSearchParam.gpsY || '',
@@ -528,8 +509,8 @@ import { ElMessage } from 'element-plus'
         console.log('querySearch',queryString, cb,this.restaurants)
         if(queryString){
           getCameraByCondition({
-            pageNum: 1,
-            pageSize: 40000,
+            // pageNum: 1,
+            // pageSize: 40000,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,
@@ -556,8 +537,8 @@ import { ElMessage } from 'element-plus'
       getCameraAllPage(page) {
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
-        pageNum: "1",
-        pageSize: 1000,
+        // pageNum: "1",
+        // pageSize: 1000,
         // type: 1,
         borderPolygonList: []
         }