模块更新

src/api/APIs.js

@@ -1,6 +1,6 @@
 // 接口模块
 
-import request from "@/utils/request";
+import request from "@/utils/temporaryRequest";
 // 引入qs
 import Qs from "qs";
 //初始化调用

src/layout/components/loadComps.ts

@@ -7,7 +7,7 @@ const requireComponent = require.context(
 requireComponent.keys().forEach((fileName) => {
   const comp = requireComponent(fileName)
   const files = fileName.replace(/^\.\/(.*)\.\w+$/, '$1').split('/')
-  if (['monitoring', 'business'].includes(files[0])) {
+  if (['monitoring', 'business','widgets'].includes(files[0])) {
     const names = [...files]
     names.pop()
     resultComps[`/${names.join('/')}`] = comp.default

src/main.ts

@@ -24,7 +24,14 @@ import '@/assets/iconfont/iconfont.css'
 
 import Moment from 'vue-moment'
 import 'animate.css' //animate动画组件库
-
+//全局接口
+import PortApi from "./api/APIs";
+Vue.prototype.$PortApi = PortApi;
+//全局lodash
+import lodash from "lodash";
+Object.defineProperty(Vue.prototype, "$_", {
+  value: lodash
+});
 // import htmlToPdf from './utils/htmlToPdf'
 // Vue.use(htmlToPdf)
 // dialog拖动

src/store/modules/cesiumMap.ts

@@ -1,24 +1,4 @@
 import AppX from '@/config/configure'
-function delOne(arr, str) {
-    let index = 0
-    for (let i = 0; i < arr.length; i++) {
-        if (arr[i].com === str) {
-            index = i
-        }
-    }
-    arr.splice(index, 1)
-    return arr
-}
-
-function some(arr, str) {
-    const result = arr.some(item => {
-        if (item.com === str) {
-            return true
-        }
-    })
-    return result
-}
-
 const getDefaultState = () => {
     return {
         tdttoken: '75293e320524bb2be0a5f14fa887e46f',
@@ -33,105 +13,10 @@ const getDefaultState = () => {
         tdtlayer: { base: 'vec_w', poi: 'cva_w' },
         sceneMode: "3d",//3d 三维模式，2dwith3d:二三维分屏
         mapLegendOpen: false,//图例是否展示
-        panels: [],
-        fullPanels: [],
-        halfPanels: [],
-        floatPanels: [],
-        fullP_editableTabsValue: '',
-        halfP_editableTabsValue: '',
-        floatP_editableTabsValue: '',
-        P_editableTabsValue: ''
     }
 }
-
 const state = getDefaultState()
-
 const mutations = {
-    SET_FUN: (state, data) => {
-        state.P_editableTabsValue = data.com
-        // if (!some(state.panels, data.com)) {
-        //   state.panels.unshift(data)
-        // }
-        let panel = state.panels.findIndex(item => item.com === data.com);
-        let changePanel = null;
-        if (panel !== -1) { // 有这个元素 调整位置到第一个
-            changePanel = state.panels[panel];
-            state.panels.splice(panel, 1);
-            state.panels.unshift(changePanel);
-            panel = null;
-            changePanel = null;
-        } else { //没有这个元素 直接放到第一个
-            state.panels.unshift(data)
-        }
-    },
-    SET_FULLPALL: (state, data) => {
-        // console.log('22322', some(state.fullPanels, data.com), data)
-        state.fullP_editableTabsValue = data.com
-        if (!some(state.fullPanels, data.com)) {
-            state.fullPanels.push(data)
-        }
-    },
-    SET_BOX: (state, data) => {
-        state.halfP_editableTabsValue = data.com
-        if (!some(state.halfPanels, data.com)) {
-            state.halfPanels.push(data)
-        } else {
-            state.halfPanels = state.halfPanels.slice()
-        }
-    },
-    SET_FLOAT: (state, data) => {
-        state.floatP_editableTabsValue = data.com
-        if (!some(state.floatPanels, data.com)) {
-            state.floatPanels.push(data)
-        }
-    },
-    DEL_FUN: (state, data) => {
-        state.panels = delOne(state.panels, data)
-        if (state.panels.length > 0) { state.P_editableTabsValue = state.panels[0].com }
-    },
-    DEL_FULLPALL: (state, data) => {
-        // state.fullPanels.splice(data, 1)
-        // console.log('333', delOne(state.fullPanels, data))
-        state.fullPanels = delOne(state.fullPanels, data)
-        if (state.fullPanels.length > 0) { state.fullP_editableTabsValue = state.fullPanels[state.fullPanels.length - 1].com }
-    },
-    DEL_BOX: (state, data) => {
-        state.halfPanels = delOne(state.halfPanels, data)
-        if (state.halfPanels.length > 0) { state.halfP_editableTabsValue = state.halfPanels[state.halfPanels.length - 1].com }
-    },
-    DEL_FLOAT: (state, data) => {
-        state.floatPanels = delOne(state.floatPanels, data)
-        if (state.floatPanels.length > 0) { state.floatP_editableTabsValue = state.floatPanels[state.floatPanels.length - 1].com }
-    },
-    DEL_ALLFULLPALL: (state) => {
-        state.fullPanels = []
-    },
-    DEL_ALLFUN: (state) => {
-        state.panels = []
-    },
-    DEL_ALLBOX: (state) => {
-        state.halfPanels = []
-    },
-    DEL_ALLFLOAT: (state) => {
-        state.floatPanels = []
-    },
-    CHANGE_TAB: (state, payload) => {
-        let delIndex = state.panels.findIndex(index => index.com === payload);
-        let changePos = state.panels[delIndex];
-        if (delIndex >= 2) {
-            state.panels.splice(delIndex, 1);
-            state.panels.unshift(changePos);
-            delIndex = null;
-            changePos = null;
-        }
-        state.P_editableTabsValue = payload;
-    },
-    RESET_ALL: (state, payload) => {
-        const newState = getDefaultState()
-        Object.keys(state).forEach(key => {
-            state[key] = newState[key]
-        })
-    },
     SET_GISSOURCE: (state, payload) => {
         state.AppX.appConfig = payload.appConfig
     },
@@ -153,83 +38,6 @@ const mutations = {
 }
 
 const actions = {
-    // 切换tab
-    changeTab({ commit }, val) {
-        commit('CHANGE_TAB', val)
-    },
-    // 添加
-    changeMethod({ commit }, value) {
-        // console.log('222', value)
-        const data = {
-            com: value.id || value.pathId,
-            box: value.widgetid,
-            title: value.label,
-            param: value.param || {}
-        }
-        if (value.widgetid === 'Panel') {
-            commit('SET_FUN', data)
-        }
-        if (value.widgetid === 'FullPanel') {
-            commit('SET_FULLPALL', data)
-        }
-        if (value.widgetid === 'HalfPanel') {
-            commit('SET_BOX', data)
-        }
-        if (value.widgetid === 'FloatPanel') {
-            commit('SET_FLOAT', data)
-        }
-    },
-    // 删除单个
-    handelClose({ commit, state }, data) {
-        // commit('DEL_FUN', data)
-        // console.log('32222', data)
-
-        if (data.box === 'Panel') {
-            // getIndex(state.panels, data.title)
-            commit('DEL_FUN', data)
-        }
-        if (data.box === 'FullPanel') {
-            commit('DEL_FULLPALL', data)
-        }
-        if (data.box === 'HalfPanel') {
-            commit('DEL_BOX', data)
-        }
-        if (data.box === 'FloatPanel') {
-            commit('DEL_FLOAT', data)
-        }
-    },
-    // 删除单个fullpanel
-    delFullPanels({ commit }, data) {
-        commit('DEL_FULLPALL', data)
-    },
-    // 删除单个halfpanel
-    delHalfPanels({ commit }, data) {
-        commit('DEL_BOX', data)
-    },
-    // 删除单个panel
-    delPanels({ commit }, data) {
-        commit('DEL_FUN', data)
-    },
-    // 删除单个floatpanel
-    delFloatPanels({ commit }, data) {
-        commit('DEL_FLOAT', data)
-    },
-    // 删除全部fullpanel
-    delAllFull({ commit }) {
-        commit('DEL_ALLFULLPALL')
-    },
-    // 删除全部halfpanel
-    delAllHalf({ commit }) {
-        commit('DEL_ALLBOX')
-    },
-    // 删除全部panel
-    delAllPanel({ commit }) {
-        commit('DEL_ALLFUN')
-    },
-    // 删除全部panel
-    delAllFloat({ commit }) {
-        commit('DEL_ALLFLOAT')
-    },
     mapLegendStatus({ commit }, data) {
         commit('SET_MAPLEGEND', data);
     },

src/utils/temporaryRequest.ts

@@ -2,9 +2,9 @@ import axios from 'axios';
 import { geteSessionStorage } from '@/utils/auth'
 const service = axios.create({
     timeout: 5000,
-    baseURL: 'http://221.182.8.141:1118',
+    baseURL: 'https://yeepms.yeec.com.cn/gis-api',//http://221.182.8.141:1118
     withCredentials: true, // 跨域请求时发送cookiesokies
 })
 service.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-service.defaults.headers['Authorization'] = 'bearer ' + geteSessionStorage('token')
+service.defaults.headers['Authorization'] = 'bearer ' + '2b931362-9ddb-43d2-9a04-0af36e005c16'//geteSessionStorage('token')
 export default service;

src/views/widgets/InfoSearch/index.vue

@@ -41,7 +41,7 @@ import $ from 'jquery'
 import axios from 'axios'
 import Vue from 'vue'
 import Config from './config.json'
-import { pbsTreeSearch_api, mapSearch_api, getPidByPbs_api } from '@/api/APIs.js'
+import { pbsTreeSearch_api, mapSearch_api, getPidByPbs_api } from '@/api/APIs'
 // import xss from '@/utils/xss'
 import commonTree from '@/components/PbsTreeList/commonTree.vue'
 import PipeUnitInfo from '@/views/widgets/PipeUnitInfo/index.vue'
@@ -103,7 +103,7 @@ export default {
       const searchType = this.selectType
       const inputObj = this.searchInput
       //   if (xss.isXSS(inputObj)) {
-      if (inputObj) {
+      if (!inputObj) {
         this.$message.warning('非法输入!')
         return
       }

src/views/widgets/MapToolBar/index.vue

@@ -112,7 +112,7 @@ const viewMemoryType = {
 }
 import Vue from 'vue'
 import $ from 'jquery'
-import { createQRCodePdf_api } from '@/api/APIs.js'
+import { createQRCodePdf_api } from '@/api/APIs'
 // import PipeUnitNowInfo from '@/views/widgets/PipeUnitNowInfo/index.vue'
 import MeasurementBar from './MeasurementBar'
 import { Canvas2Image } from '@/utils/mapCommon/tools'

src/views/widgets/PipeSpeedInfoCheck/index.vue

@@ -173,7 +173,7 @@ export default {
     }
   },
   mounted() {
-    this.$store.dispatch('map/changeCurrentTool', this.clearSpeedInfos.bind(this))
+    this.$store.dispatch('cesiumMap/changeCurrentTool', this.clearSpeedInfos.bind(this))
   },
   methods: {
     init() {

src/views/widgets/TopSectionUI/index.vue

@@ -40,27 +40,27 @@
         </el-dropdown-menu>
       </el-dropdown>
     </el-button-group>
-    <PipeVerticalSectionAnalysis ref="vsAnalysis" />
+    <!-- <PipeVerticalSectionAnalysis ref="vsAnalysis" />
-    <PipeCrossSectionAnalysis ref="csAnalysis" />
+    <PipeCrossSectionAnalysis ref="csAnalysis" /> -->
   </div>
 </template>
 <script>
 import Vue from "vue";
-import Store from "@/store/store.js";
+// import Store from "@/store/store.js";
 import { InfoWindow } from "@/utils/mapCommon/tools";
-import PipeUnitInfo from "@/views/widgets/PipeUnitInfo/index.vue";
+// import PipeUnitInfo from "@/views/widgets/PipeUnitInfo/index.vue";
-import DiameterMark from "@/views/widgets/DiameterMark/DiameterMark";
+// import DiameterMark from "@/views/widgets/DiameterMark/DiameterMark";
-import CoordinateMark from "@/views/widgets/CoordinateMark/CoordinateMark";
+// import CoordinateMark from "@/views/widgets/CoordinateMark/CoordinateMark";
-import BoltPointMark from "@/views/widgets/BoltPointMark/BoltPointMark";
+// import BoltPointMark from "@/views/widgets/BoltPointMark/BoltPointMark";
-import ElevationMark from "@/views/widgets/ElevationMark/ElevationMark";
+// import ElevationMark from "@/views/widgets/ElevationMark/ElevationMark";
-import FlagMark from "@/views/widgets/FlagMark/FlagMark";
+// import FlagMark from "@/views/widgets/FlagMark/FlagMark";
-import PipeVerticalSectionAnalysis from "@/views/widgets/PipeVerticalSectionAnalysis/widget.vue"
+// import PipeVerticalSectionAnalysis from "@/views/widgets/PipeVerticalSectionAnalysis/widget.vue"
-import PipeCrossSectionAnalysis from "@/views/widgets/PipeCrossSectionAnalysis/widget.vue"
+// import PipeCrossSectionAnalysis from "@/views/widgets/PipeCrossSectionAnalysis/widget.vue"
 export default {
   name: "TopSectionUI",
   components:{
-    PipeVerticalSectionAnalysis,
+    // PipeVerticalSectionAnalysis,
-    PipeCrossSectionAnalysis
+    // PipeCrossSectionAnalysis
   },
   props: {
     isInit: false, //三维场景是否初始化
@@ -302,7 +302,6 @@ export default {
   top: 13px;
   right: 17px;
   display: flex;
-  display: -webkit-flex;
   flex-flow: row nowrap;
   border-radius: 4px;
   box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.4);
@@ -312,6 +311,9 @@ export default {
       padding:12px 10px;
     }
   }
+  /deep/ .el-dropdown{
+    margin: 0 -10px;
+  }
   .el-button-group > .el-button:not(:last-child)::after {
     content: " ";
     width: 1px;

src/views/widgets/cesiumMap.vue

@@ -3,7 +3,7 @@
     <div id="cesiumContainer" class="cesium_container"></div>
     <Maptool-Bar :class="footer_height === '0%' ? '' : 'maptools'" :isInit="isInit"></Maptool-Bar>
     <Coordinate :isInit="isInit"></Coordinate>
-    <!-- <Top-SectionUI :isInit="isInit"></Top-SectionUI> -->
+    <Top-SectionUI :isInit="isInit"></Top-SectionUI>
     <LayerUpOrDown :isInit="isInit"></LayerUpOrDown>
     <BaseImageOpacity :isInit="isInit"></BaseImageOpacity>
     <PipeSpeedInfoCheck :isInit="isInit"></PipeSpeedInfoCheck>
@@ -16,7 +16,7 @@
 <script>
 import MaptoolBar from '@/views/widgets/MapToolBar/index.vue'
 import Coordinate from '@/views/widgets/Coordinate/index.vue'
-// import TopSectionUI from '@/views/widgets/TopSectionUI/index.vue'
+import TopSectionUI from '@/views/widgets/TopSectionUI/index.vue'
 import LayerUpOrDown from '@/views/widgets/LayerUpOrDown/index.vue'
 import BaseImageOpacity from '@/views/widgets/BaseImageOpacity/index.vue'
 import PipeSpeedInfoCheck from '@/views/widgets/PipeSpeedInfoCheck/index.vue'
@@ -29,7 +29,7 @@ export default {
   components: {
     MaptoolBar,
     Coordinate,
-    // TopSectionUI,
+    TopSectionUI,
     LayerUpOrDown,
     BaseImageOpacity,
     PipeSpeedInfoCheck,
@@ -46,7 +46,6 @@ export default {
       terrain: 'dixing',
       isInit: false, //当前的地图容器对象
       baselayer: [],
-      viewer: null
     }
   },
   computed: {
@@ -95,7 +94,7 @@ export default {
         selectionIndicator: false //设置绿色框框不可见
       })
       this.viewer = viewer
-      this.viewer._cesiumWidget._creditContainer.style.display = 'none' //去掉logo
+      viewer._cesiumWidget._creditContainer.style.display = 'none' //去掉logo
       window.viewer = viewer
       //   this.viewer = window.viewer;
       this.isInit = true

src/views/zhpt/index.vue

@@ -1,17 +1,13 @@
 <template>
   <div
     id="viewDiv"
-    ref="back_box"
+
-    v-loading="loading"
-    :element-loading-text="loadText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(255, 255, 255, 0.8)"
   >
-    <tf-dialog
+    <!-- <tf-dialog
       :show.sync="panels.tfDialog.Show"
       :hide.sync="panels.tfDialog.Hide"
       :set-size.sync="panels.tfDialog.setSize"
-    />
+    /> -->
     <el-container style="height: 100%; width: 100%">
       <el-container
         :style="{
@@ -202,51 +198,51 @@
 </template>
 <script lang="ts">
 import { Vue, Component, Watch, Prop } from 'vue-property-decorator'
-import 'ol/ol.css'
+// import 'ol/ol.css'
-import Map from 'ol/Map'
+// import Map from 'ol/Map'
-import View from 'ol/View'
+// import View from 'ol/View'
-import TileLayer from 'ol/layer/Tile'
+// import TileLayer from 'ol/layer/Tile'
-import { Logo, TileSuperMapRest, SuperMap, LayerInfoService } from '@supermap/iclient-ol'
+// import { Logo, TileSuperMapRest, SuperMap, LayerInfoService } from '@supermap/iclient-ol'
-import axios from 'axios'
+// import axios from 'axios'
-import Comps from '@/layout/components/loadComps'
+// import Comps from '@/layout/components/loadComps'
 import { HalfPanels, FullPanels, FloatPanels, SidePanels } from '@/layout/components/index'
-import { appconfig } from 'staticPub/config'
+// import { appconfig } from 'staticPub/config'
-import { loadCss } from '@/utils/loadResources'
+// import { loadCss } from '@/utils/loadResources'
-import request from '@/utils/request'
+// import request from '@/utils/request'
-import tfDialog from './common/Dialog.vue'
+// import tfDialog from './common/Dialog.vue'
-import WidgetGroup from './tongyonggongju/widgetGroup/widget.vue'
+// import WidgetGroup from './tongyonggongju/widgetGroup/widget.vue'
-import MeasureTool from './tongyonggongju/measureTool/widget.vue'
+// import MeasureTool from './tongyonggongju/measureTool/widget.vue'
-import QueryTool from './tongyonggongju/queryTool/widget.vue'
+// import QueryTool from './tongyonggongju/queryTool/widget.vue'
-import SimpleQueryTool from './tongyonggongju/simpleQueryTool/widget.vue'
+// import SimpleQueryTool from './tongyonggongju/simpleQueryTool/widget.vue'
-import leftBottomTool from './tongyonggongju/leftBottomTool/widget.vue'
+// import leftBottomTool from './tongyonggongju/leftBottomTool/widget.vue'
-import leftTopTool from './tongyonggongju/leftTopTool/widget.vue'
+// import leftTopTool from './tongyonggongju/leftTopTool/widget.vue'
-import rightBottomTool from './tongyonggongju/rightBottomTool/widget.vue'
+// import rightBottomTool from './tongyonggongju/rightBottomTool/widget.vue'
-import rightTopTool from './tongyonggongju/rightTopTool/widget.vue'
+// import rightTopTool from './tongyonggongju/rightTopTool/widget.vue'
-import popupWindow from '@/components/PopupWindow/popupWindow.vue'
+// import popupWindow from '@/components/PopupWindow/popupWindow.vue'
 import cesiumMap from '@/views/widgets/cesiumMap.vue'
 // 投影
-import { Projection, addProjection, get as getProjection, fromLonLat, transform } from 'ol/proj'
+// import { Projection, addProjection, get as getProjection, fromLonLat, transform } from 'ol/proj'
-import { register as olRegisterProj } from 'ol/proj/proj4'
+// import { register as olRegisterProj } from 'ol/proj/proj4'
-import proj4 from 'proj4'
+// import proj4 from 'proj4'
-import { Feature } from 'ol'
+// import { Feature } from 'ol'
-import { LineString } from 'ol/geom'
+// import { LineString } from 'ol/geom'
-import VectorLayer from 'ol/layer/Vector'
+// import VectorLayer from 'ol/layer/Vector'
-import VectorSource from 'ol/source/Vector'
+// import VectorSource from 'ol/source/Vector'
-import { comSymbol } from '@/utils/comSymbol'
+// import { comSymbol } from '@/utils/comSymbol'
-import { LegendConfig } from '@/views/zhpt/common/legendConfig'
+// import { LegendConfig } from '@/views/zhpt/common/legendConfig'
 
-import { mapUtil } from '@/views/zhpt/common/mapUtil/common'
+// import { mapUtil } from '@/views/zhpt/common/mapUtil/common'
-import { TF_Layer } from '@/views/zhpt/common/mapUtil/layer'
+// import { TF_Layer } from '@/views/zhpt/common/mapUtil/layer'
-import { Polygon } from 'ol/geom'
+// import { Polygon } from 'ol/geom'
-import { WMTS } from 'ol/source'
+// import { WMTS } from 'ol/source'
-import * as olExtent from 'ol/extent'
+// import * as olExtent from 'ol/extent'
-import WMTSTileGrid from 'ol/tilegrid/WMTS'
+// import WMTSTileGrid from 'ol/tilegrid/WMTS'
-import * as olProj from 'ol/proj'
+// import * as olProj from 'ol/proj'
-import { defaults as controls } from 'ol/control'
+// import { defaults as controls } from 'ol/control'
-import * as turf from '@turf/turf'
+// import * as turf from '@turf/turf'
-import iQuery from './common/mapUtil/query'
+// import iQuery from './common/mapUtil/query'
-import { unByKey } from 'ol/Observable'
+// import { unByKey } from 'ol/Observable'
-import GeoJSON from 'ol/format/GeoJSON'
+// import GeoJSON from 'ol/format/GeoJSON'
 
 @Component({
   components: {
@@ -254,16 +250,16 @@ import GeoJSON from 'ol/format/GeoJSON'
     FullPanels,
     FloatPanels,
     SidePanels,
-    tfDialog,
+    // tfDialog,
-    WidgetGroup,
+    // WidgetGroup,
-    MeasureTool,
+    // MeasureTool,
-    QueryTool,
+    // QueryTool,
-    SimpleQueryTool,
+    // SimpleQueryTool,
-    leftBottomTool,
+    // leftBottomTool,
-    leftTopTool,
+    // leftTopTool,
-    rightBottomTool,
+    // rightBottomTool,
-    rightTopTool,
+    // rightTopTool,
-    popupWindow,
+    // popupWindow,
     cesiumMap
   }
 })
@@ -342,7 +338,7 @@ export default class BaseMap extends Vue {
   PanelsChange(n, o) {
     if (n.length === 0) {
       this.$nextTick(() => {
-        this.view.updateSize()
+        // this.view.updateSize()
       })
     }
   }
@@ -350,7 +346,7 @@ export default class BaseMap extends Vue {
   HalfPanelsChange(n, o) {
     if (n.length === 0) {
       this.$nextTick(() => {
-        this.view.updateSize()
+        // this.view.updateSize()
       })
     }
   }
@@ -388,11 +384,11 @@ export default class BaseMap extends Vue {
     this.currTitle = n
   }
   created() {
-    console.log('=====', this.Comps)
+    // console.log('=====', this.Comps)
   }
   mounted() {
-    console.log('地图重新加载')
+    // console.log('地图重新加载')
-    this.loading = false
+    // this.loading = false
     // this.initConfig() // 加载配置 ==> 加载地图
   }
   // 页面初始化
@@ -418,312 +414,312 @@ export default class BaseMap extends Vue {
   handelClose() {
     this.show = false
   }
-  async initMap() {
+  // async initMap() {
-    let { initCenter, initZoom } = appconfig
+  //   let { initCenter, initZoom } = appconfig
 
-    let layerResource = appconfig.gisResource['iserver_resource'].layerService.layers
+  //   let layerResource = appconfig.gisResource['iserver_resource'].layerService.layers
-    let map = new Map({
+  //   let map = new Map({
-      target: 'mapView',
+  //     target: 'mapView',
-      controls: controls({
+  //     controls: controls({
-        zoom: false,
+  //       zoom: false,
-        attribution: false
+  //       attribution: false
-      }),
+  //     }),
-      view: new View({
+  //     view: new View({
-        center: initCenter,
+  //       center: initCenter,
-        zoom: initZoom,
+  //       zoom: initZoom,
-        maxZoom: 21,
+  //       maxZoom: 21,
-        minZoom: 5,
+  //       minZoom: 5,
-        projection: 'EPSG:4326'
+  //       projection: 'EPSG:4326'
-      })
+  //     })
-    })
+  //   })
-    this.panels.mapView = this.view = this.$store.state.gis.map = map
+  //   this.panels.mapView = this.view = this.$store.state.gis.map = map
-    this.addLayers(layerResource)
+  //   this.addLayers(layerResource)
 
-    this.loading = false
+  //   this.loading = false
-    this.$store.commit('map/LOADING', false)
+  //   this.$store.commit('map/LOADING', false)
-    this.$nextTick(this.controlToolDisplay)
+  //   this.$nextTick(this.controlToolDisplay)
-    // 触发地图视野变化
+  //   // 触发地图视野变化
-    let timer = null,
+  //   let timer = null,
-      time = 500
+  //     time = 500
-    this.view.getView().on('change', (evt) => {
+  //   this.view.getView().on('change', (evt) => {
-      // console.log('级别变化', this.view)
+  //     // console.log('级别变化', this.view)
-      timer && clearTimeout(timer)
+  //     timer && clearTimeout(timer)
-      timer = setTimeout(() => {
+  //     timer = setTimeout(() => {
-        let extent = new mapUtil(this.view).getCurrentViewExtent()
+  //       let extent = new mapUtil(this.view).getCurrentViewExtent()
-        this.$store.state.gis.mapExtent = extent
+  //       this.$store.state.gis.mapExtent = extent
-      }, time)
+  //     }, time)
-    })
+  //   })
-    // 点击查询管段详情
+  //   // 点击查询管段详情
-    this.view.on('click', (evt) => {
+  //   this.view.on('click', (evt) => {
-      let filter = this.$store.state.routeSetting.routes[0].name === 'leftBottomTool'
+  //     let filter = this.$store.state.routeSetting.routes[0].name === 'leftBottomTool'
-      if (!filter || !this.openPopupSwitch) return
+  //     if (!filter || !this.openPopupSwitch) return
-      this.spaceQuery(evt.coordinate)
+  //     this.spaceQuery(evt.coordinate)
-    })
+  //   })
-    this.vectorLayer = new VectorLayer({
+  //   this.vectorLayer = new VectorLayer({
-      source: new VectorSource(),
+  //     source: new VectorSource(),
-      style: comSymbol.getAllStyle(3, 'f00', 5, '#00ffff', 'rgba(255, 255, 255, 0.6)')
+  //     style: comSymbol.getAllStyle(3, 'f00', 5, '#00ffff', 'rgba(255, 255, 255, 0.6)')
-    })
+  //   })
 
-    this.view.addLayer(this.vectorLayer)
+  //   this.view.addLayer(this.vectorLayer)
-    // this.view.getView().setCenter([101.724022, 26.580702])
+  //   // this.view.getView().setCenter([101.724022, 26.580702])
-  }
+  // }
 
-  spaceQuery(position) {
+  // spaceQuery(position) {
-    console.log('查询')
+  //   console.log('查询')
-    let queryFeature = turf.buffer(turf.point(position), 2, { units: 'meters' }) as any
+  //   let queryFeature = turf.buffer(turf.point(position), 2, { units: 'meters' }) as any
-    queryFeature = new GeoJSON().readFeature(queryFeature)
+  //   queryFeature = new GeoJSON().readFeature(queryFeature)
-    let dataServerConfig = appconfig.gisResource.iserver_resource.dataService
+  //   let dataServerConfig = appconfig.gisResource.iserver_resource.dataService
-    new iQuery().spaceQuery(queryFeature).then((queryData) => {
+  //   new iQuery().spaceQuery(queryFeature).then((queryData) => {
-      let showData = []
+  //     let showData = []
-      for (let data of queryData as any) {
+  //     for (let data of queryData as any) {
-        let features = data ? data.result.features.features : []
+  //       let features = data ? data.result.features.features : []
-        if (features.length !== 0) {
+  //       if (features.length !== 0) {
-          showData.push(data)
+  //         showData.push(data)
-        }
+  //       }
-      }
+  //     }
-      if (showData.length !== 0) {
+  //     if (showData.length !== 0) {
-        let openData = showData.find((data) => data.result.features.features[0].geometry.type === 'Point')
+  //       let openData = showData.find((data) => data.result.features.features[0].geometry.type === 'Point')
-        // 点优于线显示
+  //       // 点优于线显示
-        let featureData = openData ? openData : showData[0]
+  //       let featureData = openData ? openData : showData[0]
-        let layerName = featureData.tableName
+  //       let layerName = featureData.tableName
-        //
+  //       //
-        let layer = mapUtil.getAllSubLayerNames('pipemap', 'smlayergroup')
+  //       let layer = mapUtil.getAllSubLayerNames('pipemap', 'smlayergroup')
-        let feature = featureData.result.features.features[0]
+  //       let feature = featureData.result.features.features[0]
-        let findLayer
+  //       let findLayer
-        layer.sublayers.forEach((p) => {
+  //       layer.sublayers.forEach((p) => {
-          let layername = p.title
+  //         let layername = p.title
-          let sublayer = p.sublayers.find((sub) => sub.name.split('@')[0] === layerName)
+  //         let sublayer = p.sublayers.find((sub) => sub.name.split('@')[0] === layerName)
-          if (sublayer) {
+  //         if (sublayer) {
-            feature.layerName = layername
+  //           feature.layerName = layername
-            feature.tableName = sublayer.name.split('@')[0]
+  //           feature.tableName = sublayer.name.split('@')[0]
-          }
+  //         }
-        })
+  //       })
 
-        let com = this.$refs.popupWindow as any
+  //       let com = this.$refs.popupWindow as any
-        com.showPopup(position, feature, afterClosePopup, true)
+  //       com.showPopup(position, feature, afterClosePopup, true)
-        let vectorLayer = new VectorLayer({
+  //       let vectorLayer = new VectorLayer({
-          source: new VectorSource(),
+  //         source: new VectorSource(),
-          style: mapUtil.getCommonStyle()
+  //         style: mapUtil.getCommonStyle()
-        })
+  //       })
-        let ifeature = new GeoJSON().readFeature(feature)
+  //       let ifeature = new GeoJSON().readFeature(feature)
-        if (ifeature) {
+  //       if (ifeature) {
-          vectorLayer.getSource().addFeature(ifeature)
+  //         vectorLayer.getSource().addFeature(ifeature)
-          this.view.addLayer(vectorLayer)
+  //         this.view.addLayer(vectorLayer)
-        }
+  //       }
-        // 关闭弹窗后
+  //       // 关闭弹窗后
-        function afterClosePopup() {
+  //       function afterClosePopup() {
-          vectorLayer.getSource().removeFeature(ifeature)
+  //         vectorLayer.getSource().removeFeature(ifeature)
-        }
+  //       }
-      }
+  //     }
-    })
+  //   })
-  }
+  // }
 
-  // 设置是否开启弹窗
+  // // 设置是否开启弹窗
-  setPopupSwitch(isopen) {
+  // setPopupSwitch(isopen) {
-    this.openPopupSwitch = isopen
+  //   this.openPopupSwitch = isopen
-  }
+  // }
-  // 加载图层
+  // // 加载图层
-  addLayers(layersSource) {
+  // addLayers(layersSource) {
-    new TF_Layer().createLayers(layersSource).then((layers) => {
+  //   new TF_Layer().createLayers(layersSource).then((layers) => {
-      layers.forEach((layer) => {
+  //     layers.forEach((layer) => {
-        layer && this.view.addLayer(layer)
+  //       layer && this.view.addLayer(layer)
-      })
+  //     })
-    })
+  //   })
-  }
+  // }
 
-  legendClick() {
+  // legendClick() {
-    this.legendHide = !this.legendHide
+  //   this.legendHide = !this.legendHide
-    var whichP = [
+  //   var whichP = [
-      ['收缩', 350, '▼'],
+  //     ['收缩', 350, '▼'],
-      ['展开', 0, '▲']
+  //     ['展开', 0, '▲']
-    ][this.legendHide ? 0 : 1]
+  //   ][this.legendHide ? 0 : 1]
-    //@ts-ignore
+  //   //@ts-ignore
-    this.$refs.legend_close.title = whichP[0]
+  //   this.$refs.legend_close.title = whichP[0]
-    //@ts-ignore
+  //   //@ts-ignore
-    this.$refs.legend.style.height = whichP[1] + 'px'
+  //   this.$refs.legend.style.height = whichP[1] + 'px'
-    //@ts-ignore
+  //   //@ts-ignore
-    this.$refs.legend_close.innerHTML = whichP[2]
+  //   this.$refs.legend_close.innerHTML = whichP[2]
-  }
+  // }
 
-  // 定位某条管线
+  // // 定位某条管线
-  setPipesView(pipes) {
+  // setPipesView(pipes) {
-    let coors = pipes || [
+  //   let coors = pipes || [
-      [113.14459646427814, 29.365111002105298],
+  //     [113.14459646427814, 29.365111002105298],
-      [113.14462310850658, 29.36565173168358]
+  //     [113.14462310850658, 29.36565173168358]
-    ]
+  //   ]
-    let feature = new Feature({ geometry: new LineString(coors) })
+  //   let feature = new Feature({ geometry: new LineString(coors) })
-    if (!this.vectorLayer) {
+  //   if (!this.vectorLayer) {
-      this.vectorLayer = new VectorLayer({
+  //     this.vectorLayer = new VectorLayer({
-        source: new VectorSource(),
+  //       source: new VectorSource(),
-        style: comSymbol.getAllStyle(3, 'f00', 5, '#00ffff', 'fff6')
+  //       style: comSymbol.getAllStyle(3, 'f00', 5, '#00ffff', 'fff6')
-      })
+  //     })
-      this.view.addLayer(this.vectorLayer)
+  //     this.view.addLayer(this.vectorLayer)
-    }
+  //   }
-    this.vectorLayer.getSource().clear()
+  //   this.vectorLayer.getSource().clear()
-    this.vectorLayer.getSource().addFeature(feature)
+  //   this.vectorLayer.getSource().addFeature(feature)
-    //
+  //   //
-    let extent = feature.getGeometry().getExtent()
+  //   let extent = feature.getGeometry().getExtent()
-    this.view.getView().setCenter([(extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2])
+  //   this.view.getView().setCenter([(extent[0] + extent[2]) / 2, (extent[1] + extent[3]) / 2])
-    this.view.getView().setZoom(20)
+  //   this.view.getView().setZoom(20)
-  }
+  // }
   // 清除地图
-  clearMap() {
+  // clearMap() {
-    this.vectorLayer.getSource().clear()
+  //   this.vectorLayer.getSource().clear()
-  }
+  // }
   // 根据 extent 查询 数据
-  queryForExtent(extent) {
+  // queryForExtent(extent) {
-    new mapUtil(this.view).queryForExtent(extent, this.vectorLayer)
+  //   new mapUtil(this.view).queryForExtent(extent, this.vectorLayer)
-  }
+  // }
   // 显示图例
-  showLegend(legendName, visible) {
+  // showLegend(legendName, visible) {
-    if (!legendName) return
+  //   if (!legendName) return
-    this.legendData = LegendConfig[legendName]
+  //   this.legendData = LegendConfig[legendName]
-    this.showMapLengend = visible
+  //   this.showMapLengend = visible
-  }
+  // }
-  legendChange() {
+  // legendChange() {
-    this.showLegendBox = !this.showLegendBox
+  //   this.showLegendBox = !this.showLegendBox
-    let dom: any = this.$refs.legendCloser
+  //   let dom: any = this.$refs.legendCloser
-    dom.innerHTML = this.showLegendBox ? '▼' : '▲'
+  //   dom.innerHTML = this.showLegendBox ? '▼' : '▲'
-  }
+  // }
 
-  closeAny() {
+  // closeAny() {
-    //@ts-ignore
+  //   //@ts-ignore
-    this.$refs.any.style.display = 'none'
+  //   this.$refs.any.style.display = 'none'
-  }
+  // }
-  initConfig() {
+  // initConfig() {
-    var resource = appconfig.gisResource['iserver_resource']
+  //   var resource = appconfig.gisResource['iserver_resource']
-    var nextDo = () => {
+  //   var nextDo = () => {
-      this.loadText = '地图加载中'
+  //     this.loadText = '地图加载中'
-      this.$nextTick(this.initMap)
+  //     this.$nextTick(this.initMap)
-    }
+  //   }
 
-    if (appconfig.isloadServer) {
+  //   if (appconfig.isloadServer) {
-      this.loadText = '服务加载中'
+  //     this.loadText = '服务加载中'
-      request({ url: '/base/sourcedic/getTreeService', method: 'get' }).then((res1) => {
+  //     request({ url: '/base/sourcedic/getTreeService', method: 'get' }).then((res1) => {
-        if (res1.code == 1) {
+  //       if (res1.code == 1) {
-          const res = res1.result
+  //         const res = res1.result
-          //通过访问天地图地址判断是否可以连接外网,先获取编码isOnlineAddress下的外网地址
+  //         //通过访问天地图地址判断是否可以连接外网,先获取编码isOnlineAddress下的外网地址
-          let onlineIndex = res.findIndex((item) => item.code == 'isOnlineAddress')
+  //         let onlineIndex = res.findIndex((item) => item.code == 'isOnlineAddress')
-          if (onlineIndex !== -1) {
+  //         if (onlineIndex !== -1) {
-            let isOnline = true
+  //           let isOnline = true
-            let onLineAddress = res[onlineIndex].child[0].cval
+  //           let onLineAddress = res[onlineIndex].child[0].cval
-            axios
+  //           axios
-              .get(onLineAddress)
+  //             .get(onLineAddress)
-              .then(
+  //             .then(
-                (res) => {
+  //               (res) => {
-                  isOnline = res.status === 200
+  //                 isOnline = res.status === 200
-                },
+  //               },
-                (error) => {
+  //               (error) => {
-                  isOnline = false // 异常返回
+  //                 isOnline = false // 异常返回
-                }
+  //               }
-              )
+  //             )
-              .catch((e) => {
+  //             .catch((e) => {
-                isOnline = false //异常返回
+  //               isOnline = false //异常返回
-              })
+  //             })
-              .finally(() => {
+  //             .finally(() => {
-                // 服务配置名称
+  //               // 服务配置名称
-                const MAP_CONFIG = {
+  //               const MAP_CONFIG = {
-                  mapService: '地图配置服务',
+  //                 mapService: '地图配置服务',
-                  layerService: '图层服务',
+  //                 layerService: '图层服务',
-                  dataService: '数据服务',
+  //                 dataService: '数据服务',
-                  analysisService: '网络分析服务'
+  //                 analysisService: '网络分析服务'
-                }
+  //               }
-                // 需要替换的服务
+  //               // 需要替换的服务
-                const repItems = [
+  //               const repItems = [
-                  MAP_CONFIG.mapService,
+  //                 MAP_CONFIG.mapService,
-                  MAP_CONFIG.layerService,
+  //                 MAP_CONFIG.layerService,
-                  MAP_CONFIG.dataService,
+  //                 MAP_CONFIG.dataService,
-                  MAP_CONFIG.analysisService
+  //                 MAP_CONFIG.analysisService
-                ]
+  //               ]
-                res.forEach((service) => {
+  //               res.forEach((service) => {
-                  let resData = service.child,
+  //                 let resData = service.child,
-                    source = null
+  //                   source = null
-                  if (repItems.includes(service.name) && resData && resData.length !== 0) {
+  //                 if (repItems.includes(service.name) && resData && resData.length !== 0) {
-                    if (service.name === MAP_CONFIG.layerService) {
+  //                   if (service.name === MAP_CONFIG.layerService) {
-                      source = resource.layerService.layers
+  //                     source = resource.layerService.layers
-                      console.log('图层服务配置')
+  //                     console.log('图层服务配置')
-                      resData.forEach((data) => {
+  //                     resData.forEach((data) => {
-                        let findItem = source.find((sourceItem) => {
+  //                       let findItem = source.find((sourceItem) => {
-                          if (sourceItem.name.includes('底图')) {
+  //                         if (sourceItem.name.includes('底图')) {
-                            return data.name === (isOnline ? sourceItem.name : '离线' + sourceItem.name)
+  //                           return data.name === (isOnline ? sourceItem.name : '离线' + sourceItem.name)
-                          } else {
+  //                         } else {
-                            return data.name === sourceItem.name
+  //                           return data.name === sourceItem.name
-                          }
+  //                         }
-                        })
+  //                       })
-                        if (findItem) {
+  //                       if (findItem) {
-                          findItem.url = data.cval
+  //                         findItem.url = data.cval
-                        }
+  //                       }
-                      })
+  //                     })
-                    } else if (service.name === MAP_CONFIG.mapService) {
+  //                   } else if (service.name === MAP_CONFIG.mapService) {
-                      source = appconfig
+  //                     source = appconfig
-                      resData.forEach((item) => {
+  //                     resData.forEach((item) => {
-                        if (item.ckey === 'center') {
+  //                       if (item.ckey === 'center') {
-                          source.initCenter = item.cval.split(',')
+  //                         source.initCenter = item.cval.split(',')
-                        } else if (item.ckey === 'zoom') {
+  //                       } else if (item.ckey === 'zoom') {
-                          source.initZoom = item.cval
+  //                         source.initZoom = item.cval
-                        }
+  //                       }
-                      })
+  //                     })
-                    } else if (service.name === MAP_CONFIG.analysisService) {
+  //                   } else if (service.name === MAP_CONFIG.analysisService) {
-                      source = resource.netAnalysisService
+  //                     source = resource.netAnalysisService
-                      source.url = resData[0].cval
+  //                     source.url = resData[0].cval
-                    } else if (service.name === MAP_CONFIG.dataService) {
+  //                   } else if (service.name === MAP_CONFIG.dataService) {
-                      source = resource.dataService
+  //                     source = resource.dataService
-                      source.url = resData[0].cval
+  //                     source.url = resData[0].cval
-                    }
+  //                   }
-                  }
+  //                 }
-                })
+  //               })
-                nextDo()
+  //               nextDo()
-              })
+  //             })
-          }
+  //         }
-        } else this.$message('服务加载失败 启用默认服务配置')
+  //       } else this.$message('服务加载失败 启用默认服务配置')
-      })
+  //     })
-    } else nextDo()
+  //   } else nextDo()
-  }
+  // }
 
   /**
    * 根据权限控制地图四个角的工具栏的展示
    */
-  controlToolDisplay() {
+  // controlToolDisplay() {
-    //本功能必须在权限管理-系统管理-模块管理的系统新增中分配leftTopTool,leftBottomTool,rightTopTool,rightBottomTool四个类型
+  //   //本功能必须在权限管理-系统管理-模块管理的系统新增中分配leftTopTool,leftBottomTool,rightTopTool,rightBottomTool四个类型
-    //这四个类型分别对应地图工具栏的左上角,左下角,右上角,右下角
+  //   //这四个类型分别对应地图工具栏的左上角,左下角,右上角,右下角
-    //这四个工具栏不在左边的功能列表中展示（改设置在src\layout\components\Sidebar\index.vue中）
+  //   //这四个工具栏不在左边的功能列表中展示（改设置在src\layout\components\Sidebar\index.vue中）
-    if (this.$store.state && this.$store.state.routeSetting && this.$store.state.routeSetting.routes) {
+  //   if (this.$store.state && this.$store.state.routeSetting && this.$store.state.routeSetting.routes) {
-      const allModel = this.$store.state.routeSetting.dynamicRoutes['map'] //获取所有功能
+  //     const allModel = this.$store.state.routeSetting.dynamicRoutes['map'] //获取所有功能
-      if (!allModel) return
+  //     if (!allModel) return
-      /**工具栏识别的字符集合*/
+  //     /**工具栏识别的字符集合*/
-      const toolBoxList = ['leftTopTool', 'leftBottomTool', 'rightBottomTool', 'rightTopTool']
+  //     const toolBoxList = ['leftTopTool', 'leftBottomTool', 'rightBottomTool', 'rightTopTool']
-      const toolcomponentList = {
+  //     const toolcomponentList = {
-        leftTopTool,
+  //       leftTopTool,
-        leftBottomTool,
+  //       leftBottomTool,
-        rightTopTool,
+  //       rightTopTool,
-        rightBottomTool
+  //       rightBottomTool
-      }
+  //     }
-      //根据模块管理将组件注入
+  //     //根据模块管理将组件注入
-      allModel.forEach((item) => {
+  //     allModel.forEach((item) => {
-        let index = toolBoxList.findIndex((val) => {
+  //       let index = toolBoxList.findIndex((val) => {
-          return val == item.type
+  //         return val == item.type
-        })
+  //       })
-        if (index != -1) {
+  //       if (index != -1) {
-          this[item.type] = item || []
+  //         this[item.type] = item || []
-          let temp = this.getComponents(item.type)
+  //         let temp = this.getComponents(item.type)
-          temp.forEach((item2) => {
+  //         temp.forEach((item2) => {
-            toolcomponentList[item.type]['components'][item2.name] = item2.component
+  //           toolcomponentList[item.type]['components'][item2.name] = item2.component
-          })
+  //         })
-        }
+  //       }
-      })
+  //     })
-    }
+  //   }
-  }
+  // }
 
-  /**
+  // /**
-   * 获取指定层级下面的组件
+  //  * 获取指定层级下面的组件
-   * @param typeString 指定层级的名称
+  //  * @param typeString 指定层级的名称
-   * */
+  //  * */
-  getComponents(typeString) {
+  // getComponents(typeString) {
-    let temp = this.$store.state.routeSetting.addRoutes.find((val) => {
+  //   let temp = this.$store.state.routeSetting.addRoutes.find((val) => {
-      return val.name && val.name == typeString
+  //     return val.name && val.name == typeString
-    })
+  //   })
-    return temp.children || []
+  //   return temp.children || []
-  }
+  // }
 }
 </script>
 <style lang="scss" scoped>

tsconfig.json

@@ -37,7 +37,6 @@
     "src/**/*.vue",
     "tests/**/*.ts",
     "tests/**/*.tsx",
-    "src/api/APIs.js"
   ],
   "exclude": [
     "node_modules"