井乐禹 2 years ago
parent
commit
84ee90b5b7
  1. 6
      src/views/modules/visual/command/index.vue
  2. 31
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
  3. 23
      src/views/modules/visual/components/screen-map/index.vue
  4. 28
      src/views/modules/visual/plugin/power/components/screen-org-map.vue
  5. 33
      src/views/modules/workSys/mapConfig.vue

6
src/views/modules/visual/command/index.vue

@ -203,14 +203,14 @@
import { requestPost } from "@/js/dai/request";
import People from "@/views/modules/visual/basicinfo/people";
import gridMap from "@/views/modules/visual/command/cpts/map";
import cptCard from "@/views/modules/visual/cpts/card";
import { Loading } from "element-ui"; //Loading
import { mapGetters } from "vuex";
// import gridMapOl from "@/views/modules/visual/command/cpts/map-ol";
import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1";
import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2";
import cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
import { Loading } from "element-ui"; //Loading
import { mapGetters } from "vuex";
import demandInfo from "@/views/modules/visual/command/cpts/demandInfo";
import eventInfo from "@/views/modules/visual/command/cpts/eventInfo";

31
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -89,7 +89,8 @@
</div>
<div class="m-pagination">
<el-pagination hide-on-single-page :current-page="demand.pageNo"
<el-pagination hide-on-single-page
:current-page="demand.pageNo"
:page-size="demand.pageSize"
:total="demand.total"
background
@ -369,30 +370,28 @@
<script>
// 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 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]

23
src/views/modules/visual/components/screen-map/index.vue

@ -41,28 +41,25 @@
<script>
// 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 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 { 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 { altKeyOnly, click, pointerMove } from 'ol/events/condition';
import XYZ from 'ol/source/XYZ.js';
import { getDistance } from 'ol/sphere';
import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js';
import { Loading } from 'element-ui'; //Loading
import MousePosition from 'ol/control/MousePosition';
import { createStringXY } from 'ol/coordinate';
import { defaults as defaultControls } from 'ol/control';
import { mapGetters } from "vuex";
import { Loading } from 'element-ui'; //Loading
import { requestPost } from "@/js/dai/request";
var centerPointGlobal = [120.38945519, 36.0722275]

28
src/views/modules/visual/plugin/power/components/screen-org-map.vue

@ -1,29 +1,23 @@
<template>
<div class="div_map" id="map" ref="map"></div>
<div class="div_map"
id="map"
ref="map"></div>
</template>
<script>
// import 'ol/ol.css'
import { requestPost } from "@/js/dai/request"
import { Map, View } from 'ol'
import Feature from "ol/Feature.js"
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 TileLayer from 'ol/layer/Tile.js'
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 { 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 { altKeyOnly, click, pointerMove } from 'ol/events/condition'
import { getDistance } from 'ol/sphere'
import MousePosition from 'ol/control/MousePosition'
import { createStringXY } from 'ol/coordinate'
import { defaults as defaultControls } from 'ol/control'
import { mapGetters } from "vuex"
import { Loading } from 'element-ui'
import { requestPost } from "@/js/dai/request"
import XYZ from 'ol/source/XYZ.js'
import { Fill, Icon, Stroke, Style, Text } from 'ol/style.js'
let map
let mapView

33
src/views/modules/workSys/mapConfig.vue

@ -151,33 +151,30 @@
</template>
<script>
import "ol/ol.css";
// import "ol/ol.css";
import { requestPost } from "@/js/dai/request";
import { mapType } from "@/utils/dai-map";
import { Loading } from "element-ui"; //Loading
import { Map, View } from "ol";
import TileLayer from "ol/layer/Tile.js";
import XYZ from "ol/source/XYZ.js";
import VectorLayer from "ol/layer/Vector.js";
import VectorSource from "ol/source/Vector.js";
import { altKeyOnly, click } from "ol/events/condition";
import { getWidth } from "ol/extent.js";
import GeoJSON from "ol/format/GeoJSON.js";
import { defaults as defaultControls, ZoomToExtent } from "ol/control.js";
import {
defaults as defaultInteractions,
Modify,
Select,
DoubleClickZoom,
Select
} from "ol/interaction.js";
import { getCenter, getWidth } from "ol/extent.js";
import { Circle as CircleStyle, Fill, Stroke, Style, Text } from "ol/style.js";
import Draw from "ol/interaction/Draw.js";
import { mapGetters } from "vuex";
import { Loading } from "element-ui"; //Loading
import { requestPost } from "@/js/dai/request";
import { altKeyOnly, click, pointerMove } from "ol/events/condition";
import TileLayer from "ol/layer/Tile.js";
import VectorLayer from "ol/layer/Vector.js";
import { Projection, addProjection, get as getProjection } from "ol/proj.js";
import { register as registerProj4 } from "ol/proj/proj4";
import VectorSource from "ol/source/Vector.js";
import WMTS from "ol/source/WMTS.js";
import XYZ from "ol/source/XYZ.js";
import { Fill, Stroke, Style, Text } from "ol/style.js";
import WMTSTileGrid from "ol/tilegrid/WMTS.js";
import { mapType } from "@/utils/dai-map";
import { get as getProjection, Projection, addProjection } from "ol/proj.js";
import proj4 from "proj4";
import { register as registerProj4 } from "ol/proj/proj4";
import { mapGetters } from "vuex";
var centerPointGlobal = [120.664619, 36.504963];
let loading; //

Loading…
Cancel
Save