Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

zhangshuaibao

2021-03-25 2f3695cf0962c35021e6ad76495e7a38e7d3878d

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop


 Conflicts:

	src/views/MapTemplate.vue

 src/Sgis.js

@@ -16,13 +16,8 @@
import './components/plugin/Editable' // 标绘操作
import './components/plugin/MagicMarker' // 动画Marker
import './assets/css/map/magic.min.css' // 动画Marker css
import './components/BaseNav/Pulse'
import './components/BaseNav/Pulse.css'

// import WmtsSupport from '@components/plugin/wmts_plugins'
// import CanvasMarkers from '@components/plugin/CanvasMarkers'
// import FullScreen from '@components/plugin/FullScreen'
// import 'leaflet-canvas-markers'
import '@components/plugin/pulse/Pulse' // marker 外圈波
import '@components/plugin/pulse/Pulse.css' // marker 外圈波 css

let map = null
const L = window.L
@@ -30,18 +25,6 @@
  if (map != null) {
    map.remove()
  }

  // Leaflet扩展代码
  // Editable.init(L) // 图层编辑
  // PathDrag.init(L) // 路径拖拽
  // MagicMarker.init(L) // 动画Marker
  // WmtsSupport.init(L) // 扩展，使支持WMTS
  // CustomPopup.init(L) // 自定义弹出框
  // CanvasMarkers.init(L)// 画布图层
  // 全屏
  // FullScreen.init(L)
  // 下载
  // LeafletMeasurePath.init(L)
  DownLoad.init(L)

  map = L.map(div, MapConfig.mapOptions)
@@ -52,8 +35,6 @@

  window.map = map
  window.L = L

  // L.sgis = L.sgis || L

  initTileLayersHelper(map)


 src/assets/images/map-pages/basenav/solidwaste/gf_green.png

 src/assets/images/map-pages/basenav/solidwaste/voc.png

 src/components/BaseNav/SolidWaste/SolidContent.vue

File was renamed from src/components/BaseNav/SolidContent.vue
@@ -11,7 +11,7 @@

<script>

import SolidWasteTable from '@components/BaseNav/SolidWasteTable'
import SolidWasteTable from '@components/BaseNav/SolidWaste/SolidWasteTable'

export default {
  name: 'SolidContent',

 src/components/BaseNav/SolidWaste/SolidWaste.js

File was renamed from src/components/BaseNav/SolidWaste.js
@@ -1,7 +1,7 @@
import { requestSolidWaste } from '@/api/request'
// 展示图片
import defaultImg from '@components/BaseNav/magicMarker.png'
import Setting from '@components/BaseNav/voc.png'
import defaultImg from '@assets/images/map-pages/basenav/solidwaste/voc.png'
import Setting from '@assets/images/map-pages/basenav/solidwaste/gf_green.png'

// 底图业务展示点
class AddSolidWasteHelper {
@@ -132,8 +132,8 @@
      fillColor: ''
    })
    if (markers) {
      // markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
      // this.L.layerGroup(markers).addLayer(layerGroup)
      markers.push(this.L.marker(FinalPosition, { icon: pulsingIcon }))
      this.L.layerGroup(markers).addLayer(layerGroup)
    } else {
      const picGroupMarker = new this.L.FeatureGroup()
      this.L.marker(FinalPosition, { icon: pulsingIcon }).addTo(picGroupMarker)

 src/components/BaseNav/SolidWaste/SolidWasteTable.vue

 src/components/BaseNav/SolidWaste/directive.js

 src/components/BaseNav/SolidWasteExtend.js

File was deleted

 src/components/BaseNav/style.css

File was deleted

 src/components/plugin/pulse/Pulse.css

 src/components/plugin/pulse/Pulse.js

 src/main.js

@@ -21,7 +21,7 @@
Vue.use(ElementUI)
Vue.prototype.$cancels = []
Vue.prototype.L = L
// 注册指令7
// 注册指令
// registerDirectives(Vue)

// 注册echarts皮肤

 src/views/MapTemplate.vue

@@ -63,7 +63,6 @@
  },
  data () {
    return {
      // isShowBtn: false,
      map: null,
      lcServiceLayerVisible: false,
      basemapHelper: {},
@@ -119,7 +118,7 @@
      this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 初始化动态要素图层助手
      this.vectorLayerHelper.initVectorLayers(this.config)

      // this.ChangeState()
      this.ChangeState()

      this.saveMapStatus()
      // this.setMapObj(this.mapObj)