Merge branch 'master' of http://47.103.92.60:3003/skyversation/xujingtown_irflcmp_ui into lmx

public/static/data/西虹桥2024医疗机构.geojson

@@ -0,0 +1,8 @@
+{
+"type": "FeatureCollection",
+"name": "西虹桥2024医疗机构",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+
+]
+}

public/static/data/西虹桥公立学校.geojson

@@ -0,0 +1,63 @@
+{
+    "type": "FeatureCollection",
+    "name": "西虹桥公立幼儿园",
+    "crs":
+    {
+        "type": "name",
+        "properties":
+        {
+            "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
+        }
+    },
+    "features":
+    [
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "点位信息": "121.295503,31.198477",
+                "纬度": "31.198477",
+                "机构名称": "青浦区徐泾第三幼儿园",
+                "办公电话": "6.9760981E7",
+                "经度": "121.295503",
+                "地址": "青浦区徐灵路181号",
+                "备注": "",
+                "邮编": "201702.0",
+                "机构类别": "幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.291032232183241,
+                    31.200477386351299
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "点位信息": "121.282854,31.191918",
+                "纬度": "31.191918",
+                "机构名称": "青浦实验蟠文幼儿园",
+                "办公电话": "5.9767837E7",
+                "经度": "121.282854",
+                "地址": "青浦区徐泾镇龙联路870号",
+                "备注": "",
+                "邮编": "201702.0",
+                "机构类别": "幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.277021814115159,
+                    31.192657965480201
+                ]
+            }
+        }
+    ]
+}

public/static/data/西虹桥养老机构.geojson

@@ -0,0 +1,8 @@
+{
+"type": "FeatureCollection",
+"name": "西虹桥养老机构",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+
+]
+}

public/static/data/西虹桥民营医疗机构.geojson

@@ -0,0 +1,24 @@
+{
+"type": "FeatureCollection",
+"name": "西虹桥民营医疗机构",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+{ "type": "Feature", "properties": { "法定代表人": "徐维宁", "街镇": "徐泾镇", "联系电话": "69760346", "地址": "上海市青浦区徐泾镇方家塘路188号、198号102室", "统一社会信用代码": "91310118591601480B", "性质": "营利性", "单位名称": "上海缔青口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.3082, 31.1631 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "何燕", "街镇": "徐泾镇", "联系电话": "13621935365", "地址": "青浦区徐泾镇诸光路366弄8号202室", "统一社会信用代码": "91310118MA1JL42L66", "性质": "营利性", "单位名称": "上海佑恩口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.3111, 31.1659 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "邱梦琦", "街镇": "徐泾镇", "联系电话": "5.9778288E7", "地址": "上海市青浦区徐泾镇蟠中路377号、389号东半间", "统一社会信用代码": "91310118MA1JN0YU3M", "性质": "营利性", "单位名称": "上海维佳康卡尔口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.279, 31.1855 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "康相辉", "街镇": "徐泾镇", "联系电话": "1.3512132325E10", "地址": "上海市青浦区诸光路1588弄328号、330号、332号", "统一社会信用代码": "91310118MA1JNTXC9Y", "性质": "营利性", "单位名称": "上海迪贝口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.2986, 31.1846 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "单华清", "街镇": "徐泾镇", "联系电话": "1.3564158276E10", "地址": "上海市青浦区徐泾镇谢卫路1399号、1411号二层", "统一社会信用代码": "91310118MA1JPC62XJ", "性质": "营利性", "单位名称": "上海卓曜口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.2886, 31.1741 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "张弘毅", "街镇": "徐泾镇", "联系电话": "6.9227822E7", "地址": "上海市青浦区徐泾镇龙联路59弄89弄12、16、20号，涞清路68、72号", "统一社会信用代码": "91310118MACE193P5N", "性质": "营利性", "单位名称": "上海莱天弘正口腔门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.2927, 31.1979 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "沈思嘉", "街镇": "徐泾镇", "联系电话": "3.9888872E7", "地址": "上海市青浦区徐泾镇高光路145号、153号、161号、方家塘路180弄65号201-202室、301-305室", "统一社会信用代码": "91310118MA1JM68E8E", "性质": "营利性", "单位名称": "上海微加医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.3079, 31.1648 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "肖小飞", "街镇": "徐泾镇", "联系电话": "021-5227512", "地址": "上海市青浦区徐泾镇谢卫路1389弄3号、1387号一层；谢卫路1379号、1377号、1369号、1361号、1349号、1347号二层", "统一社会信用代码": "91310118MA1JNNPDXY", "性质": "非营利性", "单位名称": "上海娜美医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.2894, 31.174 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "周奕波", "街镇": "徐泾镇", "联系电话": "1.3262737777E10", "地址": "上海市青浦区徐泾镇徐祥路38号4幢108、206、207、301-314室", "统一社会信用代码": "91310118MA1JNT457K", "性质": "非营利性", "单位名称": "上海安禾美阁医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.2658, 31.2009 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "赵高迪", "街镇": "徐泾镇", "联系电话": "1.3601833505E10", "地址": "上海市青浦区徐泾镇双联路68、88号1幢120室、121室、220室、221室、222室、320室、321室、322室", "统一社会信用代码": "91310118MA1JP0RP9F", "性质": "非营利性", "单位名称": "上海旗美医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.271, 31.1954 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "陈冬梅", "街镇": "徐泾镇", "联系电话": "1.3564958264E10", "地址": "上海市青浦区方家塘路138号1层、152号1层、方家塘路180弄28号1层、方家塘路180弄32号1层，方家塘路180弄26号201-204室", "统一社会信用代码": "91310118MA1JPB2D19", "性质": "非营利性", "单位名称": "上海桉锘美医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.3088, 31.1636 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "秦萍", "街镇": "徐泾镇", "联系电话": "5.9881606E7", "地址": "上海市青浦区徐民路308弄30号、32号、33号", "统一社会信用代码": "91310118MA1JNWN21J", "性质": "营利性", "单位名称": "上海威沃眼科门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.282, 31.1846 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "姜声华", "街镇": "徐泾镇", "联系电话": "1.3916810567E10", "地址": "上海市青浦区徐泾镇方家塘路180弄39号1层、37号2层", "统一社会信用代码": "91310118MAD6DNDC01", "性质": "营利性", "单位名称": "上海太敬康复医疗中心" }, "geometry": { "type": "Point", "coordinates": [ 121.3094, 31.1636 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "陈冬梅", "街镇": "徐泾镇", "联系电话": "1.3564958264E10", "地址": "上海市青浦区方家塘路138号1层、152号1层、方家塘路180弄28号1层、方家塘路180弄32号1层，方家塘路180弄26号201-204室", "统一社会信用代码": "91310118MA1JPB2D19", "性质": "", "单位名称": "上海桉锘美医疗美容门诊部" }, "geometry": { "type": "Point", "coordinates": [ 121.3088, 31.1636 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "季建刚", "街镇": "徐泾镇", "联系电话": "1.3671831728E10", "地址": "青浦区徐泾镇卉恒路718弄9号", "统一社会信用代码": "92310118MA1M0PDD6G", "性质": "营利性", "单位名称": "上海季建刚中医诊所" }, "geometry": { "type": "Point", "coordinates": [ 121.2802, 31.185 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "潘佳亮", "街镇": "徐泾镇", "联系电话": "1.7610248683E10", "地址": "上海市青浦区徐泾镇诸光路1588弄300号202室", "统一社会信用代码": "91310118MA1JPB029B", "性质": "营利性", "单位名称": "上海游小方中医诊所" }, "geometry": { "type": "Point", "coordinates": [ 121.2984, 31.1869 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "陈雪球", "街镇": "徐泾镇", "联系电话": "6.2498057E7", "地址": "上海市青浦区徐泾镇沪青平公路1818号230室", "统一社会信用代码": "52310118MJ5305881C", "性质": "非营利性", "单位名称": "上海济家汇泾护理站" }, "geometry": { "type": "Point", "coordinates": [ 121.2776, 31.1716 ] } }
+]
+}

public/static/data/西虹桥民营医院.geojson

@@ -0,0 +1,10 @@
+{
+"type": "FeatureCollection",
+"name": "西虹桥民营医院",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+{ "type": "Feature", "properties": { "法定代表人": "宋冬雷", "街镇": "徐泾镇", "联系电话": "6.0866731E7", "地址": "上海市青浦区徐泾镇华徐公路988号1幢、2幢、3幢、4幢、5幢", "统一社会信用代码": "91310118MA1JLPYU03", "性质": "营利性", "单位名称": "上海冬雷脑科医院" }, "geometry": { "type": "Point", "coordinates": [ 121.2607, 31.2042 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "李占和", "街镇": "徐泾镇", "联系电话": "57673300", "地址": "上海市青浦区徐泾镇华徐公路988号6幢-1层西侧、1层102室及6-11层", "统一社会信用代码": "91310114093633770T", "性质": "营利性", "单位名称": "上海禾滨康复医院" }, "geometry": { "type": "Point", "coordinates": [ 121.2602, 31.2052 ] } },
+{ "type": "Feature", "properties": { "法定代表人": "方波", "街镇": "徐泾镇", "联系电话": "13310132119", "地址": "上海市青浦区徐泾镇蟠中路373号-1，蟠龙路670号102室、103室、104室、105，209室-1、210室-1、211室-1、212室-1，会恒路718弄41号102、103室", "统一社会信用代码": "91310118MA1JNX482W", "性质": "营利性", "单位名称": "上海圣娅医疗美容医院有限公司" }, "geometry": { "type": "Point", "coordinates": [ 121.2793, 31.1851 ] } }
+]
+}

public/static/data/西虹桥私立学校.geojson

@@ -0,0 +1,140 @@
+{
+    "type": "FeatureCollection",
+    "name": "西虹桥学校",
+    "crs":
+    {
+        "type": "name",
+        "properties":
+        {
+            "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
+        }
+    },
+    "features":
+    [
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "法定代表人": "戚珍方",
+                "书记": "梁龙飞",
+                "联系人": "戚珍方",
+                "电话": "13661746540",
+                "党建形式": "第四联合支部",
+                "地址": "徐泾镇华徐公路588号2幢",
+                "机构类别": "幼儿园",
+                "单位名称": "上海青浦区蟠龙民办幼儿园",
+                "类型": "民非",
+                "layer": "西虹桥私立幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.272184348101732,
+                    31.190923951309109
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "法定代表人": "李鸽艳",
+                "书记": "程文新",
+                "联系人": "吴  洁",
+                "电话": "13472716285",
+                "党建形式": "第六联合支部",
+                "地址": "高泾路586号",
+                "机构类别": "幼儿园",
+                "单位名称": "上海私立蒙特梭利幼儿园",
+                "类型": "民非",
+                "layer": "西虹桥私立幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.292827917423708,
+                    31.164854576398138
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "法定代表人": "李  霞",
+                "书记": "程文新",
+                "联系人": "葛海燕",
+                "电话": "18616281689",
+                "党建形式": "第六联合支部",
+                "地址": "青浦区沪清平公路1358号161栋",
+                "机构类别": "幼儿园",
+                "单位名称": "上海市青浦民办悦田幼儿园",
+                "类型": "民非",
+                "layer": "西虹桥私立幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.310292704101627,
+                    31.176935279481537
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "法定代表人": "张丽",
+                "书记": "蒋  蕾",
+                "联系人": "张丽",
+                "电话": "1.5000602962E10",
+                "党建形式": "第十四联合支部",
+                "地址": "青浦区徐泾镇龙联路255号",
+                "机构类别": "幼儿园",
+                "单位名称": "上海青浦爱菊幼儿园有限公司",
+                "类型": "非公",
+                "layer": "西虹桥私立幼儿园"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.284864526799439,
+                    31.195124923511052
+                ]
+            }
+        },
+        {
+            "type": "Feature",
+            "properties":
+            {
+                "法定代表人": "徐  俭",
+                "书记": "沈建英",
+                "联系人": "谷沈静",
+                "电话": "18817956189",
+                "党建形式": "独立支部",
+                "地址": "徐泾镇京华路128号",
+                "机构类别": "中小学",
+                "单位名称": "上海青浦区世外学校",
+                "类型": "民非",
+                "layer": "西虹桥私立中小学"
+            },
+            "geometry":
+            {
+                "type": "Point",
+                "coordinates":
+                [
+                    121.277311438005128,
+                    31.192269827974979
+                ]
+            }
+        }
+    ]
+}

public/static/data/西虹桥边界数据.geojson

@@ -0,0 +1,456 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [
+              121.30830477604735,
+              31.161691578025014
+            ],
+            [
+              121.31880400471044,
+              31.165369290038527
+            ],
+            [
+              121.31865762317642,
+              31.16555252959637
+            ],
+            [
+              121.31802828344746,
+              31.165697007946406
+            ],
+            [
+              121.31738359396849,
+              31.166288053445427
+            ],
+            [
+              121.31723009647231,
+              31.167141779322122
+            ],
+            [
+              121.31726079597229,
+              31.16786415674737
+            ],
+            [
+              121.3168463527357,
+              31.168455188725076
+            ],
+            [
+              121.31604782389252,
+              31.168862245705938
+            ],
+            [
+              121.31558733140776,
+              31.16971594838371
+            ],
+            [
+              121.3152803364174,
+              31.17091111920547
+            ],
+            [
+              121.31486984697466,
+              31.17163725302356
+            ],
+            [
+              121.31425585694967,
+              31.172123193655565
+            ],
+            [
+              121.31381071421492,
+              31.172346462797123
+            ],
+            [
+              121.31376466496687,
+              31.172792999499507
+            ],
+            [
+              121.31333487198026,
+              31.172937466805237
+            ],
+            [
+              121.31324277348222,
+              31.173187000724525
+            ],
+            [
+              121.31342697047643,
+              31.17381739927437
+            ],
+            [
+              121.313380921222,
+              31.174526592640234
+            ],
+            [
+              121.31362651721247,
+              31.17534084512573
+            ],
+            [
+              121.31330411291805,
+              31.176641062062515
+            ],
+            [
+              121.31290501942959,
+              31.17661479632318
+            ],
+            [
+              121.31239847769677,
+              31.176969383188847
+            ],
+            [
+              121.3123370786987,
+              31.17792807436335
+            ],
+            [
+              121.31153889172361,
+              31.17896555113623
+            ],
+            [
+              121.31106639172162,
+              31.179054621188
+            ],
+            [
+              121.3108361454793,
+              31.179317271484763
+            ],
+            [
+              121.31077474648123,
+              31.17997389404111
+            ],
+            [
+              121.31043705199266,
+              31.180328468327787
+            ],
+            [
+              121.30982306201184,
+              31.180617379727963
+            ],
+            [
+              121.30985376151182,
+              31.181129538679457
+            ],
+            [
+              121.3096695645176,
+              31.18152350521794
+            ],
+            [
+              121.3091169735348,
+              31.181799280819604
+            ],
+            [
+              121.30888672729247,
+              31.18242962203641
+            ],
+            [
+              121.30880997854439,
+              31.183059959055512
+            ],
+            [
+              121.30867183079829,
+              31.18336199405654
+            ],
+            [
+              121.30819598856351,
+              31.183493313321776
+            ],
+            [
+              121.30767409708079,
+              31.18363776430276
+            ],
+            [
+              121.30765362950535,
+              31.184262629007236
+            ],
+            [
+              121.30750013201106,
+              31.18466971426328
+            ],
+            [
+              121.3070242897764,
+              31.184998007549353
+            ],
+            [
+              121.3070242897764,
+              31.185313168033275
+            ],
+            [
+              121.3067633440341,
+              31.185733380378835
+            ],
+            [
+              121.3062261028013,
+              31.186311169309178
+            ],
+            [
+              121.30613335614885,
+              31.187114412921275
+            ],
+            [
+              121.30582636116031,
+              31.187508354553387
+            ],
+            [
+              121.30567286366409,
+              31.187981082348713
+            ],
+            [
+              121.30521237117944,
+              31.18882148148768
+            ],
+            [
+              121.29912582548013,
+              31.197392377996792
+            ],
+            [
+              121.29821786463583,
+              31.19734800497112
+            ],
+            [
+              121.29718019445858,
+              31.197747429016417
+            ],
+            [
+              121.29692077691385,
+              31.198035900889835
+            ],
+            [
+              121.2972580197212,
+              31.198501892058175
+            ],
+            [
+              121.29707642744074,
+              31.198945691036442
+            ],
+            [
+              121.29637600007072,
+              31.199145399897745
+            ],
+            [
+              121.295883106735,
+              31.1993672981381
+            ],
+            [
+              121.29614252427973,
+              31.20001080009152
+            ],
+            [
+              121.29580528147233,
+              31.200388023339272
+            ],
+            [
+              121.29515673761136,
+              31.200476781532075
+            ],
+            [
+              121.29481949480243,
+              31.200787434551117
+            ],
+            [
+              121.29505297059347,
+              31.201209033444698
+            ],
+            [
+              121.29463790252191,
+              31.201564062635143
+            ],
+            [
+              121.2940412421699,
+              31.201830333653618
+            ],
+            [
+              121.29385964988779,
+              31.202229738775372
+            ],
+            [
+              121.29393747515195,
+              31.202562575089217
+            ],
+            [
+              121.29326298953578,
+              31.202806654307793
+            ],
+            [
+              121.29302951374626,
+              31.203339188600083
+            ],
+            [
+              121.29266632918365,
+              31.203649832218744
+            ],
+            [
+              121.29170648426901,
+              31.2037607761213
+            ],
+            [
+              121.2907725811096,
+              31.204759265388006
+            ],
+            [
+              121.29030562952914,
+              31.20518084658073
+            ],
+            [
+              121.28985179221246,
+              31.20499236634322
+            ],
+            [
+              121.28951454940517,
+              31.204348898275953
+            ],
+            [
+              121.28899571431572,
+              31.204104823036147
+            ],
+            [
+              121.2883212287104,
+              31.20457078434275
+            ],
+            [
+              121.28793210239411,
+              31.20439327555627
+            ],
+            [
+              121.287750510112,
+              31.202751303491183
+            ],
+            [
+              121.28494880269227,
+              31.20002202051674
+            ],
+            [
+              121.28128018764124,
+              31.19733418714253
+            ],
+            [
+              121.27904919675825,
+              31.19633561950613
+            ],
+            [
+              121.27821906061672,
+              31.19626904795558
+            ],
+            [
+              121.27741486622887,
+              31.19611371415553
+            ],
+            [
+              121.27632531254108,
+              31.196091523591818
+            ],
+            [
+              121.27456127323853,
+              31.196224666895873
+            ],
+            [
+              121.272901000954,
+              31.195913998894966
+            ],
+            [
+              121.2725637581467,
+              31.195891808284472
+            ],
+            [
+              121.27207086481093,
+              31.196468762466026
+            ],
+            [
+              121.2719411560393,
+              31.196956951718647
+            ],
+            [
+              121.2714742044588,
+              31.197245426001444
+            ],
+            [
+              121.27074783533521,
+              31.197467328697968
+            ],
+            [
+              121.27019638497563,
+              31.198003988121357
+            ],
+            [
+              121.269236540061,
+              31.19853654944889
+            ],
+            [
+              121.2687177049716,
+              31.199379765419323
+            ],
+            [
+              121.26643483057956,
+              31.201509961763918
+            ],
+            [
+              121.2659159954901,
+              31.201776232934606
+            ],
+            [
+              121.26537121864703,
+              31.20193155743813
+            ],
+            [
+              121.26386659124927,
+              31.203373842916278
+            ],
+            [
+              121.26352934844039,
+              31.20417263844017
+            ],
+            [
+              121.26272515405259,
+              31.205171123359293
+            ],
+            [
+              121.26205066843625,
+              31.206435855792037
+            ],
+            [
+              121.26168748387528,
+              31.206568984538166
+            ],
+            [
+              121.25870418211338,
+              31.20519331179335
+            ],
+            [
+              121.26249167826307,
+              31.198070557148696
+            ],
+            [
+              121.28264974080031,
+              31.159568551587313
+            ],
+            [
+              121.28499669900123,
+              31.15745679490307
+            ],
+            [
+              121.28822376652772,
+              31.156408282843103
+            ],
+            [
+              121.29078732589886,
+              31.156197458591677
+            ],
+            [
+              121.29489450275094,
+              31.15723120525685
+            ],
+            [
+              121.30297105980321,
+              31.15985503166317
+            ],
+            [
+              121.30830477604735,
+              31.161691578025014
+            ]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    }
+  ]
+}

src/components/Map.vue

@@ -31,6 +31,7 @@ export default {
           that.pushAllScripts();
         });
     },
+
     pushAllScripts() {
       let that = this;
       that.addScripts(scriptObj.main).then(function () {
@@ -48,6 +49,7 @@ export default {
         });
       });
     },
+
     addScripts(src) {
       return new Promise((resolve, reject) => {
         // 创建一个新的script标签
@@ -248,30 +250,127 @@ export default {
           maximumLevel: 18,
         })
       );
+      viewer.camera.setView({
+        destination: SkyScenery.Cartesian3.fromDegrees(121, 31, 30000.0), // 设置位置
+        orientation: {
+          heading: SkyScenery.Math.toRadians(0.0), // 方向
+          pitch: SkyScenery.Math.toRadians(-90.0), // 倾斜角度
+          roll: 0,
+        },
+      });
+      this.$store.commit("createdMap", true);
     },
-    /**
-     * 立体墙效果
-     * @author LiuMengxiang
-     * 采集学校学区范围，加载学校点位信息时，显示学区范围
-     */
-    addThreeDimensionalWallEffect(positions) {
-      viewer.entities.add({
+
+    // 加载geojson数据
+    addGeoJson(url, options) {
+      // options = {
+      //   point: {
+      //     imgUrl: ""
+      //   },
+      //   polyline: {
+      //     color: "#ffffff",
+      //     width: 3,
+      //     alpha: 0.7
+      //   },
+      //   polygon: {
+      //     outerColor: "#ffffff",
+      //     outerWidth: 3,
+      //     innerColor: "#ffffff",
+      //     alpha: 0.7
+      //   }
+      // };
+
+      SkyScenery.GeoJsonDataSource.load(url).then(function (dataSource) {
+        // dataSource.name = guid;
+        // modValue.VECTOR[guid] = dataSource;
+
+        viewer.dataSources.add(dataSource);
+        var entities = dataSource.entities.values;
+        for (var i = 0; i < entities.length; i++) {
+          var entity = entities[i];
+          if (entity.billboard) {
+            entity.billboard = undefined;
+            // entity.point = new SkyScenery.PointGraphics({
+            //     show: true,
+            //     pixelSize: 15,
+            //     color: SkyScenery.Color.fromCssColorString("#aed0ff"),
+            //     outlineColor: SkyScenery.Color.fromCssColorString("#3388ff"),
+            //     outlineWidth: 2,
+            //     heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND,
+            //     scaleByDistance: new SkyScenery.NearFarScalar(10000, 1, 20000, 0.5),
+            //     // translucencyByDistance: new SkyScenery.NearFarScalar(1500, 1, 20000, 0.2),
+            //     // distanceDisplayCondition: new SkyScenery.DistanceDisplayCondition(0, 20000)
+            // })
+            entity.billboard = new SkyScenery.BillboardGraphics({
+              image: options.point.imgUrl,
+              width: 50,
+              height: 50,
+              pixelOffset: new SkyScenery.Cartesian2(0, -25),
+              heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND,
+              // scaleByDistance: new SkyScenery.NearFarScalar(10000, 1, 20000, 0.75),
+            });
+          }
+          if (entity.polyline) {
+            entity.polyline.width = style.polyline.width;
+            entity.polyline.material = SkyScenery.Color.fromCssColorString(
+              style.polyline.color
+            ).withAlpha(style.polyline.alpha); // 颜色
+          }
+          if (entity.polygon) {
+            entity.polygon.height = 0.2;
+            entity.polygon.outline = true; // 边框是否显示
+            entity.polygon.outlineColor = SkyScenery.Color.fromCssColorString(
+              style.polygon.outerColor
+            ); // 边框颜色
+            entity.polygon.outlineWidth = style.polygon.outerWidth; // 边框宽度
+            entity.polygon.material = SkyScenery.Color.fromCssColorString(
+              style.polygon.innerColor
+            ).withAlpha(style.polygon.alpha); // 填充色
+          }
+          entity.layerId = guid;
+          entity.mod = "vectorMod";
+        }
+
+        // var extentR = turf.bbox(options.geo);
+        // viewer.camera.flyTo({
+        //   destination: SkyScenery.Rectangle.fromDegrees(
+        //     extentR[0] - 0.04,
+        //     extentR[1] - 0.04,
+        //     extentR[2] + 0.04,
+        //     extentR[3] + 0.04
+        //   )
+        // });
+        // modValue.VECTOR[guid + "_extent"] = extentR;
+      });
+    },
+
+    // 加载动态围墙
+    addDynamicWall(positions, options) {
+      /**
+       * options = {
+       *    maxH: 100,
+       *    color: "#00c4ff80",
+       *    duration: 3000,
+       * }
+       */
+      return viewer.entities.add({
         name: "立体墙效果",
         wall: {
           positions: positions.map(function (item) {
             return SkyScenery.Cartesian3.fromDegrees(item[0], item[1]);
           }),
           // 设置高度
-          maximumHeights: new Array(positions.length).fill(100),
+          maximumHeights: new Array(positions.length).fill(options.maxH || 100),
           minimumHeights: new Array(positions.length).fill(0),
           material: new SkyScenery.DynamicWallMaterialProperty({
-            color: SkyScenery.Color.fromCssColorString("#00c4ff80"),
+            color: SkyScenery.Color.fromCssColorString(options.color), // "#"
             trailImage: "/static/image/color.png",
-            duration: 3000,
+            duration: options.duration || 3000, // 3000
           }),
         },
       });
     },
+
     /**
      * 加载3Dtitles
      * @author LiuMengxiang