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

chenzeping

2021-03-29 181c63668c5d81002fa2dd4f5312318cf81f2180

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


 Conflicts:

	src/api/request.js

	src/components/BaseNav/PublicBounced/PublicBounced.vue

	src/components/flueGas/flueGas.js

	src/views/MapTemplate.vue

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -1,5 +1,5 @@
<template>
  <div class="public-bounced" v-draw v-show="flag">
  <div class="public-bounced" v-show="flag">
    <div class="public-bounced-title">
      <span>{{ displayContent.Name }}</span>
      <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,6 +7,8 @@
    <div class="public-bounced-content">
      <div class="public-bounced-content-left"></div>
      <div class="public-bounced-content-right"></div>
<!--      <span>内容</span>-->
      <popup-gas></popup-gas>
    </div>
  </div>
</template>
@@ -15,6 +17,7 @@

import '@/components/BaseNav/SolidWaste/directive'

import PopupGas from '@components/flueGas/popup-gas'
export default {
  name: 'PublicBounced',
  data () {
@@ -23,6 +26,9 @@
      flag: false
    }
  },
  components: {
    PopupGas
  },
  methods: {
    setData (data) {
      this.displayContent = data

 src/components/BaseNav/SolidWaste/SolidWaste.js

@@ -63,7 +63,7 @@
        // 点击 事件
        marker.on('click', (e) => {
          try {
            // console.log(e)
            console.log(e)
            this.EffectOfPulse(e.target.getLatLng())
            this.SolidWastePopup.setData(data[i])
            return this.SolidWastePopup.$el

 src/components/flueGas/GasComponents/GasTable.vue

@@ -34,11 +34,11 @@
.el-row {
  color: #00d0f9;
  .el-col{
    width: 240px;
    width: 200px;
    height: 28px;
    background-color: #243a55;
    border-radius: 0.05rem;
    margin: 5px;
    //margin: 5px;
    text-align: center;
    line-height: 28px;
  }

 src/components/flueGas/flueGas.js

@@ -35,8 +35,8 @@
    }
    for (let i = 0; i < data.length; i++) {
      // 经纬度 位置
      const positionX = data[i].positionX
      const positionY = data[i].positionY
      const positionX = data[i].Latitude
      const positionY = data[i].Longitude

      // 判断 经纬度位置信息是否存在
      // if (positionX != null && positionY != null) {
@@ -55,16 +55,16 @@
      // // 线
      // var polyline = this.L.polyline(latlngs, { color: 'red' }).addTo(this.map)
      // console.log(polyline)
      marker.bindPopup(() => {
        return this.FlueGasPopup.$el
      }, {
        className: 's-map-popup',
        minWidth: 1548,
        closeButton: true,
        autoClose: false
      })
      // marker.bindPopup(() => {
      //   return this.FlueGasPopup.$el
      // }, {
      //   className: 's-map-popup',
      //   minWidth: 1548,
      //   closeButton: true,
      //   autoClose: false
      // })
      // 划过出现 展示数据
      marker.bindTooltip(data[i].StoragePlaceName, {
      marker.bindTooltip(data[i].porltName, {
        permanent: true,
        offset: [0, -16],
        direction: 'top',
@@ -76,6 +76,8 @@
          // console.log(e)
          this.EffectOfPulse(e.target.getLatLng())
          this.FlueGasPopup.setData(data[i])
          // this.FlueGasPopup.setData(data[i])
          return this.FlueGasPopup.$el
        } catch (error) {
          console.log(error)
        }

 src/components/flueGas/popup-gas.vue

@@ -35,10 +35,10 @@
    }
  },
  methods: {
    setDate (data) {
      console.log(data)
      this.displayContent = data
    }
    // setDate (data) {
    //   console.log(data)
    //   this.displayContent = data
    // }
  }
}
</script>

 src/styles/theme-dark/variable.less

@@ -1,4 +1,4 @@
@import "../common/variable";
//@import "../common/variable";

/* 主题色
-------------------------- */

 src/views/MapTemplate.vue

@@ -19,6 +19,7 @@
    <el-button type="primary" @click="ChangeState" class="solid-waste">固废</el-button>
    <PublicBounced ref="PublicBounced"></PublicBounced>
    <el-button type="primary" @click="AddGasHelper" class="flue-gas">废气</el-button>
    <PublicBounced ref="PublicBounced"></PublicBounced>
  </div>
</template>

@@ -46,6 +47,7 @@
// // 公共展示数据
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'

// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
  name: 'MapTemplate',
  components: {