From ca90d0281b13930996802c249b9327166f5f1327 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 22 May 2025 16:46:15 +0800
Subject: [PATCH] 瑞昌优化
---
src/views/pac/components/box/dataContent.vue | 3
src/views/pd/components/dynamicPanel.vue | 3
src/views/rs/components/box/dataContent.vue | 6
src/assets/json/lx.json | 299 ++++++++++++++
src/assets/json/ysgw2.json | 1
src/assets/json/ysgw.json | 292 +++++++++++++
src/styles/base/dc-base.scss | 16
src/pages/map/components/scomponents/layersControl.vue | 211 +++++++++
src/assets/json/gt.json | 221 ++++++++++
src/assets/json/qyjgx.json | 135 ++++++
src/assets/json/qyfw.json | 56 ++
public/img/mapicon/gt.png | 0
src/views/space/components/box/dataContent.vue | 5
13 files changed, 1,229 insertions(+), 19 deletions(-)
diff --git a/public/img/mapicon/gt.png b/public/img/mapicon/gt.png
new file mode 100644
index 0000000..5e281af
--- /dev/null
+++ b/public/img/mapicon/gt.png
Binary files differ
diff --git a/src/assets/json/gt.json b/src/assets/json/gt.json
new file mode 100644
index 0000000..87df555
--- /dev/null
+++ b/src/assets/json/gt.json
@@ -0,0 +1,221 @@
+{
+ "type": "FeatureCollection",
+ "crs": {
+ "type": "name",
+ "properties": {
+ "name": "EPSG:4490"
+ }
+ },
+ "features": [
+ {
+ "type": "Feature",
+ "id": 0,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.60241996718104,
+ 29.818985725785911
+ ]
+ },
+ "properties": {
+ "FID": 0,
+ "O_Name": "岗亭1",
+ "O_Com": " ",
+ "O_Lat": 29.818985730000001,
+ "O_Lng": 115.60241997,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 1,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.6080150604248,
+ 29.824989428632151
+ ]
+ },
+ "properties": {
+ "FID": 1,
+ "O_Name": "岗亭2",
+ "O_Com": " ",
+ "O_Lat": 29.824989429999999,
+ "O_Lng": 115.60801506,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 2,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.61362624168291,
+ 29.814303518122905
+ ]
+ },
+ "properties": {
+ "FID": 2,
+ "O_Name": "岗亭3",
+ "O_Com": " ",
+ "O_Lat": 29.814303519999999,
+ "O_Lng": 115.61362624,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 3,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.614961981772,
+ 29.813735680813611
+ ]
+ },
+ "properties": {
+ "FID": 3,
+ "O_Name": "岗亭4",
+ "O_Com": " ",
+ "O_Lat": 29.813735680000001,
+ "O_Lng": 115.61496198,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 4,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.60166358947752,
+ 29.814284900558693
+ ]
+ },
+ "properties": {
+ "FID": 4,
+ "O_Name": "岗亭5",
+ "O_Com": " ",
+ "O_Lat": 29.814284900000001,
+ "O_Lng": 115.60166359,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 5,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.60018301010132,
+ 29.808071094413425
+ ]
+ },
+ "properties": {
+ "FID": 5,
+ "O_Name": "岗亭6",
+ "O_Com": " ",
+ "O_Lat": 29.808071089999999,
+ "O_Lng": 115.60018300999999,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 6,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.62492370605469,
+ 29.807852324164863
+ ]
+ },
+ "properties": {
+ "FID": 6,
+ "O_Name": "岗亭7",
+ "O_Com": " ",
+ "O_Lat": 29.807852319999999,
+ "O_Lng": 115.62492371,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 7,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.62641501426697,
+ 29.802867025616298
+ ]
+ },
+ "properties": {
+ "FID": 7,
+ "O_Name": "岗亭8",
+ "O_Com": " ",
+ "O_Lat": 29.802867030000002,
+ "O_Lng": 115.62641501,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 8,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.60149192810057,
+ 29.810764954788578
+ ]
+ },
+ "properties": {
+ "FID": 8,
+ "O_Name": "岗亭9",
+ "O_Com": " ",
+ "O_Lat": 29.810764949999999,
+ "O_Lng": 115.60149192999999,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 9,
+ "geometry": {
+ "type": "Point",
+ "coordinates": [
+ 115.60335874557495,
+ 29.792090297931708
+ ]
+ },
+ "properties": {
+ "FID": 9,
+ "O_Name": "岗亭10",
+ "O_Com": " ",
+ "O_Lat": 29.792090300000002,
+ "O_Lng": 115.60335875,
+ "O_Alt": 0,
+ "O_TxtType": 3,
+ "O_Flag": 136
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/assets/json/lx.json b/src/assets/json/lx.json
new file mode 100644
index 0000000..41bf15f
--- /dev/null
+++ b/src/assets/json/lx.json
@@ -0,0 +1,299 @@
+{
+ "type": "FeatureCollection",
+ "crs": {
+ "type": "name",
+ "properties": {
+ "name": "EPSG:4490"
+ }
+ },
+ "features": [
+ {
+ "type": "Feature",
+ "id": 0,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60805798,
+ 29.830369180000002
+ ],
+ [
+ 115.60807943,
+ 29.824430960000001
+ ],
+ [
+ 115.6080687,
+ 29.820623980000001
+ ],
+ [
+ 115.6080687,
+ 29.815271630000002
+ ],
+ [
+ 115.60803652,
+ 29.81148292
+ ],
+ [
+ 115.6079936,
+ 29.8080292
+ ],
+ [
+ 115.6079936,
+ 29.805329449999999
+ ],
+ [
+ 115.60803652,
+ 29.803225449999999
+ ],
+ [
+ 115.60824037,
+ 29.80228516
+ ],
+ [
+ 115.60864805999999,
+ 29.801465879999999
+ ],
+ [
+ 115.61185598,
+ 29.796885270000001
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 0,
+ "O_Name": "路线2",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 1,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60277938999999,
+ 29.791904079999998
+ ],
+ [
+ 115.61340094000001,
+ 29.797732509999999
+ ],
+ [
+ 115.61887264000001,
+ 29.800618669999999
+ ],
+ [
+ 115.6242156,
+ 29.802406189999999
+ ],
+ [
+ 115.62801361,
+ 29.803393029999999
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 1,
+ "O_Name": "路线3",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 2,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60103058999999,
+ 29.814405910000001
+ ],
+ [
+ 115.61487079,
+ 29.814359369999998
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 2,
+ "O_Name": "路线4",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 3,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60812235,
+ 29.83035057
+ ],
+ [
+ 115.61496735,
+ 29.829829360000002
+ ],
+ [
+ 115.61496735,
+ 29.82206674
+ ],
+ [
+ 115.61492443,
+ 29.81314922
+ ],
+ [
+ 115.61496735,
+ 29.805515639999999
+ ],
+ [
+ 115.61498880000001,
+ 29.80367232
+ ],
+ [
+ 115.61546087000001,
+ 29.801270370000001
+ ],
+ [
+ 115.61732769,
+ 29.797732509999999
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 3,
+ "O_Name": "路线1",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 4,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.6079936,
+ 29.807507879999999
+ ],
+ [
+ 115.60479641000001,
+ 29.80749857
+ ],
+ [
+ 115.60287595,
+ 29.80752184
+ ],
+ [
+ 115.59966803,
+ 29.808257279999999
+ ],
+ [
+ 115.5996573,
+ 29.808261940000001
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 4,
+ "O_Name": "路线5",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 5,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60054778999999,
+ 29.81085921
+ ],
+ [
+ 115.60575749,
+ 29.810848199999999
+ ],
+ [
+ 115.60802846999999,
+ 29.810849900000001
+ ],
+ [
+ 115.60803115,
+ 29.810849900000001
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 5,
+ "O_Name": "路线6",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 6,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60098766999999,
+ 29.819036919999999
+ ],
+ [
+ 115.60806066000001,
+ 29.8190183
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 6,
+ "O_Name": "路线7",
+ "O_Com": " ",
+ "O_LClr": 255,
+ "O_LWidth": 300,
+ "O_LAlpha": 100,
+ "O_LType": 5,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/assets/json/qyfw.json b/src/assets/json/qyfw.json
index 6ae9370..b851033 100644
--- a/src/assets/json/qyfw.json
+++ b/src/assets/json/qyfw.json
@@ -898,6 +898,62 @@
"Shape_Length": 0.019612604105277001,
"Shape_Area": 2.2164732636445685e-05
}
+ },
+ {
+ "type": "Feature",
+ "id": 21,
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ 115.60100099300007,
+ 29.830816226000024
+ ],
+ [
+ 115.60091771200007,
+ 29.822654675000024
+ ],
+ [
+ 115.6064142670001,
+ 29.822083604000056
+ ],
+ [
+ 115.60644995900009,
+ 29.81915686700006
+ ],
+ [
+ 115.60773486800008,
+ 29.819121175000078
+ ],
+ [
+ 115.6077539040001,
+ 29.83027370900004
+ ],
+ [
+ 115.6042418190001,
+ 29.830716288000076
+ ],
+ [
+ 115.60100099300007,
+ 29.830816226000024
+ ]
+ ]
+ ]
+ },
+ "properties": {
+ "OBJECTID": 21,
+ "O_Name": "江西新洋丰肥业有限公司",
+ "O_Com": null,
+ "O_LClr": null,
+ "O_LWidth": null,
+ "O_LAlpha": null,
+ "O_AAlpha": null,
+ "O_AClr": null,
+ "O_Flag": null,
+ "Shape_Length": 0.03583525453247354,
+ "Shape_Area": 0.00006028444361859353
+ }
}
]
}
\ No newline at end of file
diff --git a/src/assets/json/qyjgx.json b/src/assets/json/qyjgx.json
new file mode 100644
index 0000000..efbef71
--- /dev/null
+++ b/src/assets/json/qyjgx.json
@@ -0,0 +1,135 @@
+{
+ "type": "FeatureCollection",
+ "crs": {
+ "type": "name",
+ "properties": {
+ "name": "EPSG:4490"
+ }
+ },
+ "features": [
+ {
+ "type": "Feature",
+ "id": 0,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60431361000001,
+ 29.812292800000002
+ ],
+ [
+ 115.60692072000001,
+ 29.810496149999999
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 0,
+ "O_Name": "惠城-浩普",
+ "O_Com": " ",
+ "O_LClr": 16711935,
+ "O_LWidth": 30,
+ "O_LAlpha": 100,
+ "O_LType": 8,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 1,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.62469040000001,
+ 29.807209969999999
+ ],
+ [
+ 115.62325001000001,
+ 29.804891900000001
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 1,
+ "O_Name": "荣联-熠亮",
+ "O_Com": " ",
+ "O_LClr": 16711935,
+ "O_LWidth": 30,
+ "O_LAlpha": 100,
+ "O_LType": 8,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 2,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61415194999999,
+ 29.81387531
+ ],
+ [
+ 115.61442018,
+ 29.80899737
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 2,
+ "O_Name": "造纸-瑞易德",
+ "O_Com": " ",
+ "O_LClr": 16711935,
+ "O_LWidth": 30,
+ "O_LAlpha": 100,
+ "O_LType": 8,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 3,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60693144999999,
+ 29.810449609999999
+ ],
+ [
+ 115.60717750627862,
+ 29.809860793739997
+ ],
+ [
+ 115.6073877095381,
+ 29.809261607279428
+ ],
+ [
+ 115.60740351999999,
+ 29.809211479999988
+ ],
+ [
+ 115.60740352000001,
+ 29.809211479999998
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 3,
+ "O_Name": "海德森-浩普",
+ "O_Com": " ",
+ "O_LClr": 16711935,
+ "O_LWidth": 30,
+ "O_LAlpha": 100,
+ "O_LType": 8,
+ "O_SType": 4,
+ "O_TType": 0
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/assets/json/ysgw.json b/src/assets/json/ysgw.json
index ba703aa..6e42706 100644
--- a/src/assets/json/ysgw.json
+++ b/src/assets/json/ysgw.json
@@ -1 +1,291 @@
-{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"features":[{"type":"Feature","id":0,"geometry":{"type":"LineString","coordinates":[[115.61520541089226,29.825884033747855],[115.61508643784214,29.815426302627088]]},"properties":{"FID":0,"Id":0}},{"type":"Feature","id":1,"geometry":{"type":"LineString","coordinates":[[115.60809082248477,29.82572936878239],[115.60786001476731,29.815306139846427]]},"properties":{"FID":1,"Id":0}},{"type":"Feature","id":2,"geometry":{"type":"LineString","coordinates":[[115.60446928283386,29.814294868918807],[115.60455851262168,29.808256986616584]]},"properties":{"FID":2,"Id":0}},{"type":"Feature","id":3,"geometry":{"type":"LineString","coordinates":[[115.60452048513025,29.810830180205812],[115.60699448582648,29.810866214325642]]},"properties":{"FID":3,"Id":0}},{"type":"Feature","id":4,"geometry":{"type":"LineString","coordinates":[[115.60783919448352,29.814280740869151],[115.60783919448352,29.808343985659576]]},"properties":{"FID":4,"Id":0}},{"type":"Feature","id":5,"geometry":{"type":"LineString","coordinates":[[115.59903280930098,29.808008481657737],[115.59790970370614,29.804924700194135]]},"properties":{"FID":5,"Id":0}},{"type":"Feature","id":6,"geometry":{"type":"LineString","coordinates":[[115.60782491771738,29.806954380432217],[115.60787250693761,29.802980680552309]]},"properties":{"FID":6,"Id":0}},{"type":"Feature","id":7,"geometry":{"type":"LineString","coordinates":[[115.60799147998785,29.802238288718627],[115.61125134156589,29.797122447556035]]},"properties":{"FID":7,"Id":0}},{"type":"Feature","id":8,"geometry":{"type":"LineString","coordinates":[[115.61838972458338,29.795523449759969],[115.6167716910993,29.798592954457717]]},"properties":{"FID":8,"Id":0}},{"type":"Feature","id":9,"geometry":{"type":"LineString","coordinates":[[115.61596267435732,29.799830274180636],[115.61543919293604,29.801115183123784],[115.61489191690487,29.803447054909611]]},"properties":{"FID":9,"Id":0}},{"type":"Feature","id":10,"geometry":{"type":"LineString","coordinates":[[115.61496568019595,29.806935344744204],[115.61496568019595,29.804022884473]]},"properties":{"FID":10,"Id":0}},{"type":"Feature","id":11,"geometry":{"type":"LineString","coordinates":[[115.61503040153536,29.811911273599605],[115.6150018480032,29.808085100302151]]},"properties":{"FID":11,"Id":0}}]}
\ No newline at end of file
+{
+ "type": "FeatureCollection",
+ "crs": {
+ "type": "name",
+ "properties": {
+ "name": "EPSG:4326"
+ }
+ },
+ "features": [
+ {
+ "type": "Feature",
+ "id": 0,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61520541089226,
+ 29.825884033747855
+ ],
+ [
+ 115.61508643784214,
+ 29.815426302627088
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 0,
+ "Id": 0,
+ "qd": "115.615213,29.825879",
+ "zd": "115.615085,29.815422"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 1,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60809082248477,
+ 29.82572936878239
+ ],
+ [
+ 115.60786001476731,
+ 29.815306139846427
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 1,
+ "Id": 0,
+ "qd": "115.608105,29.825749",
+ "zd": "115.607862,29.815297"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 2,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60446928283386,
+ 29.814294868918807
+ ],
+ [
+ 115.60455851262168,
+ 29.808256986616584
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 2,
+ "Id": 0,
+ "qd": "115.604555,29.808257",
+ "zd": "115.604474,29.814296"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 3,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60452048513025,
+ 29.810830180205812
+ ],
+ [
+ 115.60699448582648,
+ 29.810866214325642
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 3,
+ "Id": 0,
+ "qd": "115.607006,29.810872",
+ "zd": "115.604522,29.810829"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 4,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60783919448352,
+ 29.814280740869151
+ ],
+ [
+ 115.60783919448352,
+ 29.808343985659576
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 4,
+ "Id": 0,
+ "qd": "115.607837,29.808348",
+ "zd": "115.607858,29.814289"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 5,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.59903280930098,
+ 29.808008481657737
+ ],
+ [
+ 115.59790970370614,
+ 29.804924700194135
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 5,
+ "Id": 0,
+ "qd": "115.597906,29.804934",
+ "zd": "115.599037,29.808004"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 6,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60782491771738,
+ 29.806954380432217
+ ],
+ [
+ 115.60787250693761,
+ 29.802980680552309
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 6,
+ "Id": 0,
+ "qd": "115.607881,29.802979",
+ "zd": "115.607828,29.806955"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 7,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.60799147998785,
+ 29.802238288718627
+ ],
+ [
+ 115.61125134156589,
+ 29.797122447556035
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 7,
+ "Id": 0,
+ "qd": "115.608008,29.802241",
+ "zd": "115.611269,29.797126"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 8,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61838972458338,
+ 29.795523449759969
+ ],
+ [
+ 115.6167716910993,
+ 29.798592954457717
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 8,
+ "Id": 0,
+ "qd": "115.618399,29.795532",
+ "zd": "115.616778,29.798587"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 9,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61596267435732,
+ 29.799830274180636
+ ],
+ [
+ 115.61543919293604,
+ 29.801115183123784
+ ],
+ [
+ 115.61489191690487,
+ 29.803447054909611
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 9,
+ "Id": 0,
+ "qd": "115.614879,29.803431",
+ "zd": "115.615962,29.799850"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 10,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61496568019595,
+ 29.806935344744204
+ ],
+ [
+ 115.61496568019595,
+ 29.804022884473
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 10,
+ "Id": 0,
+ "qd": "115.614965,29.804030",
+ "zd": "115.614971,29.806950"
+ }
+ },
+ {
+ "type": "Feature",
+ "id": 11,
+ "geometry": {
+ "type": "LineString",
+ "coordinates": [
+ [
+ 115.61503040153536,
+ 29.811911273599605
+ ],
+ [
+ 115.6150018480032,
+ 29.808085100302151
+ ]
+ ]
+ },
+ "properties": {
+ "FID": 11,
+ "Id": 0,
+ "qd": "115.615033,29.811907",
+ "zd": "115.615014,29.808080"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/assets/json/ysgw2.json b/src/assets/json/ysgw2.json
new file mode 100644
index 0000000..ba703aa
--- /dev/null
+++ b/src/assets/json/ysgw2.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"features":[{"type":"Feature","id":0,"geometry":{"type":"LineString","coordinates":[[115.61520541089226,29.825884033747855],[115.61508643784214,29.815426302627088]]},"properties":{"FID":0,"Id":0}},{"type":"Feature","id":1,"geometry":{"type":"LineString","coordinates":[[115.60809082248477,29.82572936878239],[115.60786001476731,29.815306139846427]]},"properties":{"FID":1,"Id":0}},{"type":"Feature","id":2,"geometry":{"type":"LineString","coordinates":[[115.60446928283386,29.814294868918807],[115.60455851262168,29.808256986616584]]},"properties":{"FID":2,"Id":0}},{"type":"Feature","id":3,"geometry":{"type":"LineString","coordinates":[[115.60452048513025,29.810830180205812],[115.60699448582648,29.810866214325642]]},"properties":{"FID":3,"Id":0}},{"type":"Feature","id":4,"geometry":{"type":"LineString","coordinates":[[115.60783919448352,29.814280740869151],[115.60783919448352,29.808343985659576]]},"properties":{"FID":4,"Id":0}},{"type":"Feature","id":5,"geometry":{"type":"LineString","coordinates":[[115.59903280930098,29.808008481657737],[115.59790970370614,29.804924700194135]]},"properties":{"FID":5,"Id":0}},{"type":"Feature","id":6,"geometry":{"type":"LineString","coordinates":[[115.60782491771738,29.806954380432217],[115.60787250693761,29.802980680552309]]},"properties":{"FID":6,"Id":0}},{"type":"Feature","id":7,"geometry":{"type":"LineString","coordinates":[[115.60799147998785,29.802238288718627],[115.61125134156589,29.797122447556035]]},"properties":{"FID":7,"Id":0}},{"type":"Feature","id":8,"geometry":{"type":"LineString","coordinates":[[115.61838972458338,29.795523449759969],[115.6167716910993,29.798592954457717]]},"properties":{"FID":8,"Id":0}},{"type":"Feature","id":9,"geometry":{"type":"LineString","coordinates":[[115.61596267435732,29.799830274180636],[115.61543919293604,29.801115183123784],[115.61489191690487,29.803447054909611]]},"properties":{"FID":9,"Id":0}},{"type":"Feature","id":10,"geometry":{"type":"LineString","coordinates":[[115.61496568019595,29.806935344744204],[115.61496568019595,29.804022884473]]},"properties":{"FID":10,"Id":0}},{"type":"Feature","id":11,"geometry":{"type":"LineString","coordinates":[[115.61503040153536,29.811911273599605],[115.6150018480032,29.808085100302151]]},"properties":{"FID":11,"Id":0}}]}
\ No newline at end of file
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 1ce91a7..75fb491 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -78,6 +78,9 @@
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
import ysgw from "@/assets/json/ysgw"
+import qyjgx from "@/assets/json/qyjgx"
+import lx from "@/assets/json/lx"
+import gt from "@/assets/json/gt"
import track from "@/assets/json/track"
import { onUnmounted } from 'vue'
import EventBus from 'utils/bus'
@@ -186,6 +189,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -228,6 +232,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -270,6 +275,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -328,6 +334,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -370,6 +377,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -413,7 +421,6 @@
color: DC.Color.CYAN.withAlpha(0.9),
height: 30,
},
-
{
parentId: '3',
id: '3-10',
@@ -423,6 +430,17 @@
layerName: 'track',
source: track,
color: DC.Color.BLUE.withAlpha(0.9),
+ height: 30,
+ },
+ {
+ parentId: '3',
+ id: '3-11',
+ label: '企业级连接管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'qyjgx',
+ source: qyjgx,
+ color: DC.Color.CYAN.withAlpha(0.9),
height: 30,
},
]
@@ -443,7 +461,7 @@
riskLevel: 1,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-ordinary',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-yb.png',
showPanel: false,
@@ -457,8 +475,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -484,7 +503,7 @@
riskLevel: 2,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-larger-b',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd-b.png',
showPanel: false,
@@ -498,8 +517,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -525,7 +545,7 @@
riskLevel: 3,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-larger',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
showPanel: false,
@@ -539,8 +559,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -566,7 +587,7 @@
riskLevel: 9,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-zd',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
showPanel: false,
@@ -595,7 +616,32 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
addPopLayers[attrParams.name].addOverlay(divIcon)
}
- }
+ },
+ {
+ parentId: '4',
+ id: '4-5',
+ label: '路线',
+ type: 'layer',
+ subType: 'geojsonLx',
+ layerName: 'lx',
+ source: lx,
+ color: DC.Color.CYAN.withAlpha(0.9),
+ height: 30,
+ },
+ {
+ parentId: '4',
+ id: '4-6',
+ label: '岗亭',
+ type: 'layer',
+ subType: 'geojsonGt',
+ layerName: 'gt',
+ showPanel: false,
+ className: 'gt-zd',
+ source: gt,
+ color: DC.Color.CYAN.withAlpha(0.9),
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/gt.png',
+ height: 30,
+ },
]
},
@@ -735,6 +781,7 @@
collectNodesWithFlag(data)
collectedNodes.value.forEach(item => {
+ // console.log(item, 1111111111111111112)
if (options?.some(i => i.id == item.id)) {
// const window.$Cesium = DC
@@ -888,7 +935,6 @@
i.geometry.coordinates.map(d => [d[0], d[1], item.height].join(',')).join(';'),
computeCircle(1.6)
)
-
if ('RefName' in i.properties && i.properties.RefName.indexOf('拟建') != -1) {
polylineVolume.setStyle({
material: DC.Color.fromBytes(255, 0, 0, 230)
@@ -916,7 +962,23 @@
material: item.color
})
}
-
+ // 雨水管网流向
+ if (item.layerName === 'ysgw') {
+ let ss = i.properties.qd + ',' + item.height + ';' + i.properties.zd + ',' + item.height
+ let polyline1 = new DC.Polyline(ss)
+ polyline1.setStyle({
+ width: 10,
+ arcType: 1,
+ material: new DC.PolylineImageTrailMaterialProperty({
+ color: DC.Color.GREEN,
+ speed: 20,
+ image: VITE_APP_BASE + 'img/mapicon/right.png',
+ repeat: { x: 30, y: 1 }
+ }),
+ clampToGround: false
+ })
+ addTileLayers[item.layerName].addOverlay(polyline1)
+ }
addTileLayers[item.layerName].addOverlay(polylineVolume)
})
} else {
@@ -936,6 +998,127 @@
clampToGround: true
})
addTileLayers[item.layerName].addOverlay(Polyline)
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
+ // 路线
+ } else if (item.subType == 'geojsonLx') {
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+
+ item.source.features.forEach(i => {
+ let ss = i.geometry.coordinates.map(d => [...d, item.height].join(',')).join(';')
+ let Polyline = new DC.Polyline(i.geometry.coordinates.map(d => [...d, item.height].join(',')).join(';'))
+
+ Polyline.setStyle({
+ width: 3,
+ // material: DC.Color.BLUE,
+ material: new DC.PolylineTrailMaterialProperty({
+ color: DC.Color.RED,
+ speed: 10
+ }),
+ clampToGround: true
+ })
+ addTileLayers[item.layerName].addOverlay(Polyline)
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
+ // 岗亭
+ } else if (item.subType == 'geojsonGt') {
+ // if (!addTileLayers[item.layerName]) {
+ // addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ // window.$viewer.addLayer(addTileLayers[item.layerName])
+
+ // item.source.features.forEach(i => {
+ // let iconEl = ''
+ // if ('showPanel' in item && item.showPanel == false) {
+ // if (item.backgroundIcon) {
+ // iconEl = `
+ // <div class="map-name">${i.properties.O_Name}</div>
+ // <div class="map-icon">
+ // <img src="${item.backgroundIcon}">
+ // </div>
+ // `
+ // }
+ // } else {
+ // iconEl = `<div class="marsBlueGradientPnl">
+ // <div>${i.properties.O_Name}</div>
+ // </div>`
+ // }
+ // console.log(i.geometry.coordinates[0], "2222222222222222222")
+ // console.log(i.properties.O_Name, "3333333333333333")
+
+ // let divIcon = new DC.DivIcon(
+ // new DC.Position('115.60241996718104', '29.818985725785911'),
+ // `<div class="public-map-popup ${item.className || ''}">
+ // ${iconEl}
+ // </div>`
+ // )
+
+ // addTileLayers[item.layerName].addOverlay(divIcon)
+ // })
+ // } else {
+ // addTileLayers[item.layerName].show = true
+ // }
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.HtmlLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+
+ // item.method(item.params).then(res => {
+ // let data = res.data.data.records
+
+
+ item.source.features.forEach(i => {
+ let iconEl = ''
+
+ if ('showPanel' in item && item.showPanel == false) {
+ if (item.backgroundIcon) {
+ iconEl = `
+ <div class="map-name">${i.properties.O_Name}</div>
+ <div class="map-icon">
+ <img src="${item.backgroundIcon}">
+ </div>
+ `
+ }
+ } else {
+ iconEl = `<div class="marsBlueGradientPnl">
+ <div>${i.properties.O_Name}</div>
+ </div>`
+ }
+
+ let divIcon = new DC.DivIcon(
+ new DC.Position(i.geometry.coordinates[0], i.geometry.coordinates[1], i.ele || 64),
+ `<div class="public-map-popup ${item.className || ''}">
+ ${iconEl}
+ </div>`
+ )
+
+ divIcon.attrParams = i
+
+ // let incident = () => {
+ // }
+
+ // if (item.incident) incident = item.incident
+
+ // divIcon.on(DC.MouseEventType.CLICK, (e) => {
+ // if (mapStore.editPoint) {
+ // moveEntity = e
+ // return
+ // }
+
+ // if (mapStore.startCustomWx && item.customWx) {
+ // EventBus.emit('wxEntityClick', e)
+ // return
+ // }
+
+ // incident(e)
+ // })
+
+ addTileLayers[item.layerName].addOverlay(divIcon)
+ // })
})
} else {
addTileLayers[item.layerName].show = true
@@ -961,6 +1144,9 @@
delete addTileLayers[item.layerName]
if (item.layerName == 'ysgw' && planToBuild) {
+ planToBuild.clear()
+ }
+ if (item.layerName == 'qyjgx' && planToBuild) {
planToBuild.clear()
}
}
@@ -1116,11 +1302,14 @@
EventBus.emit('restHandleDelChange', `3-7`)
EventBus.emit('restHandleDelChange', `3-8`)
EventBus.emit('restHandleDelChange', `3-9`)
+ EventBus.emit('restHandleDelChange', `3-11`)
EventBus.emit('restHandleDelChange', `4-1`)
EventBus.emit('restHandleDelChange', `4-2`)
EventBus.emit('restHandleDelChange', `4-3`)
EventBus.emit('restHandleDelChange', `4-9`)
+ EventBus.emit('restHandleDelChange', `4-5`)
+ EventBus.emit('restHandleDelChange', `4-6`)
destroyPop()
}
diff --git a/src/styles/base/dc-base.scss b/src/styles/base/dc-base.scss
index 85124a0..0afccef 100644
--- a/src/styles/base/dc-base.scss
+++ b/src/styles/base/dc-base.scss
@@ -305,6 +305,22 @@
}
}
+.gt-zd {
+ &::after {
+ background: linear-gradient(to bottom, rgba(0, 136, 255, 0.8), rgba(0, 136, 255, 0.2));
+ }
+
+ .map-name {
+ color: rgb(0, 72, 255);
+ width: 240px;
+ }
+
+ .map-icon {
+ background: radial-gradient(circle at center, rgba(255, 255, 255, 0.3) 20%, rgba(0, 136, 255, 0.9) 100%);
+ box-shadow: 0px 0px 10px rgba(0, 136, 255, 1);
+ }
+}
+
.qyfb-box {
&::after {
background: linear-gradient(to bottom, rgba(0, 136, 255, 0.8), rgba(0, 136, 255, 0.2));
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index e102af9..b020995 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -134,8 +134,11 @@
if (row.type == 2 || row.type == 3) {
EventBus.emit('restHandleDelChange', `3-9`)
EventBus.emit('restHandleCheckChange', `3-9`)
+ EventBus.emit('restHandleDelChange', `3-11`)
+ EventBus.emit('restHandleCheckChange', `3-11`)
} else {
EventBus.emit('restHandleDelChange', `3-9`)
+ EventBus.emit('restHandleDelChange', `3-11`)
}
}
diff --git a/src/views/pd/components/dynamicPanel.vue b/src/views/pd/components/dynamicPanel.vue
index 1c40e97..8958d59 100644
--- a/src/views/pd/components/dynamicPanel.vue
+++ b/src/views/pd/components/dynamicPanel.vue
@@ -64,9 +64,8 @@
lat: 29.80937902,
alt: 30
},
- linePosition: '115.60782622,29.80955698,30;115.60783535,29.80913790,30',
+ linePosition: '115.60783535,29.80913790,30;115.60782622,29.80955698,30',
lineTime: 5000,
-
threeContent: '企业采取紧急措施后，还有部分松节油进入厂外雨水管网。',
threePointPosition: {
lng: 115.60782622,
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index b418252..c27892f 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -145,8 +145,9 @@
window.$viewer.addLayer(addPupoLayers[row.firmName])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${row.firmName || ''}</li>
+ <li>行业类别：${row.category || ''}</li>
<li>风险等级：${row.riskLevelName || ''}</li>
- <li>行业类别：${row.name || ''}</li>
+ <li>风险物资：${row.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(row.lng, row.lat, row.ele || 64),
@@ -239,8 +240,7 @@
<template>
<div class="w100 h0 flex-1 flex f-d-c">
- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
- ref="SeachBarCondition"></global-search>
+ <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
<!-- <div class="cur-container">
<div class="tablist">
<div class="cursor-p" :class="{ on: showOn(item) }" v-for="item, index in resData.data" :key="index"
diff --git a/src/views/space/components/box/dataContent.vue b/src/views/space/components/box/dataContent.vue
index e5f9c58..70d81ff 100644
--- a/src/views/space/components/box/dataContent.vue
+++ b/src/views/space/components/box/dataContent.vue
@@ -134,6 +134,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${row.firmName}</div>
<div>作用：${row.mainFuncName}</div>
+ <div>容量：${row.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(row.lng, row.lat, row.ele || 64),
@@ -217,8 +218,7 @@
<template>
<div class="w100 h0 flex-1 flex f-d-c">
- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn"
- ref="SeachBarCondition"></global-search>
+ <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search>
<div class="h0 flex-1 table-content" ref="TableContent" v-loading="loading"
element-loading-background="rgba(46, 81, 136, 0.9)">
@@ -232,6 +232,7 @@
<el-table-column show-overflow-tooltip prop="firmName" label="企业名称" />
<el-table-column show-overflow-tooltip prop="name" label="名称" width="100" />
<el-table-column prop="mainFuncName" label="作用" width="55" />
+ <el-table-column prop="capacity" label="容量(m³)" width="70" />
<el-table-column v-if="curSelectTabType != 9" align="center" width="62" label="操作">
<template #default="scope">
<el-button link type="primary" size="small" :disabled="scope.row.lng == ''"
--
Gitblit v1.9.3