Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-03-31 2c17820e9807507c5bcf111f2bf96bf9b1e077f6

Merge remote-tracking branch 'origin/develop' into develop

 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/EchartsTab.vue

@@ -4,10 +4,10 @@
    <div class="main">
      <div class="main-matter">
        <el-row type="flex" class="row-bg row-item-one" justify="space-around">
          <el-col :span="12">氮氧化物:{{ displayContent.Name }} 标准: 100</el-col>
          <el-col :span="12">二氧化硫:{{ displayContent.DeptSname }} 标准: 50</el-col>
          <el-col :span="12">烟尘:{{ displayContent.EmissTypeName }} 标准: 30</el-col>
          <el-col :span="12">废气流量:{{ displayContent.EmissTypeName }}</el-col>
          <el-col :span="6">氮氧化物:{{ displayContent.Name }} 标准: 100</el-col>
          <el-col :span="6">二氧化硫:{{ displayContent.DeptSname }} 标准: 50</el-col>
          <el-col :span="6">烟尘:{{ displayContent.EmissTypeName }} 标准: 30</el-col>
          <el-col :span="6">废气流量:{{ displayContent.EmissTypeName }}</el-col>
        </el-row>
      </div>
    </div>

 src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue

@@ -46,6 +46,7 @@
  .main-matter{
    font-size: 13px;
    font-weight: normal;
    padding: 10px 6px;
    border: 1px solid #396d83;
    .row-item-one{
      margin-bottom: 7px;

 src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue

@@ -12,8 +12,11 @@
</template>

<script>
// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
export default {
  name: 'GasTabs'
  name: 'GasTabs',
  components: {}
  // GasECharts
}
</script>


 src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue

@@ -28,11 +28,9 @@
  background-color: rgba(33, 41, 69,0.9);
}
.main {
  width: 100%;
  height: 100%;
  padding: 5px;
  border: 1px solid #396d83;
  padding: 6px;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    height: 100%;
    video {

 src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue

@@ -6,9 +6,8 @@
    <div class="border_corner border_corner_left_bottom"></div>
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <el-col class="main-video">
      <div class="main-video">
        <el-table
            border
            tooltip-effect="dark"
            :data="data"
        >
@@ -20,7 +19,7 @@
          <el-table-column prop="name" label="储存量"></el-table-column>
          <el-table-column prop="date" label="产生装置"></el-table-column>
        </el-table>
      </el-col>
      </div>
    </div>
  </div>
</template>
@@ -34,11 +33,11 @@
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙518区金沙江路'
        address: '上海市普陀区'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江区金沙'
        address: '上海市普陀区'
      }]
    }
  },
@@ -65,11 +64,12 @@
.main {
  width: 100%;
  height: 100%;

  //padding: 10px 6px;
  //border: 1px solid #396d83;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    height: 100%;
    min-height: 165px;

    video {
      width: 100%;

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -26,6 +26,7 @@
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
// import GasTabs from './GasComponents/GasTabs'

export default {
  name: 'PublicBounced',
@@ -95,6 +96,7 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    //align-items: center;
    justify-content: space-around;
    padding: 10px;

@@ -106,6 +108,7 @@

    .public-bounced-content-right {
      flex: 2;
      //width: 48%;
      height: 100%;
    }
  }

 src/components/LayerController/logic/WasteGas.js

@@ -11,6 +11,7 @@
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'

const mapApi = require('../../../api/mapApi').default
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
  /**
   * 返回marker对象数组
@@ -43,14 +44,23 @@

  this.bindTooltip = (layer) => {
    console.log(layer)
    return '测试废气'
    return '废气点'
  }

  this.clickListener = (e) => {
    console.log(e)
  this.clickListener = async (e) => {
    // console.log(e)
    this.animalService.pulseEffect(e.latlng)
    const dataValue = {
      StoragePlaceId: e.layer.options.test.StoragePlaceId
    }
    const result = await mapApi.GetWasteGas(dataValue)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setData(result)
    instance.$mount()
    document.body.appendChild(instance.$el)
  }
  // 不同类型图片封装
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {
    var effectOfChange
    if (ContrLevel === 1) {

 src/components/panel/ToolBoxPanel.vue

@@ -17,11 +17,11 @@
              v-model="isShow[index]"
          >
            <el-button slot="reference" class="el-button"
                       :class="active === index && checked? 'tools-panel-choose':''"
                       :class="active === index? 'tools-panel-choose':''"
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index && checked">{{ item.label }}</span>
              <span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>
            </el-button>
            <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
@@ -297,18 +297,25 @@
        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
      } else {
        if (this.checkbutton === -1) {
          this.checked = !this.checked
        } else {
          this.checked = true
        }
      // this.isShow[index] = !this.isShow[index]
      // this.isShow[index - 1] = !this.isShow[index - 1]
      // if (this.checkbutton === index) {
      //   this.checked = !this.checked
      //   this.Selecd = -1
      // } else {
      //   if (this.checkbutton === -1) {
      //     this.checked = !this.checked
      //   } else {
      //     this.checked = true
      //   }
      // }
      // this.checkbutton = index
      // console.log(this.isShow[index - 1])
      console.log(this.basemapList)
      for (let i = 0; i < this.isShow.length; i++) {
        this.isShow[i] = false
      }
      this.checkbutton = index
      this.isShow[index] = true
    },
    choiceItem (itemT, indexT) {
      this.Selecd = indexT
@@ -414,6 +421,7 @@
    },
    changeSelectMouse () {
      this.selectGroup = true
      this.isShow = []
    }
  }
}

 src/views/MapTemplate.vue

@@ -39,7 +39,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 底图业务js逻辑
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'

import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 公共展示数据
@@ -82,18 +82,6 @@
    })
  },
  methods: {
    ChangeState () {
      const data = {
        companyId: 3900100145,
        userCode: 'wenchun.deng',
        name: '',
        marginWarr: '',
        longDayWarr: ''
      }
      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
      AddSolidWaste.requestData(data)
      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
    },
    AddGasHelper () {
      const data = {
        companyId: 3900100145,