From b5919ce577d2106eb8294e74160cda5c61feb4a8 Mon Sep 17 00:00:00 2001
From: ansel0926 <ansel0926@gmail.com>
Date: 星期二, 17 五月 2022 18:43:53 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

---
 view/project/layerAnalysis.html |  126 +++++++++++++++++++++---------------------
 1 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/view/project/layerAnalysis.html b/view/project/layerAnalysis.html
index 81deb1f..e7e6774 100644
--- a/view/project/layerAnalysis.html
+++ b/view/project/layerAnalysis.html
@@ -114,7 +114,7 @@
                                 break;
                             }
                             case "shpFeature": {
-                                console.log("shpFeature click");                                
+                                console.log("shpFeature click");
 
                             }
                         }
@@ -162,81 +162,81 @@
                     var type = objData.field;
 
                     if (type == "shpFeature") {//濡傛灉鏄� shp鍥惧眰
-                        if(ischeck){
-                            let data= obj.data.ext;
-                            
+                        if (ischeck) {
+                            let data = obj.data.ext;
+
                             let path = data.path;
-                                let shpArray = JSON.parse(path);
-                                var shpPromises = [];
+                            let shpArray = JSON.parse(path);
+                            var shpPromises = [];
+                            for (let i = 0; i < shpArray.length; i++) {
+                                shpPromises.push(parent.Cesium.loadBlob(parent.httpConfig.nginxUrl + shpArray[i]));
+                            }
+
+                            //鍒ゆ柇鏄惁瀛樺湪
+                            let len = parent.viewer.imageryLayers.length;
+                            if (parent.layerMap.get(obj.data.id) != null) {
+                                parent.vMsg.warning("鍥惧眰宸茬粡瀛樺湪鏃犻渶閲嶅鍔犺浇");
+                                return;
+                            }
+
+                            var layer = null;
+                            parent.Cesium.when.all(shpPromises, function (files) {
                                 for (let i = 0; i < shpArray.length; i++) {
-                                    shpPromises.push(parent.Cesium.loadBlob(parent.httpConfig.nginxUrl + shpArray[i]));
+                                    files[i].name = shpArray[i];
                                 }
 
-                                //鍒ゆ柇鏄惁瀛樺湪
-                                let len = parent.viewer.imageryLayers.length;
-                                if (parent.layerMap.get(obj.data.id) != null) {
-                                    parent.vMsg.warning("鍥惧眰宸茬粡瀛樺湪鏃犻渶閲嶅鍔犺浇");
-                                    return;
-                                }
+                                var shpProvider = new parent.VectorTileImageryProvider({
+                                    source:  files,
+                                    zIndex: len,
+                                    removeDuplicate: false,
+                                    defaultStyle: {
+                                        outlineColor: data.color,
+                                        fillColor: data.color,
+                                        lineWidth: 1,
+                                        fill: true,
+                                        tileCacheSize: 200,
+                                        showMaker: true,
+                                        showCenterLabel: true,
+                                        fontColor: "rgba(255,0,0,1)",
+                                        labelOffsetX: -10,
+                                        labelOffsetY: -5,
+                                        fontSize: 13,
+                                        fontFamily: "榛戜綋",
+                                        centerLabelPropertyName: "NAME",
+                                        lineCap: "round",
+                                        shadowColor: "black",
+                                        shadowOffsetX: 1,
+                                        shadowOffsetY: -1,
+                                        shadowBlur: 1,
+                                        lineJoin: "round"
+                                    },
+                                    maximumLevel: 20,
+                                    minimumLevel: 1,
+                                    simplify: false
+                                });
+                                shpProvider.readyPromise.then(function () {
+                                    parent.layerMap.set(obj.data.id, len);
+                                    layer = parent.viewer.imageryLayers.addImageryProvider(shpProvider, len);
 
-                                var layer = null;
-                                parent.Cesium.when.all(shpPromises, function (files) {
-                                    for (let i = 0; i < shpArray.length; i++) {
-                                        files[i].name = shpArray[i];
-                                    }
-    
-                                    var shpProvider = new parent.VectorTileImageryProvider({
-                                        source: files,
-                                        zIndex: len,
-                                        removeDuplicate: false,
-                                        defaultStyle: {
-                                            outlineColor: data.color,
-                                            fillColor: data.color,
-                                            lineWidth: 1,
-                                            fill: false,
-                                            tileCacheSize: 200,
-                                            showMaker: false,
-                                            showCenterLabel: true,
-                                            fontColor: "rgba(255,0,0,1)",
-                                            labelOffsetX: -10,
-                                            labelOffsetY: -5,
-                                            fontSize: 13,
-                                            fontFamily: "榛戜綋",
-                                            centerLabelPropertyName: "NAME",
-                                            lineCap: "round",
-                                            shadowColor: "black",
-                                            shadowOffsetX: 1,
-                                            shadowOffsetY: -1,
-                                            shadowBlur: 1,
-                                            lineJoin: "round"
-                                        },
-                                        maximumLevel: 20,
-                                        minimumLevel: 1,
-                                        simplify: false
-                                    });
-                                    shpProvider.readyPromise.then(function () {
-                                        parent.layerMap.set(obj.data.id, len);
-                                        layer = parent.viewer.imageryLayers.addImageryProvider(shpProvider, len);
-
-                                        parent.viewer.flyTo(layer);
-                                        parent.Cesium.Camera.DEFAULT_VIEW_RECTANGLE = shpProvider.rectangle;
-
-                                    });
+                                    parent.viewer.flyTo(layer);
+                                    parent.Cesium.Camera.DEFAULT_VIEW_RECTANGLE = shpProvider.rectangle;
 
                                 });
-                        }else{//绉婚櫎shp                         
+
+                            });
+                        } else {//绉婚櫎shp                         
                             var id = obj.data.id;
                             var index = parent.layerMap.get(id);
-                          
-                            parent.viewer.imageryLayers.remove(parent.viewer.imageryLayers.get(index),true);
+
+                            parent.viewer.imageryLayers.remove(parent.viewer.imageryLayers.get(index), true);
                             parent.layerMap.delete(id);
-                            for(let key of  parent.layerMap.keys()){//鏁扮粍鐨勬父鏍�-1
-                                if( parent.layerMap.get(key)>index){
-                                    parent.layerMap.set(key, parent.layerMap.get(key)-1);
+                            for (let key of parent.layerMap.keys()) {//鏁扮粍鐨勬父鏍�-1
+                                if (parent.layerMap.get(key) > index) {
+                                    parent.layerMap.set(key, parent.layerMap.get(key) - 1);
                                 }
                             }
                         }
-                      
+
                     }
 
                     if (type != 'BaseMap' && type != 'Terrain' && type != 'Plotting') {

--
Gitblit v1.9.1