elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

feature
井乐禹 2 years ago
parent
b1761b9c73
commit
360139bd43
7 changed files with 48 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      package.json
  2. 31
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
  3. 30
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
  4. 33
      src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
  5. 2
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
  6. 2
      src/views/modules/visual/components/screen-map/index.vue
  7. 2
      src/views/modules/visual/plugin/power/components/screen-org-map.vue

4
package.json
View File

@ -41,7 +41,7 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"mint-ui": "^2.2.13", "mint-ui": "^2.2.13",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"ol": "^6.9.0", "ol": "^7.2.2",
"portfinder": "^1.0.21", "portfinder": "^1.0.21",
"proj4": "^2.8.0", "proj4": "^2.8.0",
"qs": "^6.7.0", "qs": "^6.7.0",
@ -71,7 +71,7 @@
"dai-js": "^0.0.12", "dai-js": "^0.0.12",
"element-theme-chalk": "^2.13.0", "element-theme-chalk": "^2.13.0",
"natives": "^1.1.6", "natives": "^1.1.6",
"ol": "^6.9.0", "ol": "^7.2.2",
"sass-loader": "^7.3.1", "sass-loader": "^7.3.1",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"tinymce": "5.8.2", "tinymce": "5.8.2",

31
src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
View File

@ -371,31 +371,30 @@
</template> </template>
<script> <script>
import 'ol/ol.css' import { Map, View } from 'ol';
import { Map, View } from 'ol' import Feature from "ol/Feature.js";
import TileLayer from 'ol/layer/Tile.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 ImageLayer from 'ol/layer/Image';
import { Raster as RasterSource } from 'ol/source'; import TileLayer from 'ol/layer/Tile.js';
import XYZ from 'ol/source/XYZ.js';
import VectorLayer from 'ol/layer/Vector.js'; import VectorLayer from 'ol/layer/Vector.js';
import { Raster as RasterSource } from 'ol/source';
import VectorSource from 'ol/source/Vector.js'; import VectorSource from 'ol/source/Vector.js';
import GeoJSON from 'ol/format/GeoJSON.js'; import XYZ from 'ol/source/XYZ.js';
import Point from "ol/geom/Point.js"; import { Fill, Icon, Stroke, Style, Text } from 'ol/style.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 nextTick from 'dai-js/tools/nextTick' import { requestGet, requestPost } from "@/js/dai/request";
import { mapGetters } from "vuex"; import nextTick from 'dai-js/tools/nextTick';
import { Loading } from 'element-ui'; //引入Loading服务 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 cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading"; import ScreenLoading from "@/views/modules/visual/cpts/loading";
import cptTb from "@/views/modules/visual/cpts/tb";
import People from "../../basicinfo/people"; import People from "../../basicinfo/people";
var centerPointGlobal = [120.664619, 36.504963] var centerPointGlobal = [120.664619, 36.504963]

30
src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
View File

@ -370,31 +370,29 @@
</template> </template>
<script> <script>
import 'ol/ol.css' // import 'ol/ol.css'
import { Map, View } from 'ol' 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 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 VectorLayer from 'ol/layer/Vector.js';
import VectorSource from 'ol/source/Vector.js'; import VectorSource from 'ol/source/Vector.js';
import GeoJSON from 'ol/format/GeoJSON.js'; import XYZ from 'ol/source/XYZ.js';
import Point from "ol/geom/Point.js"; import { Fill, Icon, Stroke, Style, Text } from 'ol/style.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 nextTick from 'dai-js/tools/nextTick' import { requestGet, requestPost } from "@/js/dai/request";
import { mapGetters } from "vuex"; import nextTick from 'dai-js/tools/nextTick';
import { Loading } from 'element-ui'; //引入Loading服务 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 cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading"; import ScreenLoading from "@/views/modules/visual/cpts/loading";
import cptTb from "@/views/modules/visual/cpts/tb";
import People from "../../basicinfo/people"; import People from "../../basicinfo/people";
var centerPointGlobal = [120.664619, 36.504963] var centerPointGlobal = [120.664619, 36.504963]

33
src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
View File

@ -371,34 +371,29 @@
</template> </template>
<script> <script>
import 'ol/ol.css' // import 'ol/ol.css'
import { Map, View } from 'ol' 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 Feature from "ol/Feature.js"; import Feature from "ol/Feature.js";
import Overlay from 'ol/Overlay'; import Overlay from 'ol/Overlay';
import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js'; import { boundingExtent } from 'ol/extent.js';
import { getCenter, boundingExtent } from 'ol/extent.js'; import GeoJSON from 'ol/format/GeoJSON.js';
import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js'; import Point from "ol/geom/Point.js";
import TileGrid from "ol/tilegrid/TileGrid"; import { Select } from 'ol/interaction.js';
import TileImage from "ol/source/TileImage";
import Tile from "ol/layer/Tile"; 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 { requestGet, requestPost } from "@/js/dai/request";
import { mapGetters } from "vuex";
import { Loading } from 'element-ui'; //引入Loading服务 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 cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading"; import ScreenLoading from "@/views/modules/visual/cpts/loading";
import cptTb from "@/views/modules/visual/cpts/tb";
import People from "../../basicinfo/people"; import People from "../../basicinfo/people";
var centerPointGlobal = [120.664619, 36.504963] var centerPointGlobal = [120.664619, 36.504963]

2
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
View File

@ -368,7 +368,7 @@
</template> </template>
<script> <script>
import 'ol/ol.css' // import 'ol/ol.css'
import { Map, View } from 'ol' import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js'; import TileLayer from 'ol/layer/Tile.js';
import ImageLayer from 'ol/layer/Image'; import ImageLayer from 'ol/layer/Image';

2
src/views/modules/visual/components/screen-map/index.vue
View File

@ -40,7 +40,7 @@
</template> </template>
<script> <script>
import 'ol/ol.css' // import 'ol/ol.css'
import { Map, View } from 'ol' import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js'; import TileLayer from 'ol/layer/Tile.js';
import XYZ from 'ol/source/XYZ.js'; import XYZ from 'ol/source/XYZ.js';

2
src/views/modules/visual/plugin/power/components/screen-org-map.vue
View File

@ -3,7 +3,7 @@
</template> </template>
<script> <script>
import 'ol/ol.css' // import 'ol/ol.css'
import { Map, View } from 'ol' import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js' import TileLayer from 'ol/layer/Tile.js'
import XYZ from 'ol/source/XYZ.js' import XYZ from 'ol/source/XYZ.js'

Write Preview
Loading…
Cancel
Save