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

陈泽平

2021-05-18 13fbc433b66909d1e793bb9cf1dbfa8661b57d3e

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

 src/assets/css/map/map-panel-style.less

@@ -823,3 +823,8 @@
  width: 100%;
  height: 1.5rem;
}

.el-dialog__body{
  padding: 5px;
  color: #f2f2f2;
}

 src/components/emergency/index.vue

@@ -214,9 +214,6 @@
    /deep/ .el-dialog{
        width: 450px;
    }
    /deep/ .el-dialog__body{
        padding: 5px;
    }
    .panel-title{
        text-align: left;
        padding: 5px 0 0 0;

 src/components/message/index.vue

New file
@@ -0,0 +1,134 @@
<template>
    <div class="message">
        <el-tooltip :popper-class="'message-btn'" effect="dark" content="通知" placement="left">
            <div :class='["iconBtn",selectGroup === true  ? "active-button" : ""]' @click="changeSelectMouse" >
                <i class="icon el-icon-bell" ></i>
            </div>
        </el-tooltip>
        <el-dialog class="dialogMessage" :visible.sync="isShowMessage" title="通知" :modal="false" v-dialogDrag :before-close="handleClose">
            <p class="conclusion">
                总体概况：化集团总共有 <span>589</span> 个监测点，涉及 <span>44</span> 家企业。其中，<span>453</span> 个点排放达标，<span class="red">4</span> 个出现超标。
            </p>
            <ul class="detail">
                <li>废水报警数量：
                    <el-popover placement="bottom-end" trigger="click" popper-class="popovers" title="二级风险地块">
                        <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
                        <u slot="reference" style="color: #00ffff">22</u>
                    </el-popover>
                    个</li>
                <li>硫化氢高报数量：<span>3</span>个</li>
                <li>废气报警数量：<span>3</span>个</li>
                <li>可燃气高报数量：<span>3</span>个</li>
                <li>固废报警数量：<span>3</span>个</li>
                <li>应急处置事件数量：<span>3</span>个</li>
            </ul>
            <div class="footer">
                <el-button type="primary" size="mini" @click="btnForecastWarningDetails">预报警明细</el-button>
            </div>
        </el-dialog>
    </div>
</template>

<script>
//
import bus from '@/eventBus'
import Refinery from '@components/table/components/componented/refinery'
export default {
  name: 'index',
  components: {
    Refinery
  },
  data () {
    return {
      selectGroup: false,
      isShowMessage: false,
      tableHeader1: [
        { name: '企业名称', width: '140', propS: 'value1' },
        { name: '监测点名称', width: '140', propS: 'value2' },
        { name: '污染物', width: '140', propS: 'value3' },
        { name: '监测值', width: '140', propS: 'value4' },
        { name: '标准值', width: '140', propS: 'value5' },
        { name: '预警值', width: '140', propS: 'value6' },
        { name: '报警时间', width: '140', propS: 'value7' }
      ],
      tableContent1: [
        { value1: '天津石化', value2: '炼油化工排污水', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04：00' },
        { value1: '天津石化', value2: '炼油化工排污水', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04：00' },
        { value1: '天津石化', value2: '炼油化工排污水', value3: 'COD', value4: '30.07', value5: '35', value6: '30', value7: '2021-06-01 04：00' }
      ]
    }
  },
  mounted () {
    const that = this
    bus.$on('changeState', function (state) {
      if (state.num !== 6 && state.type) {
        that.selectGroup = false
      }
    })
  },
  methods: {
    changeSelectMouse () {
      this.selectGroup = !this.selectGroup
      this.isShowMessage = this.selectGroup
      if (this.selectGroup) {
        this.isShow = []
      } else {
        this.isShow = !this.isShow
        this.active = -1
      }
      const state = {
        type: this.selectGroup,
        num: 6
      }
      bus.$emit('changeState', state)
    },
    btnForecastWarningDetails () {
      bus.$emit('forecastWarningDetails', '')
    },
    handleClose (done) {
      this.selectGroup = false
      this.isShowMessage = false
    }
  }
}
</script>

<style scoped lang="less">
    .message{
        z-index: 2000;
        position: absolute;
        right: 0.14583rem;
        top: 0.11979rem;
        .dialogMessage{
            /deep/ .el-dialog{
                width: 30vw;
                left: 60%;
            }
            .conclusion{
                text-indent:2em;
                span{color: #95F204;}
                span.red{color: red}
            }
            .detail{
                display: flex;
                flex-wrap: wrap;
                margin-top: 5px;
                padding-top: 5px;
                border-top: 1px solid rgba(0, 255, 246, 0.14);
                border-bottom: 1px solid rgba(0, 255, 246, 0.14);
                >li{
                    width: 50%;
                    margin-bottom: 5px;q
                    cursor: pointer;
                    display: flex;
                    span{padding: 0 5px;color: #00fff6;cursor: pointer}
                }
            }
            .footer{
                padding-top: 5px;
                display: flex;
                justify-content: flex-end;
            }
        }
    }
</style>

 src/components/table/SummarySheet.vue

File was deleted

 src/components/table/components/IndexStatistics.vue

@@ -1,9 +1,5 @@
<template>
  <Public>
    <template v-slot:title>
      <span>{{ titleProp }}</span>
    </template>
    <template v-slot:publicTable>
  <div>
      <el-tabs v-model="activeName">
        <el-tab-pane label="指标统计" name="first">
          <el-table :data="tableData" :lock-scroll="true" class="scroll">
@@ -66,17 +62,13 @@
          </el-table>
        </el-tab-pane>
      </el-tabs>
    </template>
  </Public>
  </div>
</template>

<script>

import Public from '@components/table/Public'

export default {
  name: 'IndexStatistics',
  components: { Public },
  data () {
    return {
      titleProp: '',

 src/components/table/components/Warn.vue

@@ -1,9 +1,5 @@
<template>
  <Public>
    <template v-slot:title>
      <span>{{ titleProp }}</span>
    </template>
    <template v-slot:publicTable>
  <div>
      <el-tabs v-model="activeName">
        <el-tab-pane label="实时统计" name="first">
          <el-scrollbar style="width:100%">
@@ -149,14 +145,10 @@
          </el-table>
        </el-tab-pane>
      </el-tabs>
    </template>
  </Public>
  </div>
</template>

<script>

import Public from '@components/table/Public'

export default {
  data () {
    return {
@@ -193,7 +185,6 @@
      }]
    }
  },
  components: { Public },
  methods: {
    refsDatatitle (item) {
      this.titleProp = item

 src/components/table/components/componented/refinery.vue

@@ -17,23 +17,7 @@
  name: 'refinery',
  data () {
    return {
      tableData: [{
        date: '2016-05-02',
        name: '王小虎',
        address: ' 1518 弄'
      }, {
        date: '2016-05-04',
        name: '王小虎',
        address: ' 1517 弄'
      }, {
        date: '2016-05-01',
        name: '王小虎',
        address: ' 1519 弄'
      }, {
        date: '2016-05-03',
        name: '王小虎',
        address: ' 1516 弄'
      }]
      tableData: []
    }
  },
  props: {
@@ -49,6 +33,16 @@
        }
      }
    }
  },
  watch: {
    param: {
      tableContent (newValue, oldValue) {
        this.tableData = newValue
        console.log(newValue)
      },
      deep: true
    }

  }
}
</script>

 src/components/table/components/tabHandover.vue

@@ -1,22 +1,15 @@
<template>
  <Public>
    <template v-slot:title>
      <span>{{ titleProp }}</span>
    </template>
    <template v-slot:publicTable>
  <div>
      <el-tabs v-model="activeName" @tab-click="handleClick">
        <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
      </el-tabs>
      <div>
        <component :is="gcComp"></component>
      </div>
    </template>
  </Public>
  </div>
</template>

<script>

import Public from '@components/table/Public'

import WasteWater from '@components/table/components/WasteWater'
import SoilGroundwater from '@components/table/components/SoilGroundwater'
@@ -29,7 +22,6 @@
export default {
  name: 'tabHandover',
  components: {
    Public,
    WasteWater,
    // WasteGas,
    // SoilGroundwater,

 src/components/table/summarySheets.vue

@@ -1,12 +1,12 @@
<template>
  <div class="summary-sheets">
    <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="报表" placement="left">
      <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
      <div :class='["iconBtn",selectGroup ? "active-button" : ""]' @click="subtopicBtn" >
         <i class="el-icon-tickets icon"></i>
      </div>
    </el-tooltip>
    <transition name="animationChange">
        <div class="subtopic" v-if="subtopic">
        <div class="subtopic" v-show="selectGroup">
            <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="统计表" placement="bottom">
              <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
                  <!--  -->
@@ -67,11 +67,35 @@
      comp: Warn,
      warnVisible: false,
      companyVisible: false,
      subtopic: false
      selectGroup: false
    }
  },
  mounted () {
    const that = this
    // 监听是否点击了当前图标按钮
    bus.$on('changeState', function (state) {
      if (state.num !== 2 && state.type) {
        that.selectGroup = false
      }
    })
    // 外部调用 与报警弹框
    bus.$on('forecastWarningDetails', function (state) {
      that.showWarnDialog()
    })
    // 子组件事件控制当前变量
    this.$nextTick(() => {
      this.$refs.summarySheets.$on('closeDialog', () => {
        that.summaryVisible = false
      })
      this.$refs.warnDialog.$on('closeDialog', () => {
        that.warnVisible = false
      })
      this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
        that.companyVisible = false
      })
    })
  },
  methods: {

    closeBtn () {
      this.$refs.summarySheets.show()
      this.summaryVisible = true
@@ -85,32 +109,13 @@
      this.companyVisible = true
    },
    subtopicBtn () {
      this.subtopic = !this.subtopic
      this.selectGroup = !this.selectGroup
      const state = {
        type: this.subtopic,
        type: this.selectGroup,
        num: 2
      }
      bus.$emit('changeState', state)
    }
  },
  mounted () {
    const that = this
    bus.$on('changeState', function (state) {
      if (state.num !== 2 && state.type) {
        that.subtopic = false
      }
    })
    this.$nextTick(() => {
      this.$refs.summarySheets.$on('closeDialog', () => {
        that.summaryVisible = false
      })
      this.$refs.warnDialog.$on('closeDialog', () => {
        that.warnVisible = false
      })
      this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
        that.companyVisible = false
      })
    })
  }
}
</script>

 src/views/MapTemplate.vue

@@ -19,6 +19,7 @@
<!--        <PublicBounced ref="PublicBounced"></PublicBounced>-->
<!--            <ReportPopup></ReportPopup>-->
        <Emergency ref="Emergency"></Emergency>
        <Message></Message>
    </div>
</template>

@@ -29,8 +30,8 @@
import SgisLayerController from '@components/LayerController/LayerController'
import MonitorPanel from '@components/panel/RightSearchPanel'
// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
// import summarySheets from '@components/table/summarySheets.vue'
import SummarySheet from '@components/table/SummarySheet'
// import summarySheets from '@components/table/summarySheets.vue'SummarySheet
import SummarySheet from '@components/table/summarySheets'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
@@ -41,6 +42,7 @@
// import ReportPopup from '../components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup'
import Emergency from '@components/emergency/index'
import MapManager from '../components/helpers/MapManager'
import Message from '@components/message/index'

export default {
  name: 'MapTemplate',
@@ -55,7 +57,8 @@
    // summarySheets,
    SummarySheet,
    // PublicBounced,
    Emergency
    Emergency,
    Message
    // ReportPopup
  },
  data () {

 src/views/popup/Dialog.vue

@@ -1,9 +1,10 @@
<template>
    <el-dialog  v-dialogDrag
    <el-dialog
            v-dialogDrag
            :title="title"
            :visible.sync="centerDialogVisible"
            :modal="false"
            :close-on-click-modal="false"
            :close-on-click-modal="true"
             @close='closeDialog'
            center>
        <slot></slot>