派生自 wuyushui/SewerAndRainNetwork

chenzeping
2021-03-31 be2210b41fbcd359aa10f49eebf69da01f311f2e
工具栏问题修改 弹框表格修改
3个文件已添加
5个文件已修改
43 ■■■■ 已修改文件
src/assets/images/map-pages/icon/toolbox/cross.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/map-pages/icon/toolbox/fullscreen.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/map-pages/icon/toolbox/vertical.png 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/PublicBounced.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/SolidWaste.js 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/ToolBoxPanel.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/map-pages/icon/toolbox/cross.png
src/assets/images/map-pages/icon/toolbox/fullscreen.png
src/assets/images/map-pages/icon/toolbox/vertical.png
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -30,6 +30,7 @@
.main {
  width: 100%;
  height: 100%;
  padding: 5px;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -34,11 +34,11 @@
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1518 弄'
        address: '上海市普陀区金沙518区金沙江路'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江路 1518 弄'
        address: '上海市普陀区金沙江区金沙'
      }]
    }
  },
src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
  <div class="public-bounced" v-if="flag">
  <div class="public-bounced" v-draw v-if="flag">
    <div class="public-bounced-title">
      <span>{{ displayContent.Name }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
src/components/LayerController/logic/SolidWaste.js
@@ -52,6 +52,8 @@
  this.clickListener = async (e) => {
    this.animalService.pulseEffect(e.latlng)
    // this.setPanTo(e.latlng, 200)
    console.log(e)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
@@ -59,11 +61,20 @@
    // console.log(result)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(result, 'gufei')
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setData(result, 'gufei')
  }
  // panTo
  // this.setPanTo = (pos, value) => {
  //   var position = pos
  //   position = this.map.latLngToLayerPoint(position)
  //   position.y += value
  //   position = this.map.layerPointToLatLng(position)
  //   this.map.flyTo(position)
  // }
  // 不同类型图片封装
  this.differentTypes = (judgeValue) => {
    var effectOfChange
src/components/panel/ToolBoxPanel.vue
@@ -9,14 +9,16 @@
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
          <el-popover
              trigger="manual"
              placement="bottom"
              trigger="click"
              :popper-class="'tools-panel-content'"
              v-for="(item,index) in menuList" :key="index"
              :width="item.index === '2'?230 : 150"
              v-model="isShow[index]"
          >
            <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
                       @click="changeChoose(index)">
            <el-button slot="reference" class="el-button"
                       :class="active === index && checked? 'tools-panel-choose':''"
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index && checked">{{ item.label }}</span>
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
// 下载
import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'
// 测量的方法
import Measure from '@/components/plugin/MeaSure'
@@ -90,7 +97,7 @@
  name: 'ToolBoxPanel',
  data () {
    return {
      isShow: false,
      isShow: [],
      currentBaseMapCode: 'tianditu_img',
      basemapList: [],
      selectGroup: false,
@@ -230,19 +237,19 @@
            {
              index: '4-1',
              label: '全屏',
              icon: '',
              icon: FullScreen,
              title: '全屏'
            },
            {
              index: '4-2',
              label: 'A4横向',
              icon: '',
              icon: cross,
              title: 'A4横向'
            },
            {
              index: '4-3',
              label: 'A4纵向',
              icon: '',
              icon: vertical,
              title: 'A4纵向'
            }
          ]
@@ -265,7 +272,6 @@
  methods: {
    updateBasemapList () {
      this.basemapList = this.basemapHelper.getBasemapList()
      console.log()
    },
    changeBasemap (itm) {
      this.active = -1
@@ -291,6 +297,7 @@
        this.drawLayer = this.L.layerGroup().addTo(this.map)
      }
      this.active = index
      this.isShow[index] = !this.isShow[index]
      if (this.checkbutton === index) {
        this.checked = !this.checked
        this.Selecd = -1