From 360139bd43d7bc817f6b5e73b4e31a5f3d70d164 Mon Sep 17 00:00:00 2001
From: jly <48982819@qq.com>
Date: Mon, 7 Aug 2023 15:01:20 +0800
Subject: [PATCH] 1

---
 package.json                                  |  4 +--
 .../fivelayers/mapIndex copy 2.vue            | 31 +++++++++--------
 .../fivelayers/mapIndex copy.vue              | 30 ++++++++---------
 .../fivelayers/mapIndex-baidu.vue             | 33 ++++++++-----------
 .../communityGovern/fivelayers/mapIndex.vue   |  2 +-
 .../visual/components/screen-map/index.vue    |  2 +-
 .../power/components/screen-org-map.vue       |  2 +-
 7 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index cb3c4952a..f2570587c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
         "lodash": "^4.17.15",
         "mint-ui": "^2.2.13",
         "node-sass": "^4.12.0",
-        "ol": "^6.9.0",
+        "ol": "^7.2.2",
         "portfinder": "^1.0.21",
         "proj4": "^2.8.0",
         "qs": "^6.7.0",
@@ -71,7 +71,7 @@
         "dai-js": "^0.0.12",
         "element-theme-chalk": "^2.13.0",
         "natives": "^1.1.6",
-        "ol": "^6.9.0",
+        "ol": "^7.2.2",
         "sass-loader": "^7.3.1",
         "script-loader": "^0.7.2",
         "tinymce": "5.8.2",
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index bf041acf8..a923c612d 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -371,31 +371,30 @@
 </template>
 
 <script>
-import 'ol/ol.css'
-import { Map, View } from 'ol'
-import TileLayer from 'ol/layer/Tile.js';
+import { Map, View } from 'ol';
+import Feature from "ol/Feature.js";
+import Overlay from 'ol/Overlay';
+import { boundingExtent } from 'ol/extent.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import { Select } from 'ol/interaction.js';
 import ImageLayer from 'ol/layer/Image';
-import { Raster as RasterSource } from 'ol/source';
-import XYZ from 'ol/source/XYZ.js';
+import TileLayer from 'ol/layer/Tile.js';
 import VectorLayer from 'ol/layer/Vector.js';
+import { Raster as RasterSource } from 'ol/source';
 import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
-import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
+import XYZ from 'ol/source/XYZ.js';
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
 
-import nextTick from 'dai-js/tools/nextTick'
-import { mapGetters } from "vuex";
+import { requestGet, requestPost } from "@/js/dai/request";
+import nextTick from 'dai-js/tools/nextTick';
 import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
 
-import cptTb from "@/views/modules/visual/cpts/tb";
 import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import cptTb from "@/views/modules/visual/cpts/tb";
 import People from "../../basicinfo/people";
 
 var centerPointGlobal = [120.664619, 36.504963]
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index 3621d5712..ed864430c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -370,31 +370,29 @@
 </template>
 
 <script>
-import 'ol/ol.css'
-import { Map, View } from 'ol'
+// import 'ol/ol.css'
+import { Map, View } from 'ol';
+import Feature from "ol/Feature.js";
+import Overlay from 'ol/Overlay';
+import { boundingExtent } from 'ol/extent.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import { DoubleClickZoom, Select } from 'ol/interaction.js';
 import TileLayer from 'ol/layer/Tile.js';
-import ImageLayer from 'ol/layer/Image';
-import { Raster as RasterSource } from 'ol/source';
-import XYZ from 'ol/source/XYZ.js';
 import VectorLayer from 'ol/layer/Vector.js';
 import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
-import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
+import XYZ from 'ol/source/XYZ.js';
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
 
-import nextTick from 'dai-js/tools/nextTick'
-import { mapGetters } from "vuex";
+import { requestGet, requestPost } from "@/js/dai/request";
+import nextTick from 'dai-js/tools/nextTick';
 import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
 
-import cptTb from "@/views/modules/visual/cpts/tb";
 import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import cptTb from "@/views/modules/visual/cpts/tb";
 import People from "../../basicinfo/people";
 
 var centerPointGlobal = [120.664619, 36.504963]
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 07292b0cc..23dbc85b0 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -371,34 +371,29 @@
 </template>
 
 <script>
-import 'ol/ol.css'
-import { Map, View } from 'ol'
-import TileLayer from 'ol/layer/Tile.js';
-import ImageLayer from 'ol/layer/Image';
-import { Raster as RasterSource } from 'ol/source';
-import XYZ from 'ol/source/XYZ.js';
-import VectorLayer from 'ol/layer/Vector.js';
-import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
+// import 'ol/ol.css'
+import { Map, View } from 'ol';
 import Feature from "ol/Feature.js";
 import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
-import TileGrid from "ol/tilegrid/TileGrid";
-import TileImage from "ol/source/TileImage";
+import { boundingExtent } from 'ol/extent.js';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Point from "ol/geom/Point.js";
+import { Select } from 'ol/interaction.js';
 import Tile from "ol/layer/Tile";
+import VectorLayer from 'ol/layer/Vector.js';
+import TileImage from "ol/source/TileImage";
+import VectorSource from 'ol/source/Vector.js';
+import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
+import TileGrid from "ol/tilegrid/TileGrid";
 
-import nextTick from 'dai-js/tools/nextTick'
-import { mapGetters } from "vuex";
+import { requestGet, requestPost } from "@/js/dai/request";
 import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
 
-import cptTb from "@/views/modules/visual/cpts/tb";
 import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import cptTb from "@/views/modules/visual/cpts/tb";
 import People from "../../basicinfo/people";
 
 var centerPointGlobal = [120.664619, 36.504963]
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 776f9a837..5b7d8935d 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -368,7 +368,7 @@
 </template>
 
 <script>
-import 'ol/ol.css'
+// import 'ol/ol.css'
 import { Map, View } from 'ol'
 import TileLayer from 'ol/layer/Tile.js';
 import ImageLayer from 'ol/layer/Image';
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index c8be1659f..bf76f89cc 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import 'ol/ol.css'
+// import 'ol/ol.css'
 import { Map, View } from 'ol'
 import TileLayer from 'ol/layer/Tile.js';
 import XYZ from 'ol/source/XYZ.js';
diff --git a/src/views/modules/visual/plugin/power/components/screen-org-map.vue b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
index f7e9bb875..cdb343bf1 100644
--- a/src/views/modules/visual/plugin/power/components/screen-org-map.vue
+++ b/src/views/modules/visual/plugin/power/components/screen-org-map.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import 'ol/ol.css'
+// import 'ol/ol.css'
 import { Map, View } from 'ol'
 import TileLayer from 'ol/layer/Tile.js'
 import XYZ from 'ol/source/XYZ.js'