From 7f8b859123f0ed0b7585987d56acf6d835085cc0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 15 Nov 2024 14:48:39 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/assets/img/one.png | 0
src/assets/json/wsgw.json | 2
src/views/pac/components/box/dataContent.vue | 38 +++--
src/views/pd/components/dynamicPanel.vue | 4
src/assets/img/two.png | 0
src/views/pac/components/box/fireSource.vue | 105 +++++++++++++++++
src/views/companyInfo/components/mainMenu.vue | 2
src/assets/img/three.png | 0
src/views/survey/components/box/fireContent.vue | 21 ++-
src/api/firmInfo/firmInfo.js | 20 +++
src/views/rt/components/box/dataContent.vue | 4
src/pages/layout/components/scomponents/layersControl.vue | 8
src/pages/first/index.vue | 13 ++
src/views/pac/components/box/publicContent.vue | 2
src/views/pac/components/rightContainer.vue | 10 +
src/views/companyInfo/components/box/dataContent.vue | 14 +-
src/pages/layout/components/mainSearch.vue | 111 +++++++++++++++++
vite.config.js | 2
src/styles/element/index.scss | 2
src/views/pac/components/leftContainer.vue | 1
20 files changed, 304 insertions(+), 55 deletions(-)
diff --git a/src/api/firmInfo/firmInfo.js b/src/api/firmInfo/firmInfo.js
new file mode 100644
index 0000000..bbaa0c3
--- /dev/null
+++ b/src/api/firmInfo/firmInfo.js
@@ -0,0 +1,20 @@
+/*
+ * @Author: shuishen 1109946754@qq.com
+ * @Date: 2024-11-12 11:34:22
+ * @LastEditors: shuishen 1109946754@qq.com
+ * @LastEditTime: 2024-11-12 11:34:55
+ * @FilePath: \bigScreen\src\api\panorama\dict.js
+ * @Description:
+ *
+ * Copyright (c) 2024 by shuishen, All Rights Reserved.
+ */
+import request from 'utils/http'
+
+export const fuzzyQuery = (params) => {
+ const url = `/yw/firmInfo/fuzzyQuery`
+ return request({
+ url,
+ method: 'get',
+ params,
+ })
+}
\ No newline at end of file
diff --git a/src/assets/img/one.png b/src/assets/img/one.png
new file mode 100644
index 0000000..c002563
--- /dev/null
+++ b/src/assets/img/one.png
Binary files differ
diff --git a/src/assets/img/three.png b/src/assets/img/three.png
new file mode 100644
index 0000000..e4c2900
--- /dev/null
+++ b/src/assets/img/three.png
Binary files differ
diff --git a/src/assets/img/two.png b/src/assets/img/two.png
new file mode 100644
index 0000000..b7358c2
--- /dev/null
+++ b/src/assets/img/two.png
Binary files differ
diff --git a/src/assets/json/wsgw.json b/src/assets/json/wsgw.json
index afa7ee6..4af65e4 100644
--- a/src/assets/json/wsgw.json
+++ b/src/assets/json/wsgw.json
@@ -1 +1 @@
-{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"features":[{"type":"Feature","id":0,"geometry":{"type":"LineString","coordinates":[[115.09773675116827,27.265470730006172,0,null],[115.09834386034331,27.266130793339347,0,null],[115.10049118826439,27.268521195620522,0,null],[115.10269980850464,27.271345441148227,0,null],[115.10421055326682,27.273846398142922,0,null],[115.10519918290234,27.275327873208347,0,null]]},"properties":{"FID":0,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":1,"geometry":{"type":"LineString","coordinates":[[115.09793402696059,27.265322353373236,0,null],[115.09849624553749,27.26596275660005,0,null],[115.10165323260733,27.26963617121439,0,null],[115.10289840023762,27.271227389497767,0,null],[115.10539424036388,27.275208302856335,0,null]]},"properties":{"FID":1,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":2,"geometry":{"type":"LineString","coordinates":[[115.10017455099957,27.2731648547067,0,null],[115.10266314208009,27.271368054222375,0,null]]},"properties":{"FID":2,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":3,"geometry":{"type":"LineString","coordinates":[[115.10303182522154,27.271079991457736,0,null],[115.10451160346436,27.270081681057864,0,null],[115.10506637170424,27.269825294758011,0,null],[115.10719962710226,27.269091524741313,0,null]]},"properties":{"FID":3,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":4,"geometry":{"type":"LineString","coordinates":[[115.10004540445787,27.263737076674669,0,null],[115.10375841864432,27.268886458126055,0,null],[115.10456131275535,27.270054393885793,0,null]]},"properties":{"FID":4,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":5,"geometry":{"type":"LineString","coordinates":[[115.10140881922619,27.275281676967822,0,null],[115.10420931715917,27.27374563158639,0,null]]},"properties":{"FID":5,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":6,"geometry":{"type":"LineString","coordinates":[[115.1041073205208,27.273780038926638,0,null],[115.10536443155466,27.27322661413541,0,null],[115.10844875488945,27.271895555431506,0,null]]},"properties":{"FID":6,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":7,"geometry":{"type":"LineString","coordinates":[[115.09779172392072,27.27058344690095,0,null],[115.10041130523609,27.268413369560406,0,null]]},"properties":{"FID":7,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":8,"geometry":{"type":"LineString","coordinates":[[115.10097494138101,27.268057464171761,0,null],[115.1015409163132,27.267678374413286,0,null],[115.10196882890578,27.267429775478714,0,null],[115.1024997869165,27.267125477759585,0,null]]},"properties":{"FID":8,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":9,"geometry":{"type":"LineString","coordinates":[[115.10299201286237,27.266946079486541,0,null],[115.10533499485774,27.266106443929214,0,null]]},"properties":{"FID":9,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":10,"geometry":{"type":"LineString","coordinates":[[115.10845205832321,27.272136649246821,0,null],[115.10875763801501,27.273324874794223,0,null],[115.10825139101533,27.273587485388653,0,null],[115.10809965037855,27.27494572286431,0,null],[115.10795608601509,27.275377336197742,0,null],[115.10759167251624,27.275428920595296,0,null],[115.1060233835958,27.275908050364041,0,null],[115.10657194016122,27.277358726895049,0,null],[115.1057481581214,27.277688067227352,0,null],[115.1025978194547,27.278258201837339,0,null]]},"properties":{"FID":10,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":11,"geometry":{"type":"LineString","coordinates":[[115.1062971894204,27.293629413895044,0,null],[115.10626488244884,27.286820207196481,0,null],[115.10603066593993,27.28537716520071,0,null],[115.10584535137576,27.284320394498558,0,null],[115.10583934774806,27.283394075424091,0,null],[115.10600001187613,27.282371599986003,0,null],[115.10624842767999,27.281103379723721,0,null],[115.10620002546187,27.277521011081429,0,null]]},"properties":{"FID":11,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":12,"geometry":{"type":"LineString","coordinates":[[115.10642897987435,27.277438700564264,0,null],[115.10651801879951,27.2789894841064,0,null],[115.10650198145785,27.281330855537767,0,null],[115.10613740080605,27.283085541652113,0,null],[115.10610302242291,27.2839937185473,0,null],[115.10638981330379,27.285661754647727,0,null],[115.10651416202781,27.286801206815817,0,null],[115.1065318098341,27.287694478555089,0,null],[115.1065186285464,27.293584681015957,0,null]]},"properties":{"FID":12,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":13,"geometry":{"type":"LineString","coordinates":[[115.10480874149492,27.289327057758662,0,null],[115.10627619615784,27.289205218853038,0,null]]},"properties":{"FID":13,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":14,"geometry":{"type":"LineString","coordinates":[[115.10792673122121,27.289312155688496,0,null],[115.10651406120954,27.289217348028732,0,null]]},"properties":{"FID":14,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":15,"geometry":{"type":"LineString","coordinates":[[115.10321943763101,27.286719220622977,0,null],[115.10624814921502,27.286717112713543,0,null]]},"properties":{"FID":15,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":16,"geometry":{"type":"LineString","coordinates":[[115.10289785048617,27.283670015569179,0,null],[115.1058410376303,27.283654818855076,0,null]]},"properties":{"FID":16,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":17,"geometry":{"type":"LineString","coordinates":[[115.11069878238528,27.281131720733043,0,null],[115.1064890010063,27.281125533338667,0,null]]},"properties":{"FID":17,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":18,"geometry":{"type":"LineString","coordinates":[[115.10255858481371,27.286354816463628,0,null],[115.10255323407557,27.281220908748391,0,null],[115.10622666412885,27.281214488761975,0,null]]},"properties":{"FID":18,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":19,"geometry":{"type":"LineString","coordinates":[[115.0989109855277,27.281240477538244,0,null],[115.10186454946538,27.281223003207934,0,null]]},"properties":{"FID":19,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":20,"geometry":{"type":"LineString","coordinates":[[115.10252622534446,27.280801005947687,0,null],[115.10249589965557,27.278382324425728,0,null]]},"properties":{"FID":20,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":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.09773675116827,27.265470730006172,0,null],[115.09834386034331,27.266130793339347,0,null],[115.10049118826439,27.268521195620522,0,null],[115.10269980850464,27.271345441148227,0,null],[115.10421055326682,27.273846398142922,0,null],[115.10519918290234,27.275327873208347,0,null]]},"properties":{"FID":0,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":1,"geometry":{"type":"LineString","coordinates":[[115.09793402696059,27.265322353373236,0,null],[115.09849624553749,27.26596275660005,0,null],[115.10165323260733,27.26963617121439,0,null],[115.10289840023762,27.271227389497767,0,null],[115.10539424036388,27.275208302856335,0,null]]},"properties":{"FID":1,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":2,"geometry":{"type":"LineString","coordinates":[[115.10017455099957,27.2731648547067,0,null],[115.10266314208009,27.271368054222375,0,null]]},"properties":{"FID":2,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":3,"geometry":{"type":"LineString","coordinates":[[115.10303182522154,27.271079991457736,0,null],[115.10451160346436,27.270081681057864,0,null],[115.10506637170424,27.269825294758011,0,null],[115.10719962710226,27.269091524741313,0,null]]},"properties":{"FID":3,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":4,"geometry":{"type":"LineString","coordinates":[[115.10004540445787,27.263737076674669,0,null],[115.10375841864432,27.268886458126055,0,null],[115.10456131275535,27.270054393885793,0,null]]},"properties":{"FID":4,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":5,"geometry":{"type":"LineString","coordinates":[[115.10140881922619,27.275281676967822,0,null],[115.10420931715917,27.27374563158639,0,null]]},"properties":{"FID":5,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":6,"geometry":{"type":"LineString","coordinates":[[115.1041073205208,27.273780038926638,0,null],[115.10536443155466,27.27322661413541,0,null],[115.10844875488945,27.271895555431506,0,null]]},"properties":{"FID":6,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":7,"geometry":{"type":"LineString","coordinates":[[115.09779172392072,27.27058344690095,0,null],[115.10041130523609,27.268413369560406,0,null]]},"properties":{"FID":7,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":8,"geometry":{"type":"LineString","coordinates":[[115.10097494138101,27.268057464171761,0,null],[115.1015409163132,27.267678374413286,0,null],[115.10196882890578,27.267429775478714,0,null],[115.1024997869165,27.267125477759585,0,null]]},"properties":{"FID":8,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":9,"geometry":{"type":"LineString","coordinates":[[115.10299201286237,27.266946079486541,0,null],[115.10533499485774,27.266106443929214,0,null]]},"properties":{"FID":9,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":10,"geometry":{"type":"LineString","coordinates":[[115.10845205832321,27.272136649246821,0,null],[115.10875763801501,27.273324874794223,0,null],[115.10825139101533,27.273587485388653,0,null],[115.10809965037855,27.27494572286431,0,null],[115.10795608601509,27.275377336197742,0,null],[115.10759167251624,27.275428920595296,0,null],[115.1060233835958,27.275908050364041,0,null],[115.10657194016122,27.277358726895049,0,null],[115.1057481581214,27.277688067227352,0,null],[115.1025978194547,27.278258201837339,0,null]]},"properties":{"FID":10,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":11,"geometry":{"type":"LineString","coordinates":[[115.1062971894204,27.293629413895044,0,null],[115.10626488244884,27.286820207196481,0,null],[115.10603066593993,27.28537716520071,0,null],[115.10584535137576,27.284320394498558,0,null],[115.10583934774806,27.283394075424091,0,null],[115.10600001187613,27.282371599986003,0,null],[115.10624842767999,27.281103379723721,0,null],[115.10620002546187,27.277521011081429,0,null]]},"properties":{"FID":11,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":12,"geometry":{"type":"LineString","coordinates":[[115.10642897987435,27.277438700564264,0,null],[115.10651801879951,27.2789894841064,0,null],[115.10650198145785,27.281330855537767,0,null],[115.10613740080605,27.283085541652113,0,null],[115.10610302242291,27.2839937185473,0,null],[115.10638981330379,27.285661754647727,0,null],[115.10651416202781,27.286801206815817,0,null],[115.1065318098341,27.287694478555089,0,null],[115.1065186285464,27.293584681015957,0,null]]},"properties":{"FID":12,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":13,"geometry":{"type":"LineString","coordinates":[[115.10480874149492,27.289327057758662,0,null],[115.10627619615784,27.289205218853038,0,null]]},"properties":{"FID":13,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":14,"geometry":{"type":"LineString","coordinates":[[115.10792673122121,27.289312155688496,0,null],[115.10651406120954,27.289217348028732,0,null]]},"properties":{"FID":14,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":15,"geometry":{"type":"LineString","coordinates":[[115.10321943763101,27.286719220622977,0,null],[115.10624814921502,27.286717112713543,0,null]]},"properties":{"FID":15,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":16,"geometry":{"type":"LineString","coordinates":[[115.10289785048617,27.283670015569179,0,null],[115.1058410376303,27.283654818855076,0,null]]},"properties":{"FID":16,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":17,"geometry":{"type":"LineString","coordinates":[[115.11069878238528,27.281131720733043,0,null],[115.1064890010063,27.281125533338667,0,null]]},"properties":{"FID":17,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":18,"geometry":{"type":"LineString","coordinates":[[115.10255858481371,27.286354816463628,0,null],[115.10255323407557,27.281220908748391,0,null],[115.10622666412885,27.281214488761975,0,null]]},"properties":{"FID":18,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":19,"geometry":{"type":"LineString","coordinates":[[115.0989109855277,27.281240477538244,0,null],[115.10186454946538,27.281223003207934,0,null]]},"properties":{"FID":19,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":20,"geometry":{"type":"LineString","coordinates":[[115.10252622534446,27.280801005947687,0,null],[115.10249589965557,27.278382324425728,0,null]]},"properties":{"FID":20,"FID_":0,"Entity":"LWPolyline","Layer":"现状污水管","Color":190,"Linetype":"Continuous","Elevation":0,"LineWt":0,"RefName":" ","标高":0}},{"type":"Feature","id":21,"geometry":{"type":"LineString","coordinates":[[115.12128166700018,27.277269444000012,0,null],[115.11357345666704,27.275188143901516,0,null],[115.11066099639584,27.274217323811285,0,null],[115.1099947473142,27.273646253169829,0,null],[115.10946174804906,27.27261832601539,0,null],[115.10866224915105,27.272161469502237,0,null]]},"properties":{"FID":21,"FID_":0,"Entity":" ","Layer":" ","Color":0,"Linetype":" ","Elevation":0,"LineWt":0,"RefName":" ","标高":0}}]}
\ No newline at end of file
diff --git a/src/pages/first/index.vue b/src/pages/first/index.vue
index 303ed24..1cb0449 100644
--- a/src/pages/first/index.vue
+++ b/src/pages/first/index.vue
@@ -32,6 +32,19 @@
import { getAssetsFile } from 'utils/utils'
const loginOutBg = getAssetsFile('login.png', '/images')
import mainMenu from './components/mainMenu.vue'
+import { useLogin } from 'store/login'
+const loginStore = useLogin()
+import { useRouter, useRoute } from 'vue-router'
+let router = useRouter()
+
+const signOut = () => {
+ loginStore.LogOut().then(res => {
+ router.push({
+ path: '/login'
+ })
+ })
+}
+
</script>
<style scoped lang="scss">
diff --git a/src/pages/layout/components/mainSearch.vue b/src/pages/layout/components/mainSearch.vue
index e8efa2c..25bd885 100644
--- a/src/pages/layout/components/mainSearch.vue
+++ b/src/pages/layout/components/mainSearch.vue
@@ -14,25 +14,49 @@
@focus="onFocus"></el-input>
<div class="page-search-value-box" v-show="isShowSearchSKValBox">
<ul>
- <li v-for="(item, index) in searchSKValList" :key="index" @click="sKValItemClick(item)">{{ item.name }}
+ <li v-if="searchSKValList.length > 0" v-for="(item, index) in searchSKValList" :key="index"
+ @click="sKValItemClick(item)">{{ item.name }}
</li>
+ <!-- <li v-else>暂无数据</li> -->
+ <span v-else>{{ showText }}</span>
</ul>
</div>
</div>
</template>
<script setup>
+import { fuzzyQuery } from '../../../api/firmInfo/firmInfo'
+
// 搜索栏相关
let isShowSearchSKValBox = false
-let searchVal = ''
-let searchSKValList = []
+let searchVal = ref('')
+let searchSKValList = ref([])
+
+let showText = ref('暂无数据')
const onSearch = () => {
- if (searchVal == '') {
+ if (searchVal.value == '') {
isShowSearchSKValBox = false
+ // 清空
+ clearPoint()
} else {
+ showText.value = '搜索中...'
+ searchSKValList.value = []
isShowSearchSKValBox = true
+ getFuzzyQuery()
}
+}
+
+function getFuzzyQuery() {
+ fuzzyQuery({
+ name: searchVal.value
+ }).then(res => {
+ if (res.data.data.length > 0) {
+ searchSKValList.value = res.data.data
+ } else {
+ showText.value = '暂无数据'
+ }
+ })
}
const onFocus = () => {
@@ -41,7 +65,73 @@
const sKValItemClick = (item) => {
isShowSearchSKValBox = false
+ if (item.lat && item.lng) {
+ handleCheckChange(item)
+ } else {
+ console.log('没有经纬度')
+ }
}
+let addTileLayers = {}
+const handleCheckChange = (item) => {
+ console.log(item)
+ // 先清空，在添加
+ clearPoint()
+ if (!addTileLayers[item.name]) {
+ addTileLayers[item.name] = new DC.HtmlLayer(item.name)
+ window.$viewer.addLayer(addTileLayers[item.name])
+ let iconEl = ''
+ if ('showPanel' in item && item.showPanel == false) {
+ if (item.backgroundIcon) {
+ iconEl = `
+ <div class="map-name">${i[item.showParams] || item.name}</div>
+ <div class="map-icon">
+ <img src="${item.backgroundIcon}">
+ </div>
+ `
+ }
+ } else {
+ iconEl = `<div class="marsBlueGradientPnl">
+ <div>${item.name}</div> </div>`
+ }
+ let divIcon = new DC.DivIcon(
+ new DC.Position(item.lng, item.lat, 0),
+ `<div class="public-map-popup">
+ ${iconEl}
+ </div>`
+ )
+
+ divIcon.attrParams = item
+
+ let incident = () => { }
+
+ if (item.incident) incident = item.incident
+
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+
+ addTileLayers[item.name].addOverlay(divIcon)
+ window.$viewer.flyToPosition(new DC.Position(item.lng, item.lat, 2000, 0, -90, 0))
+
+ } else {
+ // console.log('已存在*******************************')
+ window.$viewer.removeLayer(addTileLayers[item.name])
+ addTileLayers = {}
+ }
+}
+
+
+function clearPoint() {
+ let arr = Object.keys(addTileLayers)
+ arr.forEach(i => {
+ addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
+ })
+}
+
+onUnmounted(() => {
+ let arr = Object.keys(addTileLayers)
+ arr.forEach(i => {
+ addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
+ })
+})
</script>
<style lang="scss" scoped>
@@ -84,15 +174,26 @@
color: #ffffff;
cursor: pointer;
height: 20px;
+ margin: 3px;
line-height: 20px;
padding-left: 10px;
+ overflow: hidden;
}
ul>li:hover {
- background-color: #0e1a35;
+ background-color: #949597;
}
}
+ .page-search-value-box>ul>span {
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ margin-top: 20px;
+ }
+
+
+
.page-search-value-box::-webkit-scrollbar {
display: none
}
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 05e8de3..9683d0a 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -465,7 +465,7 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- function computeCircle (radius) {
+ function computeCircle(radius) {
var positions = []
for (var i = 0; i < 360; i++) {
var radians = DC.Math.toRadians(i)
@@ -508,7 +508,7 @@
})
}
-function findObjectById (data, id) {
+function findObjectById(data, id) {
// 遍历数据数组
for (let i = 0; i < data.length; i++) {
const item = data[i]
@@ -534,7 +534,7 @@
const restHandleCheckChange = (key) => {
let checkIds = treeRef.value?.getCheckedKeys()
- if (checkIds.some(i => i == key)) {
+ if (checkIds && checkIds.some(i => i == key)) {
return
}
@@ -557,7 +557,7 @@
EventBus.on('restHandleDelChange', restHandleDelChange)
onMounted(() => {
- // handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
})
// const sharedData = computed(() => pointStore.sharedData);
diff --git a/src/styles/element/index.scss b/src/styles/element/index.scss
index 1b9bbc2..2980163 100644
--- a/src/styles/element/index.scss
+++ b/src/styles/element/index.scss
@@ -77,4 +77,4 @@
color: #D4E8F8;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/companyInfo/components/box/dataContent.vue b/src/views/companyInfo/components/box/dataContent.vue
index 0f21eed..4f048bf 100644
--- a/src/views/companyInfo/components/box/dataContent.vue
+++ b/src/views/companyInfo/components/box/dataContent.vue
@@ -35,7 +35,7 @@
let addTileLayers = {}
const handleCheckChange = (row) => {
let companyInfo = JSON.parse(localStorage.getItem('companyInfo'))
- console.log(row)
+ // console.log(row)
resData.data.forEach(item => {
if (row.value === item.value) {
if (!addTileLayers[item.label]) {
@@ -106,14 +106,14 @@
onMounted(() => {
tabClick(resData.data[0])
-}),
+})
- onUnmounted(() => {
- let arr = Object.keys(addTileLayers)
- arr.forEach(i => {
- addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
- })
+onUnmounted(() => {
+ let arr = Object.keys(addTileLayers)
+ arr.forEach(i => {
+ addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
})
+})
</script>
<template>
diff --git a/src/views/companyInfo/components/mainMenu.vue b/src/views/companyInfo/components/mainMenu.vue
index 34134c3..954f3c6 100644
--- a/src/views/companyInfo/components/mainMenu.vue
+++ b/src/views/companyInfo/components/mainMenu.vue
@@ -24,7 +24,7 @@
value: 1,
},
{
- menuName: '应急物质',
+ menuName: '应急物资',
value: 2,
},
{
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index c3ffacb..1886adb 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -11,30 +11,36 @@
<script setup>
import { getList } from "@/api/space/space"
import { onUnmounted, reactive } from 'vue'
+
+import { usePointStore } from 'store/usepoint'
+const pointStore = usePointStore()
+
const resData = reactive({
data: [{
label: '一级防控',
value: '1',
type: 1,
- remark: '防火提及配套设置、装置围堰、罐区围堰'
+ // remark: '防火提及配套设置、装置围堰、罐区围堰'
}, {
label: '二级防控',
value: '2',
- type: 1,
- remark: '雨污水排口一体化闸阀、车间收集池、雨污管阀'
+ type: 2,
+ // remark: '雨污水排口一体化闸阀、车间收集池、雨污管阀'
},
{
label: '三级防控',
value: '3',
- type: 1,
- remark: '事故应急池、雨水收集池'
+ type: 3,
+ // remark: '事故应急池、雨水收集池'
}
]
})
+
+
const curSelect = ref('1')
let addTileLayers = {}
const handleCheckChange = (row) => {
- console.log(row)
+ // console.log(row)
resData.data.forEach(item => {
if (row.value === item.value) {
if (!addTileLayers[item.label]) {
@@ -58,7 +64,7 @@
}
} else {
iconEl = `<div class="marsBlueGradientPnl">
- <div>${item.remark}</div> </div>`
+ <div>${i.name}</div> </div>`
}
let divIcon = new DC.DivIcon(
new DC.Position(i.lng, i.lat, 0),
@@ -66,9 +72,7 @@
${iconEl}
</div>`
)
-
divIcon.attrParams = i
-
let incident = () => { }
if (item.incident) incident = item.incident
@@ -91,6 +95,7 @@
const tabClick = (item) => {
handleCheckChange(item)
+ pointStore.updateSharedData(item.type)
curSelect.value = item.value
}
@@ -103,15 +108,18 @@
})
onMounted(() => {
+ curSelect.value = '1'
+ pointStore.updateSharedData(1)
tabClick(resData.data[0])
-}),
- onUnmounted(() => {
- let arr = Object.keys(addTileLayers)
- arr.forEach(i => {
- addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
- })
+})
+
+onUnmounted(() => {
+ let arr = Object.keys(addTileLayers)
+ arr.forEach(i => {
+ addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
})
+})
</script>
<template>
diff --git a/src/views/pac/components/box/fireSource.vue b/src/views/pac/components/box/fireSource.vue
index 7152a88..8666a4b 100644
--- a/src/views/pac/components/box/fireSource.vue
+++ b/src/views/pac/components/box/fireSource.vue
@@ -10,16 +10,117 @@
-->
<script setup>
import publicContent from './publicContent.vue'
+import { getAssetsFile } from 'utils/utils'
+const one = getAssetsFile('one.png', '/img')
+const two = getAssetsFile('two.png', '/img')
+const three = getAssetsFile('three.png', '/img')
+import { usePointStore } from 'store/usepoint'
+const pointStore = usePointStore()
+const sharedData = computed(() => pointStore.sharedData);
+
+let indexValue = ref(1)
+
+watch(sharedData, (newValue) => {
+ indexValue.value = newValue
+ // console.log(newValue, "************************************************")
+});
</script>
<template>
<public-content>
<template #content>
- <div>
+ <div class="content_box">
+ <div v-if="indexValue == 1">
+ <div>
+ <!-- <img :src="one" alt=""> -->
+ <el-image :src="one" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[one]"
+ :initial-index="4" fit="cover">
+ <template #error>
+ <div class="image-slot">
+ <el-icon><icon-picture /></el-icon>
+ </div>
+ </template>
+ </el-image>
+ </div>
+ <div class="content_text">
+ 第一级应急防控体系，即事故废水不出企业，事故发生时，首先启动一级防控。关闭所有可能外溢事故污水的外排口，利用企业自身的围堰、应急池等环境应急防控设施，将污水控制在企业厂区内部。园区内所有企业均设置相应的事故应急池，企业雨水（清下水）排口设有监管部门控制的阀门。一旦发生物料泄漏及火灾等安全生产事故，相关企业快速断开雨水排口，联动打开事故应急池，将事故废水和消防尾水导入事故应急池。事故结束后，应急事故池中的废水进入厂区自身污水处理站处理，无污水处理站的企业按照监测结果进入园区污水处理厂处理。
+ </div>
+ </div>
+
+ <div v-if="indexValue == 2" class="content_img_text">
+ <div>
+ <!-- <img :src="two" alt=""> -->
+ <el-image :src="two" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[two]"
+ :initial-index="4" fit="cover">
+ <template #error>
+ <div class="image-slot">
+ <el-icon><icon-picture /></el-icon>
+ </div>
+ </template>
+ </el-image>
+ </div>
+ <div class="content_text_box">
+ <div class="content_text">
+ 一级防控能力不足时，启动二级防控。通过专用管道或临时转输措施，与相邻企业应急池、园区公共应急池等互联互通，拦截处置事故污水。第二级应急防控体系，即事故废水不出园区，事故废水储存在园区公共应急池及园区内雨水管网公共空间内。
+ </div>
+
+ <div class="content_text">
+ （1）公共应急池的选址。建设园区公共应急池或利用园区内干枯河道、低洼地带等进行改造，并设置独立管网进行事故废水的收集和输送，保证每家企业内部应急池与公共应急池有效连通；在事故废水超过设计标准的情况下，也可有效利用雨水管网分段建设闸门井进行废水容纳。一旦园区内企业发生事故，且消防尾水过量超出企业自身防控能力时，开启园区公共应急池阀门，企业内部无法收纳的消防事故水将通过应急管网流入公共应急池，将事故废水控制在园区应急池内，不进入区内河道。事故结束后，对公共应急池内收纳的事故废水进行监测，若达标，则就近排入河道；若不达标，则分批次用槽车送入园区污水处理厂处理。
+ </div>
+
+ <div class="content_text">
+ （2）公共应急池容量设计。根据《化工园区事故应急设施（池）建设标准》（T/CPCIF 0049—2020）进行公共应急池设置，以化工集中区产生事故废水外排量最大的一个企业计算。
+ </div>
+ </div>
+ </div>
+
+ <div v-if="indexValue == 3">
+ <div>
+ <!-- <img :src="three" alt=""> -->
+ <el-image :src="three" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="[three]"
+ :initial-index="4" fit="cover">
+ <template #error>
+ <div class="image-slot">
+ <el-icon><icon-picture /></el-icon>
+ </div>
+ </template>
+ </el-image>
+ </div>
+ <div class="content_text">
+ 事态进一步扩大，污水进入园区内水体，启动三级防控。利用化工集中区内的坑塘、河道、沟渠以及周边水系等，构建环境应急防控空间，对进出园区的水体实施封闭或分段管控。结合化工集中区区实际，确定事故废水通过雨污管网在进入赣江前有效拦截，当发生重大企业突发环境事故或危化品运输车辆侧翻等事故时，事故废水流入化工集中区内水体，立即关闭应急闸坝，污染河道使用移动闸截断污染团（带）；同时根据污染团（带）所在位置，就近闸断园区内部河道形成临时应急池，防止污染团从园区内水系进一步扩散至外环境。事故结束后，对临时应急空间内水质进行监测，若达标，则开启河道应急闸坝；若不达标，则将临时应急空间内污水由水泵将河水分批次送入公共应急池，进一步送园区污水处理厂处理。
+ </div>
+ </div>
</div>
</template>
</public-content>
</template>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.content_box {
+ color: #fff;
+ // overflow: scroll;
+}
+
+.content_box img {
+ width: 100%;
+}
+
+.content_text_box {
+ height: 530px;
+ overflow: scroll;
+ // 隐藏滚动条
+ scrollbar-width: none;
+}
+
+
+.content_box .content_text {
+ // 首行缩进
+ text-indent: 2em;
+ width: 100%;
+ line-height: 25px;
+ // 字间距
+ letter-spacing: 2px;
+ font-size: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/pac/components/box/publicContent.vue b/src/views/pac/components/box/publicContent.vue
index c95938c..2ff1476 100644
--- a/src/views/pac/components/box/publicContent.vue
+++ b/src/views/pac/components/box/publicContent.vue
@@ -14,7 +14,7 @@
<template>
<div class="content">
- <slot></slot>
+ <slot name="content"></slot>
</div>
</template>
diff --git a/src/views/pac/components/leftContainer.vue b/src/views/pac/components/leftContainer.vue
index 941c04f..b6fad8b 100644
--- a/src/views/pac/components/leftContainer.vue
+++ b/src/views/pac/components/leftContainer.vue
@@ -48,6 +48,7 @@
<style lang="scss" scoped>
.left-container {
background: none;
+ width: 90px;
}
.left-container>div .title-box {
diff --git a/src/views/pac/components/rightContainer.vue b/src/views/pac/components/rightContainer.vue
index cbe2086..fe6ac0c 100644
--- a/src/views/pac/components/rightContainer.vue
+++ b/src/views/pac/components/rightContainer.vue
@@ -17,14 +17,16 @@
<template>
<div class="right-container">
- <!-- <div class="fire-source box">
+ <div class="fire-source box">
<title-box>
<template #titleName>
- 火警事件来源
+ <!-- 一级防控 -->
+ <!-- 二级防控 -->
+ <!-- 三级防控 -->
</template>
</title-box>
<fire-source></fire-source>
- </div> -->
+ </div>
<!-- <div class="occur-statistics box">
<title-box>
@@ -57,7 +59,7 @@
width: 440px;
height: 100%;
pointer-events: auto;
- background: none;
+ // background: none;
.box {
margin-top: 20px;
diff --git a/src/views/pd/components/dynamicPanel.vue b/src/views/pd/components/dynamicPanel.vue
index 9e13f8f..54d9bb0 100644
--- a/src/views/pd/components/dynamicPanel.vue
+++ b/src/views/pd/components/dynamicPanel.vue
@@ -168,8 +168,8 @@
onUnmounted(() => {
clearAll()
- window.$viewer.removeLayer(dynamicVectorLayer)
- window.$viewer.removeLayer(dynamicHtmlLayer)
+ window.$viewer && window.$viewer.removeLayer(dynamicVectorLayer)
+ window.$viewer && window.$viewer.removeLayer(dynamicHtmlLayer)
})
</script>
diff --git a/src/views/rt/components/box/dataContent.vue b/src/views/rt/components/box/dataContent.vue
index e6f4e80..bd2b3f0 100644
--- a/src/views/rt/components/box/dataContent.vue
+++ b/src/views/rt/components/box/dataContent.vue
@@ -127,7 +127,7 @@
<div class="page_box">
- <el-table empty-text="" v-if="formInline.type == 1" :data="tableData" style="width: 100%"
+ <el-table border empty-text="" v-if="formInline.type == 1" :data="tableData" style="width: 100%"
:header-cell-style="headerCellStyle" :cell-style="tableCellStyle">
<el-table-column prop="teamName" label="救援队伍组名称" />
<el-table-column prop="teamJob" label="救援队伍组职务" />
@@ -136,7 +136,7 @@
<el-table-column prop="perInChaPho" label="联系电话" />
</el-table>
- <el-table empty-text="" v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
+ <el-table border empty-text="" v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
:cell-style="tableCellStyle">
<el-table-column prop="firmName" label="企业名称" />
<el-table-column prop="perInCha" label="责任人姓名" />
diff --git a/src/views/survey/components/box/fireContent.vue b/src/views/survey/components/box/fireContent.vue
index 0c30979..523b548 100644
--- a/src/views/survey/components/box/fireContent.vue
+++ b/src/views/survey/components/box/fireContent.vue
@@ -27,13 +27,13 @@
{
name: '一般',
itemStyle: {
- color: '#FFC000'
+ color: '#FFC000'
}
},
{
name: '较大',
itemStyle: {
-
+
color: '#F4090F'
}
},
@@ -45,7 +45,7 @@
}
]
-function getRiskSource () {
+function getRiskSource() {
getRiskSourceStatistic().then(res => {
let data = res.data.data
let dataRsult = []
@@ -73,16 +73,18 @@
color: "#fff",
},
textAlign: "center",
- right: "43%",
+ left: "62%",
+ // right: "43%",
top: "36%",
},
+
legend: {
orient: "vertical",
- top: '8%',
- right: "8%",
+ top: "5%",
+ left: "5%",
textStyle: {
- color: '#fff'
- }
+ color: "#fff",
+ },
},
grid: {
@@ -103,7 +105,8 @@
type: 'pie',
left: '-5%',
radius: ['45%', '75%'],
- data: dataRsult
+ data: dataRsult,
+ left: "25%"
}
]
})
diff --git a/vite.config.js b/vite.config.js
index b641fdb..ee27ecf 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -107,7 +107,7 @@
},
'/zhyqapi': {
- // target: 'http://localhost:15870',
+ // target: 'http://localhost:8082',
target: 'https://wrj.shuixiongit.com/zhyqapi',
changeOrigin: true,
rewrite: path => path.replace(/^\/zhyqapi/, ''),
--
Gitblit v1.9.3