From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1

---
 src/store/modules/mobile.js |  414 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 224 insertions(+), 190 deletions(-)

diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index f2ea162..cb8845d 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -2,49 +2,47 @@
 import axios from 'axios'
 
 import urlParameter from './mobiles/urlParameter'
-window.popupsDom = null; // mobileDivForms的实体类
-window.flytoPosition = null; // mobileDivForms的实体类
-window.ellipsoid = null;
-window.cartographic = null;
+window.popupsDom = null // mobileDivForms的实体类
+window.flytoPosition = null // mobileDivForms的实体类
+window.ellipsoid = null
+window.cartographic = null
 
-
-window.useHeight = null;
-window.vecLayer = null;
-window.vecLayer = null;
-window.pointLayer = null;
-window.drawALineLayerMany = null; //活动线
-window.drawALineLayerManycolor = null; //活动线颜色
-window.drawALineLayerManyStyle = null; //活动线样式
-window.drawALineLayerManypolyline = null; //活动线样式
-window.drawAPointLayerMany = null; //活动点
-window.drawAPointLayerManyposition = null; //活动点位置
-window.drawAPointLayerManyLabels = null; //活动点
+window.useHeight = null
+window.vecLayer = null
+window.vecLayer = null
+window.pointLayer = null
+window.drawALineLayerMany = null // 活动线
+window.drawALineLayerManycolor = null // 活动线颜色
+window.drawALineLayerManyStyle = null // 活动线样式
+window.drawALineLayerManypolyline = null // 活动线样式
+window.drawAPointLayerMany = null // 活动点
+window.drawAPointLayerManyposition = null // 活动点位置
+window.drawAPointLayerManyLabels = null // 活动点
 // window.tilesetLayer = null;
 // window.wallLayer = null;
-window.areaLayer = null;
-window.tileset = null;
-window.drawALineLayer = null; // 导航路径图层
-window.drawALineLayerGCJ02StartLngLat = null; // 导航路径图层转坐标
-window.drawALineLayerGCJ02EndLngLat = null; // 导航路径图层转坐标
-window.drawALineLayerdrawALine = null; // 导航路径画线方法
-window.drawALineLayerIcon = null; // 导航路径图层图标
-window.billboarddaohang = null; // 导航点
-window.positiondaohang = null; // 导航点位置
-window.polylinedaohang = null; // 导航线
-window.polylinematerialdaohang = null; // 导航线属性
+window.areaLayer = null
+window.tileset = null
+window.drawALineLayer = null // 导航路径图层
+window.drawALineLayerGCJ02StartLngLat = null // 导航路径图层转坐标
+window.drawALineLayerGCJ02EndLngLat = null // 导航路径图层转坐标
+window.drawALineLayerdrawALine = null // 导航路径画线方法
+window.drawALineLayerIcon = null // 导航路径图层图标
+window.billboarddaohang = null // 导航点
+window.positiondaohang = null // 导航点位置
+window.polylinedaohang = null // 导航线
+window.polylinematerialdaohang = null // 导航线属性
 
 window.select = {
     // 绿色图层控制显示
     overlay: undefined,
     color: undefined
-};
+}
 
-window.tancuanPosition = null;
+window.tancuanPosition = null
 
 // window.newLayer = null;
 // window.usetowpointfive = null;
 
-window.startPointFn = null;
 const mobile = {
     state: {
         ...urlParameter.state, // url参数
@@ -54,7 +52,7 @@
         popupTableName: [], // 全屏弹窗标签页数据
         mBigPopupAfter: false, /// /全屏弹窗之前的弹窗
         ips: '', // 获取的ip
-        iconHide: false, // 右侧伸缩状态
+        iconHide: true, // 右侧伸缩状态
         // DC: '',//DC全局保存
         MobileWindowsHide: true, // 改变点击窗口的显示状态
         MobileWindowChangeData: false, // 改变点击窗口的数据
@@ -75,8 +73,6 @@
             checked: '/img/leftnav/way-checked.png',
             layer: 'pointLayer'
         },
-        // 默认起始点函数
-        // startPointFn: '',
         dimension: '2.5D', // 维度
         dimensionData: {
             // 维度镜头数据
@@ -84,7 +80,7 @@
             pitch: -90,
             roll: 0
         },
-        zoomRange: [80, 200], // 缩放程度
+        zoomRange: [100, 1000], // 缩放程度
         frislayertHeight: 160, // 默认弹窗高度
         perspectiveControl: '', // 视角控制:高度、角度  ()=>{}
         perspectiveControls: '', // 视角控制:高度、角度  ()=>{}
@@ -123,60 +119,60 @@
         // drawALineLayerMany: null, // 活动路线图层
         // drawAPointLayerMany: null, // 活动点图层
         isOpenDrawALineMany: null, // 是否开启活动
-        seeRight: true // 右侧控制栏显影
+        seeRight: true, // 右侧控制栏显影
+        pinchFlag: false
     },
     mutations: {
         ...urlParameter.mutations, // url参数
         // MSET_VIEWER (state, viewer) {
         //     global.viewer = viewer
         // },
-        MSET_BIGPOPUP(state, viewer) {
+        SET_PINCHFLAG (state, pinchFlag) {
+            state.pinchFlag = pinchFlag
+        },
+        MSET_BIGPOPUP (state, viewer) {
             state.mBigPopup = viewer
             $store.dispatch('closeMobileWindowsDom') // 关闭弹窗
         },
-        MSET_BIGPOPUPAFTER(state, viewer) {
+        MSET_BIGPOPUPAFTER (state, viewer) {
             state.mBigPopupAfter = viewer
             $store.dispatch('closeMobileWindowsDom') // 关闭弹窗
         },
-        MSET_POPUPOUROPENDATA(state, viewer) {
+        MSET_POPUPOUROPENDATA (state, viewer) {
             state.popupOurOpenData = viewer
         },
-        MSET_ICONHIDE(state, viewer) {
+        MSET_ICONHIDE (state, viewer) {
             state.iconHide = viewer
         },
-        MSET_POPUPTABLENAME(state, viewer) {
+        MSET_POPUPTABLENAME (state, viewer) {
             state.popupTableName = viewer
         },
-        MSET_MOBILEWINDOWSHIDE(state, viewer) {
+        MSET_MOBILEWINDOWSHIDE (state, viewer) {
             // 随地图移动窗口
             state.MobileWindowChangeData = !state.MobileWindowChangeData
             state.MobileWindowsHide = viewer
         },
-        MSETCC_SETCC(state, viewer) {
+        MSETCC_SETCC (state, viewer) {
             state.ccDataState = !state.ccDataState // 专门测试
             state.query = viewer
         },
         // MSET_POPUPDOM(state, viewer) {
         //     window.popupsDom = viewer
         // },
-        MSET_QUERY(state, viewer) {
+        MSET_QUERY (state, viewer) {
             state.query = viewer
         },
-        MSET_OPENMOBILEGOTO(state, viewer) {
+        MSET_OPENMOBILEGOTO (state, viewer) {
             state.openmobileGoTo = viewer
         },
-        MSET_OPENMOBILEPANORAMA(state, viewer) {
+        MSET_OPENMOBILEPANORAMA (state, viewer) {
             state.openmobilePanorama = viewer
         },
-        MSET_MOBILEWINDOWSHIDEFIXED(state, viewer) {
+        MSET_MOBILEWINDOWSHIDEFIXED (state, viewer) {
             // 固定窗口
             state.MobileWindowChangeDataFixed = !state.MobileWindowChangeDataFixed
             state.MobileWindowsHideFixed = viewer
         },
-        // 默认位置
-        // MSET_MORENWEIZHI(state, data) {
-        //     window.startPointFn = data
-        // },
         // // 开关飞入点图标
         // MSET_OPENPOINTEL(state, val) {
         //     if (val) {
@@ -188,15 +184,21 @@
         //     }
         // },
         // 送入移动端缩放范围
-        set_zoomRange(state, data) {
+        set_zoomRange (state, data) {
             state.zoomRange = data
         },
         // 送入默认弹窗高度
-        set_frislayertHeight(state, data) {
+        set_frislayertHeight (state, data) {
             state.frislayertHeight = data
         },
+        SET_DIMENSION (state, dimension) {
+            state.dimension = dimension
+        },
+        SET_DIMENSIONDATA (state, dimensionData) {
+            state.dimensionData = dimensionData
+        },
         // 切换2D和2.5D
-        MSET_DIMENSION(state, data) {
+        MSET_DIMENSION (state, data) {
             // 关闭弹窗
             // 3d,2.5d转换事件
             state.dimension = data
@@ -210,30 +212,25 @@
                 }
                 // 加载底图
                 if (!window.vecLayer) {
-                    window.vecLayer = global.viewer.imageryLayers.addImageryProvider(
-                        new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
-                            url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
-                            type: 'wmts',
-                            layer: 'vec',
-                            style: 'default',
-                            format: 'tiles',
-                            tileMatrixSetID: 'w',
-                            show: true,
-                            maximumLevel: 18
-                        })
-                    )
-                    window.cvaLayer = global.viewer.imageryLayers.addImageryProvider(
-                        new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
-                            url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
-                            type: 'wmts',
-                            layer: 'cva',
-                            style: 'default',
-                            format: 'tiles',
-                            tileMatrixSetID: 'w',
-                            show: true,
-                            maximumLevel: 18
-                        })
-                    )
+                    // window.vecLayer = global.viewer.imageryLayers.addImageryProvider(
+                    //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                    //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0',
+                    //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+                    //         format: 'image/jpeg',
+                    //         show: true,
+                    //         maximumLevel: 18
+                    //     })
+                    // )
+
+                    // window.cvaLayer = global.viewer.imageryLayers.addImageryProvider(
+                    //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                    //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0',
+                    //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+                    //         format: 'image/jpeg',
+                    //         show: true,
+                    //         maximumLevel: 18
+                    //     })
+                    // )
                 }
                 // console.log(1321)
                 window.wallLayer.show = false // 关闭瀑布   以及2.5d图形贴片
@@ -243,7 +240,6 @@
                 // window.tilesetLayer.changesilhouetteBlue(); //清空silhouetteBlue.selected = [];
                 // console.log(window.tileset)
                 window.tilesetLayer.show = true // 显示3d图形
-                window.startPointFn() // 移动默认视角
                 // global.viewer.flyTo(window.tileset);
                 window.areaLayer.show = false // 绿布
                 // 3D视角不限制
@@ -276,75 +272,79 @@
                 // global.viewer.imageryLayers.remove(window.cvaLayer);
                 // window.cvaLayer = null;
                 // 加载底图
-                window.vecLayer = global.viewer.imageryLayers.addImageryProvider(
-                    new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
-                        url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
-                        subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
-                        format: 'image/jpeg',
-                        show: true,
-                        maximumLevel: 18
-                    })
-                )
+                // window.vecLayer = global.viewer.imageryLayers.addImageryProvider(
+                //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0',
+                //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+                //         format: 'image/jpeg',
+                //         show: true,
+                //         maximumLevel: 18
+                //     })
+                // )
 
-                window.cvaLayer = global.viewer.imageryLayers.addImageryProvider(
-                    new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
-                        url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
-                        subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
-                        format: 'image/jpeg',
-                        show: true,
-                        maximumLevel: 18
-                    })
-                )
+                // window.cvaLayer = global.viewer.imageryLayers.addImageryProvider(
+                //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0',
+                //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+                //         format: 'image/jpeg',
+                //         show: true,
+                //         maximumLevel: 18
+                //     })
+                // )
 
                 window.tilesetLayer.show = false // 隐藏3d图形
                 window.newLayer = window.usetowpointfive() // 添加2.5d图形贴片
                 window.wallLayer.show = false // 打开瀑布
-                window.startPointFn() // 移动默认视角
                 window.areaLayer.show = true // 绿布
                 if (state.zoomRange[3]) {
-                    global.viewer.imageryLayers.addImageryProvider(
-                        new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
-                            url: "http://arcgis.jxpskj.com:6080/arcgis/rest/services/FZ25DMap/MapServer/WMTS",
-                            layer: "fzsw2019",
-                            style: "default",
-                            tileMatrixSetID: "default028mm",
-                            format: "image/jpgpng",
-                            tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
-                            maximumLevel: 19,
-                            tileMatrixLabels: [
-                                "0",
-                                "1",
-                                "2",
-                                "3",
-                                "4",
-                                "5",
-                                "6",
-                                "7",
-                                "8",
-                                "9",
-                                "10",
-                                "11",
-                                "12",
-                                "13",
-                                "14",
-                                "15",
-                                "16",
-                                "17",
-                                "18",
-                                "19",
-                            ],
-                        })
-                    );
+                    global.viewer.imageryLayers.addImageryProvider(new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+                        url: '/fz/{z}/{x}/{y}.png',
+                        fileExtension: 'png'
+                        // minimumLevel: 19
+                    }))
+                    // global.viewer.imageryLayers.addImageryProvider(
+                    //     new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+                    //         url: "http://arcgis.jxpskj.com:6080/arcgis/rest/services/FZ25DMap/MapServer/WMTS",
+                    //         layer: "fzsw2019",
+                    //         style: "default",
+                    //         tileMatrixSetID: "default028mm",
+                    //         format: "image/jpgpng",
+                    //         tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
+                    //         maximumLevel: 19,
+                    //         tileMatrixLabels: [
+                    //             "0",
+                    //             "1",
+                    //             "2",
+                    //             "3",
+                    //             "4",
+                    //             "5",
+                    //             "6",
+                    //             "7",
+                    //             "8",
+                    //             "9",
+                    //             "10",
+                    //             "11",
+                    //             "12",
+                    //             "13",
+                    //             "14",
+                    //             "15",
+                    //             "16",
+                    //             "17",
+                    //             "18",
+                    //             "19",
+                    //         ],
+                    //     })
+                    // );
                     // 2.5D视角限制
                     // global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 50
                     // // 最大
                     // global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 9999999999
                 } else {
-                    // 2.5D视角限制
-                    global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = state.zoomRange[0]
-                    // 最大
-                    global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = state.zoomRange[1]
                 }
+                // 2.5D视角限制
+                global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = state.zoomRange[0]
+                // 最大
+                global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = state.zoomRange[1]
                 // 设置相机缩小时的速率
                 global.viewer.scene.screenSpaceCameraController._minimumZoomRate = 2000
                 // 设置相机放大时的速率
@@ -358,11 +358,11 @@
             }
         },
         // 绿布
-        MSET_areaLayer(state, data) {
-            window.areaLayer = data;
+        MSET_areaLayer (state, data) {
+            window.areaLayer = data
         },
         // 切换控制
-        MSET_PERSPECTIVECONTROL(state, data) {
+        MSET_PERSPECTIVECONTROL (state, data) {
             state.perspectiveControl = data
             state.perspectiveControls = !state.perspectiveControls
         },
@@ -374,10 +374,11 @@
         //     window.usetowpointfive = data.usetowpointfive
         // },
         // 直接移动
-        cameraSetView(state, data) {
+        cameraSetView (state, data) {
             global.viewer.camera.setView({
                 // Cesium的坐标是以地心为原点,一向指向南美洲,一向指向亚洲,一向指向北极州
                 // fromDegrees()方法,将经纬度和高程转换为世界坐标
+                // eslint-disable-next-line new-cap
                 destination: new global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
                     // 114.0351,
                     // 27.6314,
@@ -400,20 +401,20 @@
             })
         },
         // 删除路线
-        removePolyline(state) {
+        removePolyline (state) {
             if (window.drawALineLayer) {
                 window.drawALineLayer.remove()
                 window.drawALineLayer = null
                 state.isOpenDrawALine = false
             }
         },
-        removerPolyLineIcon(state) {
+        removerPolyLineIcon (state) {
             if (window.drawALineLayerIcon) {
                 window.drawALineLayerIcon.remove()
                 window.drawALineLayerIcon = null
             }
         },
-        removePolylineMany(state) {
+        removePolylineMany (state) {
             if (window.drawALineLayerMany) {
                 window.drawALineLayerMany.remove()
                 window.drawALineLayerMany = null
@@ -426,20 +427,20 @@
             }
         },
         // 显影线路或者点
-        showLineOrPoint(state, val) {
+        showLineOrPoint (state, val) {
             window[val.layer].show = val.flag
         },
         // 传送终点数据
-        set_endPosition(state, data) {
+        set_endPosition (state, data) {
             state.isendPosition = !state.isendPosition
             state.endPosition = data
         },
         // 传送当前选择的路径
-        set_choiceRouterS(state, data) {
+        set_choiceRouterS (state, data) {
             state.choiceRouterS = data
         },
         // 活动窗口是否显示
-        set_showActivity(state, data) {
+        set_showActivity (state, data) {
             state.showActivity = data
             if (data.state) {
                 state.showActivityData = data.value
@@ -449,17 +450,17 @@
                 state.showActivity = data.state
             }
         },
-        mset_changeSelect(state, data) {
+        mset_changeSelect (state, data) {
             window.select.overlay = data[0]
             window.select.color = data[1]
         },
-        SET_SeeAndNotSee(state, data) {
+        SET_SeeAndNotSee (state, data) {
             state.seeRight = data
         }
     },
     actions: {
         ...urlParameter.actions, // url参数
-        MSET_CREADE({
+        MSET_CREADE ({
             state,
             commit,
             dispatch
@@ -467,7 +468,7 @@
             window.pointLayer = new global.DC.VectorLayer('pointLayer') // 创建图标实体类
             global.viewer.addLayer(window.pointLayer) // 添加到地图
         },
-        setMobileWindows({
+        setMobileWindows ({
             state,
             commit,
             dispatch
@@ -480,7 +481,7 @@
             // 传递响应数据
             commit('MSET_QUERY', data)
             // console.log(data);
-            //配置移动和弹窗的偏移   flys是飞行的偏移  clas是弹窗的偏移
+            // 配置移动和弹窗的偏移   flys是飞行的偏移  clas是弹窗的偏移
             if (state.dimension == '3D') {
                 Flys = [
                     +data.lntLat[0] + 0.01197,
@@ -491,9 +492,9 @@
                 clas = [
                     data.from == 'PopupOurOnce' ? +data.lntLat[0] : +data.lntLat[0],
                     // data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
-                    data.from == 'PopupOurOnce' ?
-                    +data.lntLat[1] - 0.00108 :
-                    +data.lntLat[1] - 0.00048,
+                    data.from == 'PopupOurOnce'
+                        ? +data.lntLat[1] - 0.00108
+                        : +data.lntLat[1] - 0.00048,
                     data.from == 'PopupOurOnce' ? 0 : 30.648862227
                 ]
             } else if (state.dimension == '2.5D') {
@@ -513,8 +514,8 @@
                     data.from == 'PopupOurOnce' ? 0 : 0
                 ]
             }
-            window.tancuanPosition = data.position;
-            //useJWD开启状态  window.tancuanPosition就是根据经纬度来计算出来的 如果有原有的 data.position 把值变为false
+            window.tancuanPosition = data.position
+            // useJWD开启状态  window.tancuanPosition就是根据经纬度来计算出来的 如果有原有的 data.position 把值变为false
             if (data.useJWD) {
                 window.ellipsoid = global.viewer.scene.globe.ellipsoid
                 window.cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
@@ -528,6 +529,7 @@
             }
 
             // 定制化窗体
+            // eslint-disable-next-line new-cap
             window.popupsDom = new global.DC.mobileDivForms(global.viewer, {
                 domId: 'mobilePopup',
                 title: data.query.name || '成教楼  ',
@@ -627,7 +629,7 @@
             // })
             // commit('MSET_POPUPDOM', popupsDom)
         },
-        closeMobileWindowsDom({
+        closeMobileWindowsDom ({
             state,
             commit,
             dispatch
@@ -655,7 +657,7 @@
         //     var position = ellipsoid.cartographicToCartesian(cartographic)
         //     return position
         // },
-        SET_OPENWIDOWFIXED({
+        SET_OPENWIDOWFIXED ({
             state,
             commit
         }, data) {
@@ -674,7 +676,7 @@
                 )
             )
         },
-        CLOSE_WIDOWFIXED({
+        CLOSE_WIDOWFIXED ({
             state,
             commit
         }) {
@@ -684,12 +686,12 @@
             }
         },
         // 加入当时的选点
-        JOIN_POINT({
+        JOIN_POINT ({
             state,
             commit
-        }, data) {},
+        }, data) { },
         // flyTo
-        mapFlyTo({
+        mapFlyTo ({
             state,
             commit,
             dispatch
@@ -795,7 +797,7 @@
         //     window.pointLayer.addOverlay(billboard) // 实景
         //     // commit("MSET_OPENPOINTEL", true);
         // },
-        MSET_LOCKPERSPECTIVEL({
+        MSET_LOCKPERSPECTIVEL ({
             state,
             commit,
             dispatch
@@ -806,7 +808,7 @@
             )
             // console.log(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
         },
-        MSET_DIMENSIONS({
+        MSET_DIMENSIONS ({
             state,
             commit,
             dispatch
@@ -836,7 +838,7 @@
                 }
             })
         },
-        MSET_GOTOCC({
+        MSET_GOTOCC ({
             state,
             commit,
             dispatch
@@ -859,7 +861,7 @@
             })
         },
         // 文字转语音控制↓
-        MSET_GETAUDIO({
+        MSET_GETAUDIO ({
             state,
             commit,
             dispatch
@@ -873,7 +875,7 @@
                 state.audioState = false
             }
         },
-        MSET_GETAUDIOBEGIN({
+        MSET_GETAUDIOBEGIN ({
             state,
             commit,
             dispatch
@@ -889,7 +891,7 @@
         },
         // 文字转语音控制↑
         // 导航系统↓
-        MSET_GOTOWHERE({
+        MSET_GOTOWHERE ({
             state,
             commit,
             dispatch
@@ -948,7 +950,7 @@
                     // window.drawALineLayerdrawALine (paths, res.data.route.paths[0].strategy);
                 })
             // }
-            //包装绘画工具
+            // 包装绘画工具
             window.drawALineLayerdrawALine = (pathsour) => {
                 const paths = pathsour.steps
                 const titles = pathsour.strategy
@@ -990,7 +992,7 @@
         },
         // 导航系统↑
         // 绘画线路
-        MSET_DRAWALINELAYER({
+        MSET_DRAWALINELAYER ({
             state,
             commit,
             dispatch
@@ -1023,6 +1025,9 @@
                 })
                 // 订阅事件
                 window.billboarddaohang.on(global.DC.MouseEventType.CLICK, (e) => {
+                    if (state.pinchFlag == true) {
+                        return
+                    }
                     // console.log(e);
                     // return;
                     // 定制化窗体
@@ -1055,7 +1060,7 @@
             // commit("cameraSetView", state.navigationStartLngLat); //移动
         },
         // 绘画线路活动多条
-        MSET_DRAWALINELAYERMANY({
+        MSET_DRAWALINELAYERMANY ({
             state,
             commit,
             dispatch
@@ -1090,7 +1095,7 @@
             })
             window.drawALineLayerMany = new global.DC.VectorLayer('manyLinePointLayer')
             global.viewer.addLayer(window.drawALineLayerMany)
-            window.drawAPointLayerMany = new global.DC.HtmlLayer('manyPointPointLayer')
+            window.drawAPointLayerMany = new global.DC.VectorLayer('manyPointPointLayer')
             global.viewer.addLayer(window.drawAPointLayerMany)
             // 多条线
             for (const k in Strs) {
@@ -1161,24 +1166,28 @@
                 //   // outlineWidth: 1, //边框大小,
                 //   pixelOffset: { x: 0, y: -47 }, //偏移像素
                 // });
-                window.drawAPointLayerManyLabels = new global.DC.DivIcon(
-                    // new this.DC.Position(Number(item[0]), Number(item[1]), 0),
+                const billboard = new global.DC.Billboard(
+                    window.drawAPointLayerManyposition, '/img/icon/activity.png')
+
+                const label = new global.DC.Label(
                     window.drawAPointLayerManyposition,
-                    `
-              <div class="point-entitys-box">
-                  <div class="point-logo">
-                      <img src="/img/icon/activity.png">
-                  </div>
-                  <div class="point-title">
-                      ${point[k].name}
-                  </div>
-              </div>
-          `
+                    point[k].name
                 )
-                // 订阅事件
-                window.drawAPointLayerManyLabels.on(global.DC.MouseEventType.CLICK, (e) => {
-                    // console.log(e);
-                    // return;
+
+                label.setStyle({
+                    fillColor: global.DC.Color.RED,
+                    style: global.DC.Namespace.Cesium.LabelStyle.FILL_AND_OUTLINE,
+                    outlineColor: global.DC.Color.WHITE, // 边框颜色
+                    outlineWidth: 8, // 边框大小,
+                    font: '12px sans-serif',
+                    pixelOffset: { x: 0, y: -24 }
+                })
+
+                billboard.on(global.DC.MouseEventType.CLICK, (e) => {
+                    if (state.pinchFlag == true) {
+                        return
+                    }
+
                     if (value[3]) {
                         value[3]()
                     }
@@ -1197,8 +1206,33 @@
                     }
                     dispatch('setMobileWindows', windowData)
                 })
-                window.drawAPointLayerMany.addOverlay(window.drawAPointLayerManyLabels)
-                // console.log(point[k]);
+
+                label.on(global.DC.MouseEventType.CLICK, (e) => {
+                    if (state.pinchFlag == true) {
+                        return
+                    }
+
+                    if (value[3]) {
+                        value[3]()
+                    }
+                    // 定制化窗体
+                    const position = e.position
+                    const lntLat = [e.overlay._position._lng, e.overlay._position._lat]
+                    const windowData = {
+                        position,
+                        lntLat,
+                        query: {
+                            ...(value[2] || {}),
+                            position,
+                            lntLat
+                        },
+                        useJWD: true // 仅使用经纬度
+                    }
+                    dispatch('setMobileWindows', windowData)
+                })
+
+                window.urlParameterLayer.addOverlay(billboard) // 加入图标
+                window.urlParameterLayer.addOverlay(label)
             }
             // state.drawALineLayerMany = drawALineLayerMany
             // state.drawAPointLayerMany = drawAPointLayerMany
@@ -1208,4 +1242,4 @@
     }
 }
 
-export default mobile
\ No newline at end of file
+export default mobile

--
Gitblit v1.9.3