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

chenyabin

2021-03-31 2596ad89b4a57d2129f0a58cbc77d364eeaf412d

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

 src/api/request.js

@@ -9,7 +9,7 @@
  })
}
export const FlueGas = (data = {}) => {
  return $http.post('/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
  return $http.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
    headers: {
      'Content-Type': 'application/json'
    }

 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

@@ -1,20 +1,27 @@
<template>
  <div class="public-table">
    <el-col class="el-col">
      <el-table
          border
          tooltip-effect="dark"
          :data="data"
      >
        <el-table-column prop="name" label="序号"></el-table-column>
        <el-table-column prop="name" label="类别"></el-table-column>
        <el-table-column prop="date" label="固废名称"></el-table-column>
        <el-table-column prop="address" label="代码"></el-table-column>
        <el-table-column prop="address" label="产生量"></el-table-column>
        <el-table-column prop="name" label="储存量"></el-table-column>
        <el-table-column prop="date" label="产生装置"></el-table-column>
      </el-table>
    </el-col>
  <div class="win">
    <!-- 四个角的边框效果 -->
    <div class="border_corner border_corner_left_top"></div>
    <div class="border_corner border_corner_right_top"></div>
    <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">
        <el-table
            border
            tooltip-effect="dark"
            :data="data"
        >
          <el-table-column prop="name" label="序号"></el-table-column>
          <el-table-column prop="name" label="类别"></el-table-column>
          <el-table-column prop="date" label="固废名称"></el-table-column>
          <el-table-column prop="address" label="代码"></el-table-column>
          <el-table-column prop="address" label="产生量"></el-table-column>
          <el-table-column prop="name" label="储存量"></el-table-column>
          <el-table-column prop="date" label="产生装置"></el-table-column>
        </el-table>
      </el-col>
    </div>
  </div>
</template>

@@ -24,7 +31,15 @@
  props: ['requestSolidWasteData'],
  data () {
    return {
      data: []
      data: [{
        date: '2016-05-03',
        name: '王小虎',
        address: '上海市普陀区金沙518区金沙江路'
      }, {
        date: '2016-05-02',
        name: '王小虎',
        address: '上海市普陀区金沙江区金沙'
      }]
    }
  },
  mounted () {
@@ -42,7 +57,62 @@
</script>

<style lang="less" scoped>
.public-table {
.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
}

.main {
  width: 100%;
  height: 100%;

  .main-video {
    //border: 1px solid #396d83;
    width: 100%;
    height: 100%;

    video {
      width: 100%;
      height: 100%;
      outline: none;
    }
  }
}

.border_corner {
  z-index: 999;
  position: absolute;
  width: 14px;
  height: 14px;
  background: rgba(0, 0, 0, 0);
  border: 1.5px solid #47d5ea;
}

.border_corner_left_top {
  top: 0;
  left: 0;
  border-right: none;
  border-bottom: none;
}

.border_corner_right_top {
  top: 0;
  right: 0;
  border-left: none;
  border-bottom: none;
}

.border_corner_left_bottom {
  bottom: 0;
  left: 0;
  border-right: none;
  border-top: none;
}

.border_corner_right_bottom {
  bottom: 0;
  right: 0;
  border-left: none;
  border-top: none;
}
</style>

 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>
@@ -7,11 +7,10 @@
    <div class="public-bounced-content">
      <div class="public-bounced-content-left">
        <GasTab :displayContent="displayContent"></GasTab>
<!--        <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
        <GasECharts></GasECharts>
<!--        <GasTabs></GasTabs>-->
        <!--        <PublicTable></PublicTable>-->
        <!--        <GasECharts></GasECharts>-->
        <div class="public-bounced-content-left-bottom">
          <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
          <GasECharts v-else></GasECharts>
        </div>
      </div>
      <div class="public-bounced-content-right">
        <GasVideo></GasVideo>
@@ -24,17 +23,15 @@

import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
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',
  components: {
    // GasTabs,
    GasTab,
    // PublicTable,
    PublicTable,
    GasECharts,
    GasVideo
  },
@@ -98,7 +95,6 @@
  .public-bounced-content {
    margin: 15px auto;
    display: flex;
    //align-items: center;
    justify-content: space-around;
    padding: 10px;

@@ -110,7 +106,6 @@

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

 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