修改船舶定位和企业定位

src/apis/other.js

@@ -2,19 +2,8 @@ import request from "@/request/index";
 
 export function GetSelectInfo(type) {
     return request({
-        url: '/digitalTwain/map/getMap',
-        method: "post",
-        data: {
-            // size: "10", //分页大小
-            // index: "1", //起始页
-            type:type, //1 代表企业 2 代表船舶
-                maxMapx:"20184",
-                minMapx:"-25939",
-                maxMapy:"2559",
-                inMapy:"-2238",
-                hour:"0.5"
-
-        },
+        url: 'DigitalTwin/businessManage/getCenterPortCompanyAndLandInfo',
+        method: "post"
     })
 }
 

src/utils/map/Boat.js

@@ -17,33 +17,54 @@ let showBoat = false;
 
 // 船舶定位
 export function locationBoat(mmsi,isShow){
+    console.log('船舶mmsi:'+mmsi)
     if(isShow){
-        GetHpjShip().then(res=>{
-            let data = res.Result.data
-            let boats = {
-                "scale": 2000,
-                "goto": true,
-                "data": []
-            }
-            for(let i=0;i<data.length;i++){
-                if(data[i].DEVICEID == mmsi){
-                    let boat = {
-                        "mmsi": data[i].DEVICEID,
-                        "shipNameCn": data[i].BOATNAME,
-                        "shipTypeName": data[i].SHIPTYPENAME,
-                        "direction": data[i].DIRECTION,
-                        "velocity": data[i].VELOCITY,
-                        "shipBreadth": data[i].SHIPBREADTH,
-                        "shipLength": data[i].SHIPLENGTH,
-                        "mapx": data[i].MAPX,
-                        "mapy": data[i].MAPY
+            GetHpjShip().then(res=>{
+                let data = res.Result.data
+                let boats = {
+                    "scale": 2000,
+                    "goto": true,
+                    "data": []
+                }
+                // let have= data.filter(i=>i.DEVICEID.includes(mmsi))[0]
+                // if (have)
+                // {
+                //     let boat = {
+                //         "mmsi":have.DEVICEID,
+                //         "shipNameCn": have.BOATNAME,
+                //         "shipTypeName": have.SHIPTYPENAME,
+                //         "direction":have.DIRECTION,
+                //         "velocity": have.VELOCITY,
+                //         "shipBreadth": have.SHIPBREADTH,
+                //         "shipLength":have.SHIPLENGTH,
+                //         "mapx": have.MAPX,
+                //         "mapy": have.MAPY
+                //     }
+                //     boats.data.push(boat)
+                // }
+                for(let i=0;i<data.length;i++){
+                    if(data[i].DEVICEID == mmsi){
+                        let boat = {
+                            "mmsi": data[i].DEVICEID,
+                            "shipNameCn": data[i].BOATNAME,
+                            "shipTypeName": data[i].SHIPTYPENAME,
+                            "direction": data[i].DIRECTION,
+                            "velocity": data[i].VELOCITY,
+                            "shipBreadth": data[i].SHIPBREADTH,
+                            "shipLength": data[i].SHIPLENGTH,
+                            "mapx": data[i].MAPX,
+                            "mapy": data[i].MAPY
+                        }
+                        boats.data.push(boat)
                     }
-                    boats.data.push(boat)
                 }
-            }
-            // console.log('定位：'+JSON.stringify(boats))
-            addBoats(boats)
-        })
+                debugger;
+                // console.log('定位：'+JSON.stringify(boats))
+                addBoats(boats)
+            })
+
+
+
     }else{
         if (!showBoat){
             clearMap({is_draw: false, is_search:false, layers: ['boatLayer','boatPathLayer','boatGraphicLayer']})

src/views/home/ComPage.vue

@@ -36,9 +36,9 @@ bus.on('ueRec_BoatClick', (data) => {
   bus.emit('closeAllBoatDockList')
 })
 watch(boatPanelShow, (newValue, oldValue) => {
- if (!newValue){
-   locationBoat( null,false)
- }
+ // if (!newValue){
+ //   locationBoat( null,false)
+ // }
  clearBoatHistoryPath()
 });
 

src/views/home/SelectForUnit.vue

@@ -14,7 +14,7 @@
         </div>
         <div v-if="showSelect"  class="select_body">
               <ul>
-                  <li  v-for="item in selectBodyShow" @click="selectOneBody(item)"><i></i><p>{{selectValue==1? item.companyName : item.shipName}}</p></li>
+                  <li  v-for="item in selectBodyShow" @click="selectOneBody(item)"><i></i><p>{{selectValue==1? item.unitName : item.BOATNAME}}</p></li>
               </ul>
         </div>
     </div>
@@ -33,6 +33,9 @@
     import {GetSelectInfo} from "@/apis/other"
     import bus from '@/utils/bus'
 
+    import {locationUnit} from "@/utils/map/OperationSupervision";
+    import {GetHpjShip} from "@/apis/ship";
+
     const  selectType=ref([{key:'1',name:"企业"},{key:'2',name:"船舶"}])
     const showSelect = ref(false)
     let   selectValue=ref('1')
@@ -53,10 +56,10 @@
 
         if(inputValue.value!=null || inputValue.value!='') {
             if (selectValue.value === '1') {
-                selectBodyShow.value = selectBody.value.filter(i =>  i.companyName!=null?i.companyName.includes(inputValue.value):null)
+                selectBodyShow.value = selectBody.value.filter(i =>  i.unitName!=null?i.unitName.includes(inputValue.value):null)
             } else {
                 console.log('类型为2')
-                selectBodyShow.value = selectBody.value.filter(i => i.shipName!=null?i.shipName.includes(inputValue.value):null)
+                selectBodyShow.value = selectBody.value.filter(i => i.BOATNAME!=null?i.BOATNAME.includes(inputValue.value):null)
             }
         }else {
             selectBodyShow.value=selectBody.value
@@ -74,27 +77,45 @@
 
 
     function getSelectBody(type) {
-        GetSelectInfo(type).then(res=>{
-            if (res.data!=null && res.data!=undefined && res.data!='')
-            {
-                selectBody.value= res.data.Rows
-                selectBodyShow.value=res.data.Rows
-                // totalForVido.value= res.data.TotalRowCount
-            }
-        })
+        if(type==1)
+        {
+            GetSelectInfo(type).then(res=>{
+                if (res.data!=null && res.data!=undefined && res.data!='')
+                {
+                    selectBody.value= res.data.Rows
+                    selectBodyShow.value=res.data.Rows
+                    // totalForVido.value= res.data.TotalRowCount
+                }
+            })
+        }else {
+            GetHpjShip().then(res=>{
+                selectBody.value= res.Result.data
+                selectBodyShow.value=res.Result.data
+            })
+        }
+
     }
 
     function selectOneBody(item) {
     console.log(selectValue.value)
         if (selectValue.value=='1')
         {
-            inputValue.value=item.companyName
+            inputValue.value=item.unitName
             inputKey.value=item.certNumber
+            let data={
+                name:item.unitName,
+                certNumber:item.certNumber,
+                mapx:item.shape.x,
+                mapy:item.shape.y
+
+            }
+            locationUnit(null,false)
+            locationUnit(data,true)
         }else {
 
-            inputValue.value=item.shipName
-            inputKey.value=item.mmsi
-            bus.emit('ueRec_BoatClick',{'mmsi':item.mmsi})
+            inputValue.value=item.BOATNAME
+            inputKey.value=item.DEVICEID
+            bus.emit('ueRec_BoatClick',{'mmsi':item.DEVICEID})
         }
 
 }