From 1d0db2268bc114753f1f2b0fce056cfbaf519a64 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 10 十月 2023 11:06:22 +0800
Subject: [PATCH] 代码更新

---
 src/utils/poiKeys.js                 |    1 
 src/components/menu/bottom-menu.vue  |   23 
 src/utils/store.js                   |    5 
 src/components/map/viewer.vue        |   35 
 src/router/index.js                  |    4 
 src/components/index.vue             |   24 
 src/components/poplayer/coord.vue    |    7 
 index.html                           |    1 
 src/assets/js/rpc.js                 |  621 ++---------------
 src/components/left/leftmenu.vue     |  116 ---
 static/mapData.js                    |   22 
 src/components/poplayer/location.vue |   29 
 static/layers.json                   | 1137 +++------------------------------
 13 files changed, 242 insertions(+), 1,783 deletions(-)

diff --git a/index.html b/index.html
index 628d4fd..bcec9a2 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,6 @@
   <script src="./static/SmartEarthSDK/Workers/jquery-2.0.3.js"></script>
   <script src="./static/SmartEarthSDK/SmartEarth.min.js"></script>
   <script src="./static/SmartEarthSDK/Workers/layui/layui.all.js"></script>
-  <script src="./static/polyline.js"></script>
 </head>
 
 <body oncontextmenu="return false;" ondragstart="return false;" onselectstart="return false;">
diff --git a/src/assets/js/rpc.js b/src/assets/js/rpc.js
index 939495f..e3377ed 100644
--- a/src/assets/js/rpc.js
+++ b/src/assets/js/rpc.js
@@ -2,16 +2,10 @@
 import coord from "@/components/poplayer/coord";
 import store from "@/utils/store";
 import mapData from "../../../static/mapData";
-import {
-    liushisijiayuanqudizhibianmafuwu,
-    findAddressCandidates,
-    getDiKuanFanWei,
-    ent_selectByName
-} from "../../api/api";
-import vueEvents from "@/utils/vueEvent.js";
 let PoiLayerConstructor = Vue.extend(coord);
-const rpc = {
+window.rpc = {
     timeout: 500,
+    url: "http://localhost:8999/RPC2",
     method: "get_statue",
     divPoint: null,
     instance: null,
@@ -19,498 +13,85 @@
     position: null,
     marksIndex: null,
     pitchValue: null,
-    unsubscribeTicks: null,
-    LineRoaming: null, //绾胯矾婕父
-    dataQuery: [], //鍏抽敭瀛楁煡璇㈢粨鏋�
-    pointerFly: null, //瀹氱偣婕父
-    isShow: false,
-    objArr: [],
-    //鍏抽敭瀛楁煡璇�
-    getFuzzyQuery(res) {
-        store.queryLayer.val = res.message;
-        this.setClearAllMsg();
-        if (!res.baidu_keys) return;
-        var flag = true;
-        if (this.dataQuery.length > 0) {
-            if (res.message.indexOf("绗�") > -1 && res.message.indexOf("鏉�") > -1) {
-                var data = mapData.msgMach.localPage;
-                flag = false;
-                var val_Data = null;
-                for (var i in data) {
-                    if (res.message.indexOf(data[i]) > -1) {
-                        val_Data = this.dataQuery[i];
-                        setTimeout(() => {
-                            this.setLocation(val_Data);
-                        }, 1000);
-                        break;
-                        return;
-                    }
-                }
-            } else {
-                for (var i in this.dataQuery) {
-                    var name = this.dataQuery[i].name;
-                    for (var j = 0; j < length; j++) {
-                        var world = keyWorld[j].word;
-                        if (name.indexOf(world) > -1) {
-                            flag = false;
-                            this.setLocation(this.dataQuery[i]);
-                            break;
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-        if (!flag) {
-            return;
-        }
-        var keyWorld = res.baidu_keys.results;
-        if (keyWorld) {
-            var length = keyWorld.length;
-
-            this.dataQuery = [];
-            this.objArr = [];
-            for (var i = 0; i < length; i++) {
-                var world = keyWorld[i].word;
-                console.log("world", world);
-                this.setFuzzyQueryData(world, i, length - 1);
-            }
-        }
-    },
-    async setFuzzyQueryData(res, index, length) {
-        Promise.all([
-            ent_selectByName(res), //浼佷笟
-            liushisijiayuanqudizhibianmafuwu(res), //鍥尯
-            findAddressCandidates(res) //鍦板潡
-        ]).then(result => {
-            var that = this;
-            store.queryLayer.data = [];
-            //浼佷笟
-            var EntArr = result[0].result.filter(item => {
-                return item.entName.includes(res);
-            });
-            EntArr.forEach(val => {
-                let itemObj = {
-                    type: "浼佷笟",
-                    name: val.entName,
-                    address: val.address,
-                    lon: val.x,
-                    lat: val.y
-                };
-                that.objArr.push(itemObj);
-            });
-            //鍥尯
-            var YQArr = result[1].candidates.filter(item => {
-                return item.attributes.YQmingchen.includes(res);
-            });
-            YQArr.forEach(val => {
-                let itemObj = {
-                    type: "鍥尯",
-                    name: val.attributes.YQmingchen,
-                    address: val.attributes.YQdizhi,
-                    lon: val.location.x,
-                    lat: val.location.y
-                };
-                that.objArr.push(itemObj);
-            });
-            //鍦板潡
-            var LandArr = result[2].candidates.filter((item) => {
-                return item.attributes.QYMC.includes(res);
-            })
-            // 缁撴灉鏍规嵁QYMC浠庣煭鍒伴暱鎺掑簭
-            LandArr.sort((a, b) => (b.attributes.QYMC.length === a.attributes.QYMC.length ? 0 : a.attributes.QYMC.length > b.attributes.QYMC.length ? 1 : -1))
-            LandArr.forEach((val) => {
-                let itemObj = {
-                    type: "鍦板潡",
-                    name: val.attributes.QYMC,
-                    area: val.attributes.area,
-                    code: val.attributes["鍦板潡缂�"],
-                    lon: val.location.x,
-                    lat: val.location.y,
-                };
-                that.objArr.push(itemObj);
-            });
-            if (index == length) {
-                if (that.objArr.length <= 0) {
-
-                    vueEvents.$emit("queryData", true);
-                    return;
-                }
-                var num = that.objArr.length;
-                for (var i = 0; i < num; i++) {
-                    if (i < 6) {
-                        that.dataQuery.push(that.objArr[i]);
-                    }
-                }
-                store.queryLayer.data = that.dataQuery;
-                that.setClearAllMsg();
-                setTimeout(() => {
-                    vueEvents.$emit("queryData", true);
-                    that.setLocation(that.dataQuery[0]);
-                }, 1000);
+    //娑堟伅瀵规帴
+    initMessage() {
+        var that = this;
+        window.addEventListener("message", res => {
+            if (res.data.status === "ok") {
+                console.log(res.data.params, "褰撳墠浜嬩欢鏁版嵁");
+                // that.setLocation();
             }
         });
     },
-
-    getFuzzyQueryData(res, index, length, flag) {
-        if (!res || res.length <= 0) return;
-        for (var i in res) {
-            if (this.dataQuery.length < 6) {
-                this.dataQuery.push(res[i]);
-            }
-        }
-        if (index == length) {
-            if (this.dataQuery.length <= 0) {
-                vueEvents.$emit("queryData", false);
-                return;
-            }
-
-            store.queryLayer.data = this.dataQuery;
-
-            this.setClearAllMsg();
-
-            setTimeout(() => {
-                vueEvents.$emit("queryData", true);
-                this.setLocation(this.dataQuery[0]);
-            }, 1000);
-        }
-    },
-    // 鏄剧ず鍦板潡鑼冨洿
-    getLandmass(res) {
-
-        let that = this;
-        if (res.type == "鍥尯") {
-
-        } else if (res.type == "鍦板潡") {
-
-            getDiKuanFanWei(res.lon, res.lat).then(response => {
-                let center = { lon: 0, lat: 0 };
-                let polygon = that.read(response.geometry);
-                if (polygon.length > 0) {
-                    var geometry = [];
-                    let points = polygon[0].split(",");
-                    for (let i = 0; i < points.length; i++) {
-                        let point = points[i].replace(/^\s+|\s+$/g, "").split(" ");
-                        // center.lon += parseFloat(point[0]) / points.length;
-                        // center.lat += parseFloat(point[1]) / points.length;
-                        geometry.push(parseFloat(point[0]), parseFloat(point[1]))
-
-                    }
-                    that.setLacationLineClear()
-                    var position = Cesium.Cartesian3.fromDegreesArray(geometry)
-
-                    that.lacationLine = Viewer.entities.add({
-                        name: "绔嬩綋澧欐晥鏋�",
-                        wall: {
-                            positions: position,
-
-
-                            material: new Cesium.DynamicWallMaterialProperty({
-                                color: Cesium.Color.RED,
-                                duration: 4000
-                            }),
-                            // 璁剧疆楂樺害
-                            maximumHeights: Array(position.length).fill(80),
-                            minimumHeights: Array(position.length).fill(10),
-                        }
-                    })
-                }
-            });
-        }
-    },
-
-    read(wkt) {
-        var regExes = {
-            typeStr: /^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,
-            emptyTypeStr: /^\s*(\w+)\s*EMPTY\s*$/,
-            spaces: /\s+/,
-            parenComma: /\)\s*,\s*\(/,
-            doubleParenComma: /\)\s*\)\s*,\s*\(\s*\(/, // can't use {2} here
-            trimParens: /^\s*\(?(.*?)\)?\s*$/
-        };
-        /**
-         * Object with properties corresponding to the geometry types. Property values
-         * are functions that do the actual parsing.
-         * @private
-         */
-        var parse$1 = {
-            /**
-             * Return point geometry given a point WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the point.
-             * @return {Point} A point geometry.
-             * @private
-             */
-            point: function point(str) {
-                if (str === undefined) {
-                    return [];
-                }
-
-                var coords = str.trim().split(regExes.spaces);
-                return [Number.parseFloat(coords[0]), Number.parseFloat(coords[1])];
-            },
-
-            /**
-             * Return a multipoint geometry given a multipoint WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the multipoint.
-             * @return {Point} A multipoint feature.
-             * @private
-             */
-            multipoint: function multipoint(str) {
-                var this$1 = this;
-
-                if (str === undefined) {
-                    return [];
-                }
-
-                var point;
-                var points = str.trim().split(",");
-                var components = [];
-                for (var i = 0, len = points.length; i < len; ++i) {
-                    point = points[i].replace(regExes.trimParens, "$1");
-                    components.push(parse$1.point(point));
-                }
-                return components;
-            },
-
-            /**
-             * Return a linestring geometry given a linestring WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the linestring.
-             * @return {LineString} A linestring geometry.
-             * @private
-             */
-            linestring: function linestring(str) {
-                if (str === undefined) {
-                    return [];
-                }
-
-                var points = str.trim().split(",");
-                var components = [];
-                var coords;
-                for (var i = 0, len = points.length; i < len; ++i) {
-                    coords = points[i].trim().split(regExes.spaces);
-                    components.push([
-                        Number.parseFloat(coords[0]),
-                        Number.parseFloat(coords[1])
-                    ]);
-                }
-                return components;
-            },
-
-            /**
-             * Return a linearring geometry given a linearring WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the linearring.
-             * @return {LinearRing} A linearring geometry.
-             * @private
-             */
-            linearring: function linearring(str) {
-                if (str === undefined) {
-                    return [];
-                }
-
-                var points = str.trim().split(",");
-                var components = [];
-                var coords;
-                for (var i = 0, len = points.length; i < len; ++i) {
-                    coords = points[i].trim().split(regExes.spaces);
-                    components.push([
-                        Number.parseFloat(coords[0]),
-                        Number.parseFloat(coords[1])
-                    ]);
-                }
-                return components;
-            },
-
-            /**
-             * Return a multilinestring geometry given a multilinestring WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the multilinestring.
-             * @return {MultiLineString} A multilinestring geometry.
-             * @private
-             */
-            multilinestring: function multilinestring(str) {
-                var this$1 = this;
-
-                if (str === undefined) {
-                    return [];
-                }
-
-                var line;
-                var lines = str.trim().split(regExes.parenComma);
-                var components = [];
-                for (var i = 0, len = lines.length; i < len; ++i) {
-                    line = lines[i].replace(regExes.trimParens, "$1");
-                    components.push(parse$1.linestring(line));
-                }
-                return components;
-            },
-
-            /**
-             * Return a polygon geometry given a polygon WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the polygon.
-             * @return {Polygon} A polygon geometry.
-             * @private
-             */
-            polygon: function polygon(str) {
-                var this$1 = this;
-
-                if (str === undefined) {
-                    return [];
-                }
-
-                var ring, linestring, linearring;
-                var rings = str.trim().split(regExes.parenComma);
-                var shell;
-                var holes = [];
-                //for (var i = 0, len = rings.length; i < len; ++i) {
-                ring = rings[0].replace(regExes.trimParens, "$1");
-                linestring = ring;
-                //}
-                return linestring;
-            },
-
-            /**
-             * Return a multipolygon geometry given a multipolygon WKT fragment.
-             *
-             * @param {String} str A WKT fragment representing the multipolygon.
-             * @return {MultiPolygon} A multipolygon geometry.
-             * @private
-             */
-            multipolygon: function multipolygon(str) {
-                var this$1 = this;
-
-                if (str === undefined) {
-                    return [];
-                }
-
-                var polygon;
-                var polygons = str.trim().split(regExes.doubleParenComma);
-                var components = [];
-                for (var i = 0, len = polygons.length; i < len; ++i) {
-                    polygon = polygons[i].replace(regExes.trimParens, "$1");
-                    components.push(parse$1.polygon(polygon));
-                }
-                return components;
-            }
-        };
-
-        var geometry, type, str;
-        wkt = wkt.replace(/[\n\r]/g, " ");
-        var matches = regExes.typeStr.exec(wkt);
-        if (wkt.search("EMPTY") !== -1) {
-            matches = regExes.emptyTypeStr.exec(wkt);
-            matches[2] = undefined;
-        }
-        if (matches) {
-            type = matches[1].toLowerCase();
-            str = matches[2];
-            if (parse$1[type]) {
-                geometry = parse$1[type].apply(this, [str]);
-            }
-        }
-
-        if (geometry === undefined) {
-            throw new Error("Could not parse WKT " + wkt);
-        }
-
-        return geometry;
-    },
-
     //鍦板浘澶嶄綅
     setMapRest() {
         const data = mapData.mapRest;
         sgworld.Navigate.flyToPointsInterest({
             destination: {
-                x: data.lng,
-                y: data.lat,
-                z: data.alt
+                "x": data.lng,
+                "y": data.lat, "z": data.alt
             },
             orientation: {
                 heading: data.heading,
                 pitch: data.pitch,
-                roll: data.roll
+                roll: data.roll,
             },
-            duration: 8 //椋炶鏃堕棿8s
-        });
-    },
-
-    //鍔ㄧ敾瀵艰埅
-    setLineRoaming() {
-        var valdata = mapData.animaNavigation;
-        this.marksIndex = 1;
-        this.pitchValue = -20;
-        this.setShowPathLine(valdata);
-        var geom = [];
-        for (var i in valdata) {
-            geom.push(valdata[i].lng, valdata[i].lat, valdata[i].height);
-        }
-
-        var that = this;
-        sgworld.Creator.getFlyData(geom, data => {
-            data.showPoint = false;
-            data.showLine = false;
-            data.mode = 1;
-            data.pitch = -10;
-            data.height = 75;
-            data.speed = 25;
-
-            that.LineRoaming = sgworld.Creator.createDynamicObject(
-                data,
-                null,
-                res => {
-                    if (res.time >= res.Totaltime) {
-                        that.setCloseLineRomaing();
-                        that.setMapRest();
-                    }
-                }
-            );
+            duration: 5, //椋炶鏃堕棿8s
         });
     },
     //鐐瑰嚮鑾峰彇鍧愭爣
     clickToCoordinates() {
-        const handlerClick = new Cesium.ScreenSpaceEventHandler(
-            Viewer.scene.canvas
-        );
-        handlerClick.setInputAction(event => {
-            let cartesian = Viewer.camera.pickEllipsoid(
-                event.position,
-                Viewer.scene.globe.ellipsoid
-            );
+        const handlerClick = new Cesium.ScreenSpaceEventHandler(Viewer.scene.canvas);
+        handlerClick.setInputAction((event) => {
+
+            let cartesian = Viewer.camera.pickEllipsoid(event.position, Viewer.scene.globe.ellipsoid);
             if (cartesian == undefined) {
-                console.log("娌℃湁鑾峰彇鍒板潗鏍�");
+                console.log('娌℃湁鑾峰彇鍒板潗鏍�')
             } else {
                 // 绌洪棿鍧愭爣杞笘鐣屽潗鏍�(寮у害)
                 let cartographic = Cesium.Cartographic.fromCartesian(cartesian);
                 // 寮у害杞负瑙掑害锛堢粡绾害锛�
-                let lon = Cesium.Math.toDegrees(cartographic.longitude); // 缁忓害鍊�
-                let lat = Cesium.Math.toDegrees(cartographic.latitude); // 绾害鍊�
-                console.log("缁忕含搴︽槸锛�", { x: lon, y: lat });
+                let lon = Cesium.Math.toDegrees(cartographic.longitude);  // 缁忓害鍊�
+                let lat = Cesium.Math.toDegrees(cartographic.latitude);   // 绾害鍊�
+                console.log('缁忕含搴︽槸锛�', { x: lon, y: lat });
             }
         }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
     },
     //瀹氫綅寮圭獥
-    setLocation(res) {
+    setLocation() {
+        var data = mapData.pointPop;
         var objdata = {
-            name: res.name,
-            address: res.address,
-            area: res.area,
-            code: res.code,
-            lat: res.lat,
-            lon: res.lon
+            POITYPE: data.text,
+            SSDW: data.text,
+            LXR: data.text,
+            DIZHI: res,
+            lat: data.lat,
+            lon: data.lng
         };
-
         //娣诲姞瀹氫綅寮圭獥
         this.setAddPointLocation(objdata);
-        //鑼冨洿璋冪敤
-        this.getLandmass(res);
+        // //娣诲姞璺緞绾�
+        // this.setShowPathLine(marks);
+        // //椋炶婕父
+        // window.Viewer.scene.camera.flyTo({
+        //     destination: Cesium.Cartesian3.fromDegrees(
+        //         marks[0].lng,
+        //         marks[0].lat,
+        //         marks[0].height
+        //     ), //瀹氫綅鍧愭爣鐐癸紝寤鸿浣跨敤璋锋瓕鍦扮悆鍧愭爣浣嶇疆鏃犲亸宸�
+        //     duration: 7 //瀹氫綅鐨勬椂闂撮棿闅�
+        // });
+        // this.marksIndex = 1;
+        // this.pitchValue = -20;
+        // setTimeout(() => {
+        //     this.setflyExtent(marks);
+        // }, 7000);
+
     },
 
     setAddPointLocation(res) {
         // 娓呴櫎鏂规硶
+        this.setClearPathlayer();
         store.setlocalLayerShowAction(false);
         store.setlocalLayerListAction({});
         store.setlocalLayerShowAction(true);
@@ -538,7 +119,7 @@
         );
         this.position = window.Viewer.entities.add({
             name: "FLYToMap",
-            position: Cesium.Cartesian3.fromDegrees(res.lon, res.lat, 200),
+            position: Cesium.Cartesian3.fromDegrees(objdata.lon, objdata.lat),
             point: {
                 pixelSize: 1,
                 color: Cesium.Color.WHITE.withAlpha(0),
@@ -550,22 +131,15 @@
             offset: {
                 heading: Cesium.Math.toRadians(0.0),
                 pitch: Cesium.Math.toRadians(-45),
-                range: 700
-            },
-            duration: 3
+                range: 600
+            }
         });
         setTimeout(() => {
-            window.Viewer.entities.remove(this.position);
+            window.Viewer.entities.remove(this.position)
         }, 1000);
-        setTimeout(() => {
-            this.setPointFly(res);
-        }, 4000);
     },
     setflyExtent(res) {
-        if (this.unsubscribeTicks) {
-            window.Viewer.clock.onTick.removeEventListener(this.unsubscribeTicks);
-            this.unsubscribeTicks = null;
-        }
+
         // 鐩告満鐪嬬偣鐨勮搴︼紝濡傛灉澶т簬0閭d箞鍒欐槸浠庡湴搴曞線涓婄湅锛屾墍浠ヨ涓鸿礋鍊�
         var pitch = Cesium.Math.toRadians(this.pitchValue);
         // 鏃堕棿闂撮殧2绉掗挓
@@ -607,13 +181,13 @@
                 res[this.marksIndex].height
             );
 
-            console.log(1, pitch);
+            console.log(1, pitch)
             window.Viewer.scene.camera.setView({
                 destination: endPosition,
                 orientation: {
                     heading: heading,
-                    pitch: Cesium.Math.toRadians(-5)
-                }
+                    pitch: Cesium.Math.toRadians(-5),
+                },
             });
             if (
                 Cesium.JulianDate.compare(
@@ -621,38 +195,30 @@
                     window.Viewer.clock.stopTime
                 ) >= 0
             ) {
-                this.unsubscribeTicks = window.Viewer.clock.onTick.removeEventListener(
-                    Exection
-                );
+                window.Viewer.clock.onTick.removeEventListener(Exection);
                 this.changeCameraHeading(res);
             }
-        };
+
+
+        }
         window.Viewer.clock.onTick.addEventListener(Exection);
     },
-    setPointFly(res) {
-        var that = this;
-        that.pointerFly = window.sgworld.Analysis.setPointFly({
-            position: Cesium.Cartesian3.fromDegrees(res.lon, res.lat, 200),
-            hideImage: true,
-            time: 120,
-            limitTime: true,
-            limitAngel: 120,
-            end: () => {
-                that.pointerFly = null;
-            }
-        });
-        setTimeout(() => {
-            this.setClearPointFly();
-        }, 8000);
+    setPointFly() {
+        var alll
+            = { lng: 116.802948, lat: 36.550064, height: 100, flytime: 15 }
+
+        window.sgworld.Analysis.setPointFly({
+            position: Cesium.Cartesian3.fromDegrees(alll.lng, alll.lat, 50),
+            hideImage: false
+        })
+
     },
     changeCameraHeading(res) {
         var nextIndex = this.marksIndex + 1;
         if (this.marksIndex == res.length - 1) {
-            if (this.unsubscribeTicks) {
-                window.Viewer.clock.onTick.removeEventListener(this.unsubscribeTicks);
-                this.unsubscribeTicks = null;
-            }
-            return;
+            // 婕父瀹屾垚
+            this.setPointFly(res);
+            return
         }
         // 璁$畻涓ょ偣涔嬮棿鐨勬柟鍚�
         var heading = this.bearing(
@@ -680,8 +246,8 @@
             window.Viewer.scene.camera.setView({
                 orientation: {
                     heading: heading,
-                    pitch: Cesium.Math.toRadians(-5)
-                }
+                    pitch: Cesium.Math.toRadians(-5),
+                },
             });
             if (
                 Cesium.JulianDate.compare(
@@ -716,6 +282,8 @@
     toDegrees(radians) {
         return (radians * 180) / Math.PI;
     },
+
+
     setExtentTime(time) {
         var startTime = Cesium.JulianDate.fromDate(new Date());
         var stopTime = Cesium.JulianDate.addSeconds(
@@ -756,8 +324,8 @@
             far: 50000
         });
     },
-    //缁撴潫浜嬩欢
-    setClearAllMsg() {
+
+    setClearPathlayer() {
         if (this.divPoint) {
             this.divPoint && this.divPoint.deleteObject();
             this.divPoint = null;
@@ -766,40 +334,13 @@
             this.instance && this.instance.$destroy();
             this.instance = null;
         }
-        //鍦板潡
-        this.setLacationLineClear()
-        // 杞ㄨ抗绾�
-        this.setClosePathLine();
-        // 婕父
-        this.setCloseLineRomaing();
-        //瀹氱偣婕父
-        this.setClearPointFly();
-        vueEvents.$emit("queryLayer", false);
-    },
-
-
-    setLacationLineClear() {
-        if (this.lacationLine) {
-            Viewer.entities.remove(this.lacationLine)
-            this.lacationLine = null;
-        }
-    },
-    setClearPointFly() {
-        if (this.pointerFly) {
-            this.pointerFly && this.pointerFly.end();
-            this.pointerFly = null;
-        }
-    },
-    setCloseLineRomaing() {
-        if (this.LineRoaming) {
-            this.LineRoaming && this.LineRoaming.exit();
-            this.LineRoaming = null;
-        }
-    },
-    setClosePathLine() {
         if (this.pathLayer) {
             this.pathLayer && this.pathLayer.deleteObject();
         }
+        if (this.position) {
+            window.Viewer.entities.remove(this.position);
+            this.position = null;
+        }
     }
 };
 export default rpc;
diff --git a/src/components/index.vue b/src/components/index.vue
index c808db6..9848daf 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="mapViewer">
-    <leftpanel
-      ref="Left"
-      v-show="false"
-    />
+    <leftpanel ref="Left" v-show="false" />
     <bottommenu />
-    <left-menu></left-menu>
     <viewer class="mapViewer" />
   </div>
 </template>
@@ -14,15 +10,13 @@
 import viewer from "@/components/map/viewer";
 import leftpanel from "@/components/left/index";
 import bottommenu from "@/components/menu/bottom-menu";
-import leftMenu from "@/components/menu/leftMenu.vue";
-import vueEvents from '@/utils/vueEvent.js'
+
 export default {
   name: "index",
   components: {
     viewer,
     leftpanel,
     bottommenu,
-    leftMenu
   },
   data() {
     return {
@@ -31,7 +25,6 @@
       offset: "0%",
       tooltipInfo: "璇风◢鍚庛�傘�傘��",
       tooltipShow: false,
-      queryShow: false,
     };
   },
   mounted() {
@@ -39,18 +32,9 @@
     this.scale = (100 / size).toFixed(2);
     this.offset = "-" + ((size - 100) / 2).toFixed(2) + "%";
     this.size = size + "%";
-    // this.queryShow = rpc.isShow;
-    vueEvents.$on('queryLayer', (res) => {
-      this.queryShow = res
-    })
   },
-  methods: {
-    queryShow(res) {
-      this.queryShow = res;
-    }
-  },
-  watch: {
-  },
+
+  watch: {},
   methods: {
     detectZoom() {
       var ratio = 0,
diff --git a/src/components/left/leftmenu.vue b/src/components/left/leftmenu.vue
index c5a6fbf..6639447 100644
--- a/src/components/left/leftmenu.vue
+++ b/src/components/left/leftmenu.vue
@@ -1019,118 +1019,6 @@
         }
       }
     },
-    initCluster(treeNode) {
-      this.$set(treeNode, "disabled", true);//缁檛reeNode娣诲姞disabled灞炴��
-
-      let that = this;
-      let imgUrl;
-      new Cesium.GeoJsonDataSource.load(
-        treeNode.urls +
-        "?version=1.3.0&request=GetFeature&format=json&typename=" +
-        treeNode.layer
-      ).then((dataSource) => {
-        that.$set(treeNode, "disabled", false);
-        Viewer.dataSources.add(dataSource);
-        clusterItemList.push({ name: treeNode.id, dataSource: dataSource });
-        // window.clusterItem = dataSource;
-        // 璁剧疆鑱氬悎鍙傛暟
-        // dataSource.clustering.enabled = true;
-        // window.dataClustering = dataSource.clustering;
-        // dataSource.clustering.pixelRange = 20;
-        // dataSource.clustering.minimumClusterSize = 20;
-
-        // foreach鐢ㄤ簬璋冪敤鏁扮粍鐨勬瘡涓厓绱狅紝骞跺皢鍏冪礌浼犻�掔粰鍥炶皟鍑芥暟銆�
-        dataSource.entities.values.forEach((entity) => {
-          // if (entity.featureType == "yz浜曟暟鎹�") {
-          //   switch (feature.properties["浜曠被鍨�"]) {
-          //     default:
-          //       imgUrl = treeNode.image;
-          //       break;
-          //   }
-          // }
-          // 灏嗙偣鎷変几涓�瀹氶珮搴︼紝闃叉琚湴褰㈠帇鐩�
-          // entity.position._value.z += 50.0;
-          // 浣跨敤澶у皬涓�64*64鐨刬con锛岀缉灏忓睍绀簆oi
-          entity.billboard = {
-            image: entity.featureType == "yz浜曟暟鎹�" ? imgUrl : treeNode.image,
-            scale: treeNode.imageScale,
-            // width: 50,
-            // height: 50,
-            distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
-              0,
-              1000.0
-            ),
-            disableDepthTestDistance: Number.POSITIVE_INFINITY,
-          };
-          // entity.tag = treeNode.id;
-          // entity.label = {
-          //   // text: "POI",
-          //   font: "bold 15px Microsoft YaHei",
-          //   // 绔栫洿瀵归綈鏂瑰紡
-          //   verticalOrigin: Cesium.VerticalOrigin.CENTER,
-          //   // 姘村钩瀵归綈鏂瑰紡
-          //   horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
-          //   // 鍋忕Щ閲�
-          //   pixelOffset: new Cesium.Cartesian2(15, 0),
-          // };
-
-        });
-
-        // 娣诲姞鐩戝惉鍑芥暟
-        // dataSource.clustering.clusterEvent.addEventListener(function (
-        //   clusteredEntities,
-        //   cluster
-        // ) {
-        //   // 鍏抽棴鑷甫鐨勬樉绀鸿仛鍚堟暟閲忕殑鏍囩
-
-        //   cluster.label.show = true;
-        //   cluster.label.color = Cesium.Color.WHITE;
-        //   cluster.label.outlineColor = Cesium.Color.BLACK;
-        //   cluster.label.outlineWidth = 3.0;
-        //   cluster.label.style = Cesium.LabelStyle.FILL_AND_OUTLINE;
-        //   cluster.label.eyeOffset = new Cesium.Cartesian3(0, 0, -100);
-        //   cluster.label.disableDepthTestDistance = Number.POSITIVE_INFINITY;
-        //   cluster.billboard.disableDepthTestDistance = Number.POSITIVE_INFINITY;
-        //   cluster.billboard.show = true;
-        //   cluster.billboard.id = cluster.label.id;
-        //   cluster.billboard.horizontalOrigin = Cesium.HorizontalOrigin.LEFT;
-        //   cluster.billboard.verticalOrigin = Cesium.VerticalOrigin.CENTER;
-        //   var reg1 = new RegExp(",", "g");
-        //   cluster.label.text = cluster.label.text.replace(reg1, "");
-        //   // 鏍规嵁鑱氬悎鏁伴噺鐨勫灏戣缃笉鍚屽眰绾х殑鍥剧墖浠ュ強澶у皬
-        //   if (clusteredEntities.length >= 10000) {
-        //     cluster.billboard.image = require("@/assets/img/right/test01.png");
-        //     cluster.billboard.pixelOffset = new Cesium.Cartesian2(-25, -10);
-        //     cluster.billboard.width = 142;
-        //     cluster.billboard.height = 142;
-        //   } else if (clusteredEntities.length >= 1000) {
-        //     cluster.billboard.image = require("@/assets/img/right/test01.png");
-        //     cluster.billboard.pixelOffset = new Cesium.Cartesian2(-35, -10);
-
-        //     cluster.billboard.width = 135;
-        //     cluster.billboard.height = 135;
-        //   } else if (clusteredEntities.length >= 100) {
-        //     cluster.billboard.image = require("@/assets/img/right/test01.png");
-        //     cluster.billboard.pixelOffset = new Cesium.Cartesian2(-26, -10);
-
-        //     cluster.billboard.width = 102;
-        //     cluster.billboard.height = 102;
-        //   }
-
-        //   else if (clusteredEntities.length >= 10) {
-        //     cluster.billboard.image = require("@/assets/img/right/test04.png");
-        //     cluster.billboard.pixelOffset = new Cesium.Cartesian2(-25, -10);
-        //     cluster.billboard.width = 82;
-        //     cluster.billboard.height = 82;
-        //   } else {
-        //     cluster.billboard.image = require("@/assets/img/right/test04.png");
-        //     cluster.billboard.pixelOffset = new Cesium.Cartesian2(-25, -10);
-        //     cluster.billboard.width = 62;
-        //     cluster.billboard.height = 62;
-        //   }
-        // });
-      });
-    },
     async addTreeData(treeNode) {
       // if (treeNode.disabled) return;
       let _data = sgworld.ProjectTree.getObject(treeNode.id);
@@ -1385,10 +1273,6 @@
             ""
           );
           treeNode.id = layer.treeobj.id;
-          break;
-
-        case "cluster":
-          layer = this.initCluster(treeNode);
           break;
         case "yztile":
           layer = new YZWMS(treeNode);
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index 602266b..f010d28 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -1,13 +1,9 @@
 <template>
   <div>
     <div id="sdkContainer"></div>
-    <!-- <div
-      id="msg"
-      style="min-width: 200px;min-height: 100px; z-index: 30;position: absolute; top:5%;left: 40%;background: skyblue;"
-    >
-      <label>{{ messagelayer }}</label>
-
-    </div>-->
+    <!-- <div style="z-index: 30;position: absolute; top:1%;left: 1%;">
+      <el-button @click="setLocation(3)">婕父</el-button>
+    </div> -->
   </div>
 </template>
 
@@ -19,9 +15,6 @@
 import { mapState, mapMutations } from "vuex";
 import "animate.css";
 import rpc from "../../assets/js/rpc";
-import mapData from "../../../static/mapData";
-import mapMsg from "../../assets/js/mapMsg";
-import vueEvents from '@/utils/vueEvent.js'
 let PoiLayerConstructor = Vue.extend(poiLayer);
 
 let handler;
@@ -48,21 +41,20 @@
       locationPoint: null,
       locationInstance: null,
       locationData: null,
-      messagelayer: null
     };
   },
   computed: {
     ...mapState(["cesiumInit"]),
   },
   mounted() {
-    vueEvents.$on('messagelayer', (res) => { this.messagelayer = JSON.stringify(res) })
+
     this.$nextTick(function () {
       let that = this;
       let option = {
         fullscreenButton: true,
         licenseServer: "http://183.162.245.49:18080",
         minViewHeight: parseFloat(common.minviewheight),
-        // url: SmartEarthRootUrl + "Workers/image/earth.jpg",  //涓嶅惈鍗曞紶鍦板浘鍥剧墖url鍒欎娇鐢ㄥ湪绾垮湴鍥�
+        url: SmartEarthRootUrl + "Workers/image/earth.jpg",  //涓嶅惈鍗曞紶鍦板浘鍥剧墖url鍒欎娇鐢ㄥ湪绾垮湴鍥�
         contextOptions: {
           failIfMajorPerformanceCaveat: false,
           webgl: {
@@ -113,18 +105,21 @@
           //     duration: 8, //椋炶鏃堕棿8s
           //   });
           // }, 10000);
-          var data = mapData.mapRest
           setTimeout(() => {
             sgworld.Navigate.flyToPointsInterest({
-              destination: { 'x': data.lng, 'y': data.lat, 'z': data.alt },
+              destination: {
+                "x": -2187108.231948378,
+                "y": 4392040.442348233,
+                "z": 4063265.829085007
+              },
               orientation: {
-                heading: data.heading,
-                pitch: data.pitch,
-                roll: data.roll,
+                heading: 2.4384163743219607,
+                pitch: -0.32733173444759833,
+                roll: 6.283095595698651,
               },
               duration: 10, //椋炶鏃堕棿8s
             });
-          }, 9000);
+          }, 1000);
           that.setCesiumInit(true);
           // rpc.initRpc();
         }
@@ -141,7 +136,7 @@
       //鍦颁笅妯″紡璺濈鍙傛暟
       Viewer.scene.globe.translucency.frontFaceAlpha = 0.5;
       Viewer.scene.globe.undergroundColor = undefined;
-      mapMsg.init();
+      rpc.initMessage();
       rpc.clickToCoordinates();
 
       //鏍囦細缂栬緫
diff --git a/src/components/menu/bottom-menu.vue b/src/components/menu/bottom-menu.vue
index 099ebfa..52c033a 100644
--- a/src/components/menu/bottom-menu.vue
+++ b/src/components/menu/bottom-menu.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="specialTool">
-    <div
-      class="legend"
-      v-for="(item, index) in list"
-      :key="index"
-    >
+    <div class="legend" v-for="(item, index) in list" :key="index">
       <img
         class="img"
         :src="item.icon"
@@ -20,32 +16,29 @@
 .specialTool {
   position: absolute;
   bottom: 45px;
-  /* width: 650px; */
-  /* padding: 5px; */
+  width: 680px;
+  padding: 5px;
   border: 2px solid #016ce2;
   border-radius: 3px;
   background-color: #0952c860;
   color: #fff;
-  font-size: 10px;
+  font-size: 15px;
   left: 50%;
   transform: translateX(-50%);
   z-index: 99999;
   pointer-events: all;
-  padding: 10px 10px;
-  padding-left: 0px;
+  display: flex;
+  justify-content: space-between;
 }
 .legend {
-  /* width: 150px; */
-  margin-left: 10px;
+  width: 150px;
   display: flex;
-  float: left;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  /* background: red; */
 }
 img {
-  width: 20px;
+  width: 40px;
 }
 </style>
 
diff --git a/src/components/poplayer/coord.vue b/src/components/poplayer/coord.vue
index 012dcc4..ad5b571 100644
--- a/src/components/poplayer/coord.vue
+++ b/src/components/poplayer/coord.vue
@@ -1,17 +1,16 @@
 <template>
   <div v-if="state.show">
-
-    <location :list="list"></location>
+    <poplayer :list="list" />
   </div>
 </template>
 
 <script>
-import location from "./location.vue";
+import poplayer from "./location.vue";
 import store from "@/utils/store";
 export default {
   name: "Main",
   components: {
-    location,
+    poplayer,
   },
   data() {
     return {
diff --git a/src/components/poplayer/location.vue b/src/components/poplayer/location.vue
index 52e990e..4efa550 100644
--- a/src/components/poplayer/location.vue
+++ b/src/components/poplayer/location.vue
@@ -5,25 +5,20 @@
         class="close"
         @click.stop="closehandle"
       ></div>
+      <!-- <div class="title">鐐逛綅璇︽儏</div> -->
       <div class="content">
-        <div class="ssdw">{{ state.list.name }}</div>
-
-        <div
-          class="lxr"
-          v-if=" state.list.address"
-        >鍦板潃锛歿{ state.list.address }}</div>
-        <div
-          class="lxr"
-          v-if=" state.list.code"
-        >鍦板潡缂栧彿锛歿{ state.list.code }}</div>
-        <div
-          class="lxr"
-          v-if=" state.list.area"
-        >鍦板潡闈㈢Н锛歿{ state.list.area }} 骞虫柟绫�</div>
+        <div class="ssdw">{{ state.list[KEY["鎵�灞炲崟浣�"]] }}</div>
+        <div class="lxr">鑱旂郴浜猴細{{ state.list[KEY["鑱旂郴浜�"]] }}</div>
+        <div class="dz">鍦板潃锛歿{ state.list[KEY["鍦板潃"]] }}</div>
+        <!-- <div class="con-item" v-for="(item, index) in KEY" :key="index">
+          <span class="name">{{ index }}锛�</span>
+          <span class="value">{{ state.list[item] }}</span>
+        </div> -->
       </div>
     </div>
   </div>
 </template>
+
 <script>
 import store from "@/utils/store";
 import keys from "@/utils/poiKeys";
@@ -40,7 +35,7 @@
   },
   data() {
     return {
-      state: store.localLayer,
+      state: store.Poplayer,
       KEY: {},
     };
   },
@@ -48,10 +43,8 @@
   mounted() {
     if (this.list) {
       this.state.list = this.list;
-
     }
-    // this.KEY = keys[this.state.list.POITYPE];
-
+    this.KEY = keys[this.state.list.POITYPE];
   },
   watch: {
     "state.list": function (val) {
diff --git a/src/router/index.js b/src/router/index.js
index 17c452b..83a6abc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,8 +14,8 @@
   },
 ];
 const router = new Router({
-  // mode: "history",
-  // base: '/TEST6',
+  mode: "history",
+  base: '/TEST',
   routes,
 });
 router.beforeEach((to, from, next) => {
diff --git a/src/utils/poiKeys.js b/src/utils/poiKeys.js
index fd54876..737ca40 100644
--- a/src/utils/poiKeys.js
+++ b/src/utils/poiKeys.js
@@ -4,6 +4,5 @@
         鑱旂郴浜�: "LXR",
         鍦板潃: "DIZHI",
     },
-
 }
 export default keys
\ No newline at end of file
diff --git a/src/utils/store.js b/src/utils/store.js
index e33ba81..728f311 100644
--- a/src/utils/store.js
+++ b/src/utils/store.js
@@ -8,11 +8,6 @@
         list: {},
         show: false
     },
-    queryLayer: {
-        data: null,
-        isShow: false,
-        val: null,
-    },
     setPoplayerListAction(newValue) {
         if (this.debug) { }
         this.Poplayer.list = newValue
diff --git a/static/layers.json b/static/layers.json
index 7c46102..b741eae 100644
--- a/static/layers.json
+++ b/static/layers.json
@@ -11,12 +11,12 @@
           "id": "18B25A94",
           "sourceType": "wmse",
           "name": "60骞虫柟鍏噷鏍稿績鍖虹晫",
-          "urls": "http://10.10.4.121:8070/gisserver/wmsserver/YZ_BJ60",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ60",
           "maximumLevel": 26,
           "alpha": 1,
           "zIndex": 7,
           "Level": "11,20",
-          "checked": true,
+          "checked": false,
           "rename": false,
           "flyTo": ["116.51352", "39.76102", "30523.31", "360.0", "-89.8"]
         },
@@ -24,7 +24,7 @@
           "id": "47EC9636",
           "sourceType": "wmse",
           "name": "225骞虫柟鍏噷鍖虹晫",
-          "urls": "http://10.10.4.121:8070/gisserver/wmsserver/YZ_BJ",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ",
           "maximumLevel": 26,
           "alpha": 1,
           "zIndex": 7,
@@ -39,9 +39,9 @@
           "alpha": 1,
           "name": "缁忓紑鍖烘斂鍔℃湇鍔′腑蹇� ",
           "class": "point",
-          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
           "layer": "缁忓紑鍖烘斂鍔℃湇鍔′腑蹇�",
-          "text": "",
+          "text": "[MCJC]",
           "height": 50,
           "bgColor": "#ff0000",
           "color": "#ffff00",
@@ -56,8 +56,93 @@
           "outlineWidth": 1,
           "offsetX": 0,
           "offsetY": -72,
-          "imageScale": 0.2,
+          "imageScale": 0.5,
           "disableDepthTestDistance": "Number.POSITIVE_INFINITY",
+          "checked": true,
+          "rename": false
+        },
+
+        {
+          "id": "shequfuwuzha",
+          "sourceType": "wfs",
+          "alpha": 1,
+          "name": "绀惧尯鏈嶅姟绔�",
+          "class": "point",
+          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shequfuwuzha",
+          "layer": "绀惧尯鏈嶅姟绔�",
+          "text": "[MCJC]",
+          "height": 50,
+          "bgColor": "#ff0000",
+          "color": "#ffff00",
+          "outlineColor": "#ffffff",
+          "clampToGround": false,
+          "classificationType": 2,
+          "image": "./static/SmartEarthSDK/Workers/image/绀惧尯鏈嶅姟绔�.png",
+          "minimumLevel": 10,
+          "maximumLevel": 22,
+          "font": "Arial",
+          "scale": 1.5,
+          "outlineWidth": 1,
+          "offsetX": 0,
+          "offsetY": -72,
+          "imageScale": 0.5,
+          "disableDepthTestDistance": "Infinity",
+          "checked": true,
+          "rename": false
+        },
+        {
+          "id": "yiqifuwugang1005",
+          "sourceType": "wfs",
+          "alpha": 1,
+          "name": "浜︿紒鏈嶅姟娓�1005",
+          "class": "point",
+          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/yiqifuwugang1005",
+          "layer": "浜︿紒鏈嶅姟娓�1005",
+          "text": "[MCJC]",
+          "height": 50,
+          "bgColor": "#ff0000",
+          "color": "#ffff00",
+          "outlineColor": "#ffffff",
+          "clampToGround": false,
+          "classificationType": 2,
+          "image": "./static/SmartEarthSDK/Workers/image/浜︿紒鏈嶅姟娓�.png",
+          "minimumLevel": 10,
+          "maximumLevel": 22,
+          "font": "Arial",
+          "scale": 1.5,
+          "outlineWidth": 1,
+          "offsetX": 0,
+          "offsetY": -72,
+          "imageScale": 0.5,
+          "disableDepthTestDistance": "Infinity",
+          "checked": true,
+          "rename": false
+        },
+        {
+          "id": "yuanqufuwuzhan1005",
+          "sourceType": "wfs",
+          "alpha": 1,
+          "name": "鍥尯鏈嶅姟绔�",
+          "class": "point",
+          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/yuangufuwuzhan1005",
+          "layer": "鍥尯鏈嶅姟绔�",
+          "text": "[MCJC]",
+          "height": 50,
+          "bgColor": "#ff0000",
+          "color": "#ffff00",
+          "outlineColor": "#ffffff",
+          "clampToGround": false,
+          "classificationType": 2,
+          "image": "./static/SmartEarthSDK/Workers/image/鍥尯鏈嶅姟绔�.png",
+          "minimumLevel": 10,
+          "maximumLevel": 22,
+          "font": "Arial",
+          "scale": 1.5,
+          "outlineWidth": 1,
+          "offsetX": 0,
+          "offsetY": -72,
+          "imageScale": 0.5,
+          "disableDepthTestDistance": "Infinity",
           "checked": true,
           "rename": false
         },
@@ -67,9 +152,9 @@
           "alpha": 1,
           "name": "琛楅亾鏀垮姟鏈嶅姟涓績",
           "class": "point",
-          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
           "layer": "琛楅亾鏀垮姟鏈嶅姟涓績",
-          "text": "",
+          "text": "[MCJC]",
           "height": 50,
           "bgColor": "#000",
           "color": "#ffff00",
@@ -84,7 +169,7 @@
           "outlineWidth": 1,
           "offsetX": 0,
           "offsetY": -72,
-          "imageScale": 0.2,
+          "imageScale": 0.5,
           "disableDepthTestDistance": "Infinity",
           "checked": true,
           "rename": false
@@ -95,9 +180,9 @@
           "alpha": 1,
           "name": "浜︿紒鏈嶅姟娓� ",
           "class": "point",
-          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
           "layer": "浜︿紒鏈嶅姟娓�",
-          "text": "",
+          "text": "[MCJC]",
           "height": 50,
           "bgColor": "#000",
           "color": "#ffff00",
@@ -112,7 +197,7 @@
           "outlineWidth": 1,
           "offsetX": 0,
           "offsetY": -72,
-          "imageScale": 0.2,
+          "imageScale": 0.5,
           "disableDepthTestDistance": "Infinity",
           "checked": true,
           "rename": false
@@ -123,9 +208,9 @@
           "alpha": 1,
           "name": "鍥尯鏈嶅姟绔� ",
           "class": "point",
-          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
           "layer": "鍥尯鏈嶅姟绔�",
-          "text": "",
+          "text": "[MCJC]",
           "height": 50,
           "bgColor": "#0952c8",
           "color": "#ffff00",
@@ -140,7 +225,7 @@
           "outlineWidth": 1,
           "offsetX": 0,
           "offsetY": -72,
-          "imageScale": 0.2,
+          "imageScale": 0.5,
           "disableDepthTestDistance": "Infinity",
           "checked": true,
           "rename": false
@@ -151,9 +236,9 @@
           "alpha": 1,
           "name": "绀惧尯鏈嶅姟绔� ",
           "class": "point",
-          "urls": "http://10.10.4.121:8070/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/wfsserver/sanjizhengwufuwutixi_wfs",
           "layer": "绀惧尯鏈嶅姟绔�",
-          "text": "",
+          "text": "[MCJC]",
           "height": 50,
           "bgColor": "#0952c8",
           "color": "#ffff00",
@@ -168,7 +253,7 @@
           "outlineWidth": 1,
           "offsetX": 0,
           "offsetY": -72,
-          "imageScale": 0.2,
+          "imageScale": 0.5,
           "disableDepthTestDistance": "Infinity",
           "checked": true,
           "rename": false
@@ -177,7 +262,7 @@
           "id": "chengshiguihua_xiangmumingcheng_tms",
           "name": "浜﹀簞鏂板煄瑙勫垝鍥�",
           "sourceType": "local-map",
-          "urls": "http://10.10.4.121:8070/gisserver/tmsserver/chengshiguihua_xiangmumingcheng_tms",
+          "urls": "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_xiangmumingcheng_tms",
           "tile": "{z}/{x}/{y}",
           "tileType": "Mercator",
           "img": "jpeg",
@@ -209,7 +294,7 @@
                   "id": "baise2D",
                   "name": "鐧借壊浜岀淮",
                   "sourceType": "local-map",
-                  "urls": "http://10.10.4.121:8070/gisserver/tmsserver/shiliangditu_baisexi",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/tmsserver/shiliangditu_baisexi",
                   "tile": "{z}/{x}/{y}",
                   "tileType": "Mercator",
                   "img": "jpeg",
@@ -224,7 +309,7 @@
                   "id": "shenlan2D",
                   "name": "娣辫摑浜岀淮",
                   "sourceType": "local-map",
-                  "urls": "http://10.10.4.121:8070/gisserver/tmsserver/shiliangditu_kejilan",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/tmsserver/shiliangditu_kejilan",
                   "tile": "{z}/{x}/{y}",
                   "tileType": "Mercator",
                   "img": "jpeg",
@@ -239,7 +324,7 @@
                   "id": "heijin2D",
                   "name": "榛戦噾浜岀淮",
                   "sourceType": "local-map",
-                  "urls": "http://10.10.4.121:8070/gisserver/tmsserver/shiliangtu_anyehei",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/tmsserver/shiliangtu_anyehei",
                   "tile": "{z}/{x}/{y}",
                   "tileType": "Mercator",
                   "img": "jpeg",
@@ -263,7 +348,7 @@
                   "id": "jiaotongluwang_tms",
                   "name": "閬撹矾",
                   "sourceType": "local-map",
-                  "urls": "http://10.10.4.121:8070/gisserver/tmsserver/jiaotongluwang_tms",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/tmsserver/jiaotongluwang_tms",
                   "tile": "{z}/{x}/{y}",
                   "tileType": "Mercator",
                   "img": "jpeg",
@@ -309,7 +394,7 @@
               "id": "8A969952",
               "sourceType": "b3dm",
               "name": "寤虹瓚浣撳潡",
-              "urls": "http://10.10.4.121:8070/gisserver/c3dserver/YZ_BM/tileset.json",
+              "urls": "https://skyzt.bda.gov.cn/gisserver/c3dserver/YZ_BM/tileset.json",
               "checked": false,
               "rename": false
             },
@@ -322,7 +407,7 @@
                   "name": "鏍稿績鍖哄缓绛戠墿",
                   "sourceType": "b3dm",
                   "checked": true,
-                  "urls": "http://10.10.4.121:8070/gisserver/c3dserver/hxq0609/tileset.json",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/c3dserver/hxq0609/tileset.json",
                   "rename": false,
                   "height": 0,
                   "zIndex": 1
@@ -332,7 +417,7 @@
                   "name": "225瀹炴櫙涓夌淮鏍稿績鍖哄湴闈�",
                   "sourceType": "b3dm",
                   "checked": true,
-                  "urls": "http://10.10.4.121:8070/gisserver/c3dserver/hexinqudimian/tileset.json",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/c3dserver/hexinqudimian/tileset.json",
                   "rename": false,
                   "height": 0,
                   "zIndex": 1
@@ -343,7 +428,7 @@
                   "checked": true,
                   "sourceType": "b3dm",
                   "height": 0,
-                  "urls": "http://10.10.4.121:8070/gisserver/c3dserver/fhx/tileset.json",
+                  "urls": "https://skyzt.bda.gov.cn/gisserver/c3dserver/fhx/tileset.json",
                   "rename": false,
                   "zIndex": 1
                 }
@@ -355,1004 +440,6 @@
           ],
           "rename": false,
           "expanded": false
-        }
-      ],
-      "rename": false,
-      "expanded": false
-    },
-    {
-      "id": "352E7A55",
-      "name": "甯傜骇璧勬簮",
-      "children": [
-        {
-          "id": "c6e21f6f55574284aeb4df13302e9c2e",
-          "name": "甯傛暀濮�",
-          "isParent": true,
-          "nocheck": true,
-          "open": false,
-          "children": [
-            {
-              "id": "gjzx",
-              "name": "楂樼骇涓",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4609-楂樼骇涓",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "gdxx",
-              "name": "宸ヨ瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4603-宸ヨ瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "jnygzxx",
-              "name": "涔濆勾涓�璐埗瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4555-涔濆勾涓�璐埗瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "mbgdjyptgx",
-              "name": "姘戝姙楂樼瓑鏁欒偛鏅�氶珮鏍�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4607-姘戝姙楂樼瓑鏁欒偛鏅�氶珮鏍�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "mbgdjyqtjg",
-              "name": "姘戝姙楂樼瓑鏁欒偛鍏朵粬鏈烘瀯",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4606-姘戝姙楂樼瓑鏁欒偛鍏朵粬鏈烘瀯",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "ptgx",
-              "name": "鏅�氶珮鏍�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4605-鏅�氶珮鏍�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "senygzxx",
-              "name": "鍗佷簩骞翠竴璐埗瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4601-鍗佷簩骞翠竴璐埗瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "tsjyxx",
-              "name": "鐗规畩鏁欒偛瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4608-鐗规畩鏁欒偛瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "wqzx",
-              "name": "瀹屽叏涓",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4602-瀹屽叏涓",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "xx",
-              "name": "灏忓",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4230-灏忓",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "yey",
-              "name": "骞煎効鍥�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4472-骞煎効鍥�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "zdzyxx",
-              "name": "涓瓑鑱屼笟瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4554-涓瓑鑱屼笟瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "cz",
-              "name": "鍒濈骇涓",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4555-鍒濈骇涓",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "qsdmzxx",
-              "name": "灏戞暟姘戞棌瀛︽牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/jiaoweiyewushuju",
-              "layer": "L4002-灏戞暟姘戞棌瀛︽牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            }
-          ],
-          "rename": false
-        },
-        {
-          "id": "a5c5af0b6f8c4160971a153094431161",
-          "name": "甯傚崼鐢熷仴搴峰",
-          "isParent": true,
-          "nocheck": true,
-          "open": false,
-          "children": [
-            {
-              "id": "jjjg",
-              "name": "鎬ユ晳鏈烘瀯",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4712-鎬ユ晳鏈烘瀯",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "wsjdzx",
-              "name": "鍗敓鐩戠潱涓績",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4708-鍗敓鐩戠潱涓績",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "jtcxd",
-              "name": "琛楀ご閲嗚鐐�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4713-琛楀ご閲嗚鐐�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "qtylwsjg",
-              "name": "鍏朵粬鍖荤枟鍗敓鏈烘瀯",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4704-鍏朵粬鍖荤枟鍗敓鏈烘瀯",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "sjyy",
-              "name": "涓夌骇鍖婚櫌",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L3995-涓夌骇鍖婚櫌",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "ejyy",
-              "name": "浜岀骇鍖婚櫌",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L3595-浜岀骇鍖婚櫌",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "sqwsfwzx",
-              "name": "绀惧尯鍗敓鏈嶅姟涓績",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4018-绀惧尯鍗敓鏈嶅姟涓績",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "tjyljg",
-              "name": "浣撴鍖荤枟鏈烘瀯",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shiweishengjiankangwei",
-              "layer": "L4147-浣撴鍖荤枟鏈烘瀯",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            }
-          ],
-          "rename": false
-        },
-        {
-          "id": "ac3cbc546cd644c79c19df961c7cfba1",
-          "name": "甯傚晢鍔″眬",
-          "isParent": true,
-          "nocheck": true,
-          "open": false,
-          "children": [
-            {
-              "id": "szddtzqy",
-              "name": "鐢熺尓瀹氱偣灞犲浼佷笟",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shishangwuju",
-              "layer": "L4678-鐢熺尓瀹氱偣灞犲浼佷笟",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "bldmdps",
-              "name": "渚垮埄搴楁湯绔厤閫�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shishangwuju",
-              "layer": "L4673-渚垮埄搴楁湯绔厤閫�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            },
-            {
-              "id": "zrxs121jcs",
-              "name": "鐚倝閿�鍞�121瀹惰秴甯�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/shishangwuju",
-              "layer": "L4679-鐚倝閿�鍞�121瀹惰秴甯�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": true,
-              "rename": false
-            }
-          ],
-          "rename": false
-        },
-        {
-          "id": "a59f601b171442a1bef0f4df5f3dd664",
-          "name": "甯傚叕瀹夊眬",
-          "isParent": true,
-          "nocheck": true,
-          "open": false,
-          "children": [
-            {
-              "id": "bgld",
-              "name": "瀹鹃鏃呭簵",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4397-瀹鹃鏃呭簵",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "crjzjjg",
-              "name": "鍑哄叆澧冧腑浠嬫満鏋�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3539-鍑哄叆澧冧腑浠嬫満鏋�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "jtzfjg",
-              "name": "浜ら�氭墽娉曟満鏋�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3764-浜ら�氭墽娉曟満鏋�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "lctcc",
-              "name": "璺晶鍋滆溅浣�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3831-璺晶鍋滆溅浣�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "jx",
-              "name": "椹炬牎",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3750-椹炬牎",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "sqmjjjwgzs",
-              "name": "绀惧尯姘戣鍙婅鍔″伐浣滃",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4628-绀惧尯姘戣鍙婅鍔″伐浣滃",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "jtzdd",
-              "name": "浜ら�氭敮澶ч槦",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3763-浜ら�氭敮澶ч槦",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "fjdcdjz",
-              "name": "闈炴満鍔ㄨ溅鐧昏绔�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4634-闈炴満鍔ㄨ溅鐧昏绔�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "jdcjcc",
-              "name": "鏈哄姩杞︽娴嬪満",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3721-鏈哄姩杞︽娴嬪満",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "pcs",
-              "name": "娲惧嚭鎵�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4627-娲惧嚭鎵�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "cgz",
-              "name": "杞︾绔�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4404-杞︾绔�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "cgs",
-              "name": "杞︾鎵�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L4403-杞︾鎵�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            },
-            {
-              "id": "jtsgcljg",
-              "name": "浜ら�氫簨鏁呭鐞嗘満鏋�",
-              "sourceType": "cluster",
-              "alpha": 1,
-              "class": "point",
-              "urls": "http://10.10.4.121:8070/gisserver/wfsserver/gonganjuyewushuju",
-              "layer": "L3761-浜ら�氫簨鏁呭鐞嗘満鏋�",
-              "color": "#ffffff",
-              "outlineColor": "#ffffff",
-              "clampToGround": true,
-              "classificationType": 2,
-              "image": "http://10.10.4.116:8080/YZXNCS/static/SmartEarthSDK/Workers/image/point-16px.png",
-              "minimumLevel": 13,
-              "maximumLevel": 22,
-              "font": "Arial",
-              "scale": 2,
-              "outlineWidth": 1,
-              "offsetX": 0,
-              "offsetY": 0,
-              "imageScale": 1,
-              "disableDepthTestDistance": "Infinity",
-              "checked": false,
-              "rename": false
-            }
-          ],
-          "rename": false
         }
       ],
       "rename": false,
diff --git a/static/mapData.js b/static/mapData.js
index 741f227..cbba85a 100644
--- a/static/mapData.js
+++ b/static/mapData.js
@@ -1,16 +1,12 @@
 const mapData = {
-
-    apiUrl: 'http://10.10.4.121:8070/',    //鎺ュ彛璋冪敤鍦板潃
-    apiUrl1: 'http://10.10.4.121:8070/PoiExcel',    //鎺ュ彛璋冪敤鍦板潃
     mapRest: {
-        lng: -2189208.281391369, //缁忓害0
-        lat: 4391302.729127172, //绾害
-        alt: 4061318.292309685, //楂樺害
-        heading: 2.6713242790763387, //鍋忕Щ瑙掑害
-        pitch: -0.017921496409462057, //淇话瑙掑害
-        roll: 6.283184545431953 //鏃嬭浆瑙掑害
+        lng: -2187108.231948378, //缁忓害
+        lat: 4392040.442348233, //绾害
+        alt: 4063265.829085007, //楂樺害
+        heading: 2.4384163743219607, //鍋忕Щ瑙掑害
+        pitch: -0.32733173444759833, //淇话瑙掑害
+        roll: 6.283095595698651 //鏃嬭浆瑙掑害
     },
-
     //鍔ㄧ敾瀵艰埅鐐�
     animaNavigation: [
         {
@@ -87,12 +83,6 @@
         height: 50,
         flytime: 15,
         text: "杩欐槸涓�鏉℃祴璇曟暟鎹�"
-    },
-    msgMach: {
-        rest: ['澶嶄綅', '杩樺師', '鍒濆鍖�', '鍒濆浣嶇疆'],
-        lineRoam: ['婕父', '瀵艰埅'],
-        closeRoam: ['鍋滄婕父', '鍋滄瀵艰埅'],
-        localPage: ['涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�']
     }
 };
 export default mapData;

--
Gitblit v1.9.3