Merge remote-tracking branch 'origin/dev_v2_sbj' into dev_v2_sbj

src/utils/map/ArcgisUtil.js

@@ -1,5 +1,7 @@
 //加载地图控件
 import CityGis from "@/utils/map/CityGis.Bridge";
+import { ElMessage } from 'element-plus'
+import 'element-plus/es/components/message/style/css'
 let bridge
 let calculateFinish = false
 
@@ -12,6 +14,7 @@ export function initBridge(){
             console.log("地图创建完成");
         }
     });
+
     bridge.addEventListener((arg) => {
         switch (arg.action) {
             case "MapIsReady":
@@ -211,7 +214,7 @@ export function calculation(type){
     bridge.addEventListener((arg) => {
         if(arg.action == "Calculation" && calculateFinish == false){
             calculateFinish = true
-            alert("测量结果：" + arg.data.result)
+            ElMessage.warning("测量结果：" + arg.data.result)
         }
     });
 }

src/views/home/Header.vue

@@ -66,7 +66,7 @@ export default {
   import {ElMessage} from "element-plus";
 
   // 地图方法
-  import {fullExtent,calculation} from "@/utils/map/ArcgisUtil"
+  import {fullExtent,calculation,clearMap} from "@/utils/map/ArcgisUtil"
 
 
 
@@ -130,23 +130,23 @@ export default {
           }else if (name == 'cm') {
             calculation('area')
           }
+          else if (name == 'qc') {
+            clearMap()
+            i.click =  !i.click ;
+            i.checkIoc = !i.checkIoc;
+          }
         }else {
-
           // 取消
-          if (name == 'qj') {
-            //返回全景
-            fullExtent();
-          } else if (name == 'ss') {
+          if (name == 'ss') {
             togglePageAside()
           }else if (name == 'cl') {
-
-            calculation('distance')
-
+            clearMap()
           }else if (name == 'cm') {
-
-            calculation('area')
-
+            clearMap()
+          }else if (name == 'qc') {
+            clearMap()
           }
+
         }
 
       }

src/views/home/Home.vue

@@ -23,6 +23,7 @@ import ComPage from '@/views/home/ComPage'
 import { asideShow } from '@/store/index'
 import Map from '@/views/map/Index.vue'
 import {ref} from 'vue'
+import {setShip} from "@/utils/map/Boat";
 
 
 // 禁用鼠标右键
@@ -32,6 +33,9 @@ document.onselectstart=new Function("event.returnValue=false;")
 export default {
   name: 'HomePage',
   components: { HomeHeader, TabSwitch, RouterView, UeVideo, ComPage ,Map},
+  mounted() {
+    setShip()
+  },
   setup() {
     const aside_hide = asideShow().isHide
     return {

src/views/home/cpns/tools/Tools.vue

@@ -33,7 +33,7 @@ onMounted(() => {
 onBeforeUnmount(() => {
 })
   const  itemForAll=ref({
-    data: [
+    data: [{ name: '船舶',  indexName: 'cb' ,click:false},
       { name: '码头',  indexName: 'fd' ,click:false},
       { name: '泊位',  indexName: 'sx' ,click:false},
       { name: '航道',  indexName: 'qj' ,click:false},
@@ -57,7 +57,7 @@ onBeforeUnmount(() => {
   align-items: center;
   top: 10vh;
   .Tool-level{
-    height: 515px;
+    height: 585px;
     width: 290px;
     background: url('../../../../assets/imgs/header/tclbbg.png') no-repeat;
     background-size: 100%  100%;
@@ -70,7 +70,7 @@ onBeforeUnmount(() => {
       padding-left: 20px;
   }
     .Tool-Border{
-       height: 300px;
+       height: 430px;
        width: 100%;
         flex-direction: column;
         justify-content: space-between;