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

chenzeping

2021-04-16 0cbf795f21d787db7d6b29a59d81579a7a736ab8

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

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue

@@ -57,6 +57,7 @@
</template>

<script>
import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'

@@ -150,6 +151,17 @@
    this.onSubmit()
  },
  methods: {
    async getWasteGasMonData () {
      const GasOnlinedata = {
        onLineMonEmissPointId: '23',
        monItemId: '28,31',
        beginTime: '2020-04-06 15:13:20',
        endTime: '2020-04-07 15:13:20',
        dataType: '1'
      }
      const data = await mapApi.getWasteGasMonData(GasOnlinedata)
      this.JsonDayCharts = data
    },
    onSubmit () {
      console.log('submit!')
      this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

@@ -37,7 +37,7 @@
                   center
                   v-dialogDrag
        >
            <div class="el-dialog-div" style="height: 500px">
            <div class="el-dialog-div">
                <public-detailed-list v-bind="$attrs"></public-detailed-list>
            </div>
        </el-dialog>
@@ -45,6 +45,7 @@
</template>

<script>
// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
export default {
@@ -517,6 +518,395 @@
        // createDivByMouse("s",params.event);
      }) */
    }
    // 废气按天查询小时数据
    // queryZDYDate_24 (id) {
    //   this.formInline.timeStart
    //   this.formInline.timeEnd
    //   // var date = $('#riqi_24').val()
    //   // if (date) {
    //   //   var date1 = new Date(date)
    //   //   date1 = new Date(date1.getTime() - (8 * 3600000))
    //   //   console(date1)
    //   //   var dateUtil = new DateUtil()
    //   //   var datePkg = dateUtil.getTowDate(date1, 'a', 24 * 3600000 - 1)
    //   // var dateTime1FullStr =
    //     var datatype = 2
    //     console(datePkg)
    //
    //     if (CFG_Model.production) {
    //       get24HourDate(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31,226', function (res) {
    //         // 处理数据开始
    //         var d = res
    //         var nameList = [] // 存放图例
    //         var dateList = [] // 存放时间
    //         var dataList = [] // 存放数据
    //         var bzh = [] // 标准值
    //         var data = []
    //         wrwIDS = []
    //         for (var i = 0; i < d.length; i++) {
    //           var MonTimeStr = d[i].MonTimeStr
    //
    //           // 20190430 add  获取监测点id 污染物id  检测项id
    //           getWRW(d[i])
    //
    //           var strDate
    //           var d1 = MonTimeStr.split('/')
    //           var d2 = d1[2].split(' ')
    //           var t = MonTimeStr.split(' ')
    //           var hlist = t[1].split(':')
    //           var h = hlist[0]
    //           if (d1[1] > 9) {
    //             //  strDate=MonTimeStr.substring(8,10)+"日";
    //             if (d2[0] > 9) {
    //               strDate = ''
    //               if (h > 9) {
    //                 strDate += MonTimeStr.substring(11, 13) + '时'
    //               } else {
    //                 strDate += MonTimeStr.substring(11, 12) + '时'
    //               }
    //             } else {
    //               strDate = ''
    //               if (h > 9) {
    //                 strDate += MonTimeStr.substring(10, 12) + '时'
    //               } else {
    //                 strDate += MonTimeStr.substring(10, 11) + '时'
    //               }
    //             }
    //           } else {
    //             if (d2[0] > 9) {
    //               strDate = ''
    //               if (h > 9) {
    //                 strDate += MonTimeStr.substring(10, 12) + '时'
    //               } else {
    //                 strDate += MonTimeStr.substring(10, 11) + '时'
    //               }
    //             } else {
    //               strDate = ''
    //               if (h > 9) {
    //                 strDate += MonTimeStr.substring(9, 11) + '时'
    //               } else {
    //                 strDate += MonTimeStr.substring(9, 10) + '时'
    //               }
    //             }
    //           }
    //
    //           if (nameList.length == 0) {
    //             nameList.push(d[i].PoltmtrlName.trim())
    //             dateList.push(strDate)
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //             bzh.push(d[i].StdValue)
    //           } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
    //             nameList.push(d[i].PoltmtrlName)
    //             bzh.push(d[i].StdValue)
    //             dataList.push(data)
    //             data = new Array()
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //           } else if (i == d.length - 1) {
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //             dataList.push(data)
    //           } else {
    //             if (dateList.indexOf(strDate) < 0) {
    //               dateList.push(strDate)
    //             }
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //           }
    //         }
    //         // 处理数据结束
    //
    //         // dateList=get24DateTime();
    //
    //         var newList = []
    //         for (var i = 0; i < dataList.length; i++) {
    //           var list = dataList[i].reverse()
    //           newList.push(list)
    //         }
    //         dataList = newList
    //
    //         var id = 'mychart'
    //         var title = '加热炉烟气'
    //         var lengList = []
    //         var objTemp
    //
    //         for (var l = 0; l < nameList.length; l++) {
    //           var obj
    //           var iconurl
    //           if (nameList[l] == '二氧化硫') {
    //             iconurl = 'image://../assets/imgs/legend/SO2.png'
    //           } else if (nameList[l] == '氮氧化物') {
    //             iconurl = 'image://../assets/imgs/legend/NOX.png'
    //           } else if (nameList[l] == '烟尘') {
    //             iconurl = 'image://../assets/imgs/legend/YanChen.png'
    //           } else if (nameList[l] == '非甲烷总烃') {
    //             iconurl = 'image://../assets/imgs/legend/grn.png'
    //           } else if (nameList[l] == '温度') {
    //             iconurl = 'image://../assets/imgs/legend/WenDu.png'
    //           } else {
    //             iconurl = 'image://../assets/imgs/legend/VOCs.png'
    //           }
    //
    //           if (nameList[l] == '废气' || nameList[l] == '废气流量') { // 将废气流量排到数组最后
    //             objTemp = {
    //               name: nameList[l],
    //               icon: iconurl,
    //               textStyle: {
    //                 color: '#ccc'
    //               },
    //               itemWidth: 20,
    //               itemHeight: 5
    //             }
    //           } else {
    //             obj = {
    //               name: nameList[l],
    //               icon: iconurl,
    //               textStyle: {
    //                 color: '#ccc'
    //               },
    //               itemWidth: 20,
    //               itemHeight: 5
    //             }
    //             lengList.push(obj)
    //           }
    //         }
    //         lengList.push(objTemp)
    //
    //         var legend = lengList
    //         var xdata = dateList.reverse()
    //         var ydatas = []
    //
    //         for (var j = 0; j < nameList.length; j++) {
    //           var zdcbcolor, zxcolor
    //           if (nameList[j] == '二氧化硫') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#fff21c'
    //           } else if (nameList[j] == '氮氧化物') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#00B0F0'
    //           } else if (nameList[j] == '烟尘') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#f48183'
    //           } else if (nameList[j] == '温度') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#F206FF'
    //           } else {
    //             zdcbcolor = 'red'
    //             zxcolor = '#9ACD32'
    //           }
    //           var ydata = {
    //             name: nameList[j],
    //             data: dataList[j],
    //             zdcbcolor: zdcbcolor,
    //             zxcolor: zxcolor,
    //             bzz: bzh[j]
    //           }
    //           exhbzz = {
    //             name: nameList[j],
    //             bzhui: bzh[j]
    //           }
    //           exhbzzList.push(exhbzz)
    //
    //           ydatas.push(ydata)
    //         }
    //
    //         var yname = '浓度(mg/m³)'
    //         CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
    //         console.log(123323)
    //         console.log(id, title, legend, xdata, ydatas, yname, id, datatype)
    //       })
    //     } else {
    //       get24HourDate1(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31', function (res) {
    //         // 处理数据开始
    //         var d = res
    //         var nameList = [] // 存放图例
    //         var dateList = [] // 存放时间
    //         var dataList = [] // 存放数据
    //         var bzh = [] // 标准值
    //         var data = []
    //         wrwIDS = []
    //         for (var i = 0; i < d.length; i++) {
    //           var MonTimeStr = d[i].MonTimeStr
    //
    //           // 20190430 add  获取监测点id 污染物id  检测项id
    //           getWRW(d[i])
    //
    //           var strDate
    //           var d1 = MonTimeStr.split('/')
    //           var t = MonTimeStr.split(' ')
    //           var hlist = t[1].split(':')
    //           var h = hlist[0]
    //           if (d1[1] > 9) {
    //             // strDate=MonTimeStr.substring(8,10)+"日";
    //             strDate = ''
    //             if (h > 9) {
    //               strDate += MonTimeStr.substring(11, 13) + '时'
    //             } else {
    //               strDate += MonTimeStr.substring(11, 12) + '时'
    //             }
    //           } else {
    //             // strDate=MonTimeStr.substring(7,9)+"日";
    //             strDate = ''
    //             if (h > 9) {
    //               strDate += MonTimeStr.substring(10, 12) + '时'
    //             } else {
    //               strDate += MonTimeStr.substring(10, 11) + '时'
    //             }
    //           }
    //
    //           if (nameList.length == 0) {
    //             nameList.push(d[i].PoltmtrlName.trim())
    //             dateList.push(strDate)
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //             bzh.push(d[i].StdValue)
    //           } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
    //             nameList.push(d[i].PoltmtrlName)
    //             bzh.push(d[i].StdValue)
    //             dataList.push(data)
    //             data = new Array()
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //           } else if (i == d.length - 1) {
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //             dataList.push(data)
    //           } else {
    //             if (dateList.indexOf(strDate) < 0) {
    //               dateList.push(strDate)
    //             }
    //             if ((d[i].PoltmtrlName == '废气流量' || d[i].PoltmtrlName == '废气') && d[i].MonQty < 0) {
    //               d[i].MonQty = 0
    //             }
    //             data.push(d[i].MonQty)
    //           }
    //         }
    //         // 处理数据结束
    //
    //         dateList = get24DateTime()
    //         dateList.reverse()
    //         var newList = []
    //
    //         for (var i = 0; i < dataList.length; i++) {
    //           var list = dataList[i].reverse()
    //           newList.push(list)
    //         }
    //         dataList = newList
    //
    //         var id = 'mychart'
    //         var title = '加热炉烟气'
    //         var lengList = []
    //         var objTemp
    //
    //         for (var l = 0; l < nameList.length; l++) {
    //           var obj
    //           var iconurl
    //           if (nameList[l] == '二氧化硫') {
    //             iconurl = 'image://../assets/imgs/legend/SO2.png'
    //           } else if (nameList[l] == '氮氧化物') {
    //             iconurl = 'image://../assets/imgs/legend/NOX.png'
    //           } else if (nameList[l] == '烟尘') {
    //             iconurl = 'image://../assets/imgs/legend/YanChen.png'
    //           } else if (nameList[l] == '非甲烷总烃') {
    //             iconurl = 'image://../assets/imgs/legend/grn.png'
    //           } else if (nameList[l] == '温度') {
    //             iconurl = 'image://../assets/imgs/legend/WenDu.png'
    //           } else {
    //             iconurl = 'image://../assets/imgs/legend/VOCs.png'
    //           }
    //
    //           if (nameList[l] == '废气' || nameList[l] == '废气流量') { // 将废气流量排到数组最后
    //             objTemp = {
    //               name: nameList[l],
    //               icon: iconurl,
    //               textStyle: {
    //                 color: '#ccc'
    //               },
    //               itemWidth: 20,
    //               itemHeight: 5
    //             }
    //           } else {
    //             obj = {
    //               name: nameList[l],
    //               icon: iconurl,
    //               textStyle: {
    //                 color: '#ccc'
    //               },
    //               itemWidth: 20,
    //               itemHeight: 5
    //             }
    //             lengList.push(obj)
    //           }
    //         }
    //         lengList.push(objTemp)
    //
    //         var legend = lengList
    //         var xdata = dateList.reverse()
    //         var ydatas = []
    //
    //         for (var j = 0; j < nameList.length; j++) {
    //           var zdcbcolor, zxcolor
    //           if (nameList[j] == '二氧化硫') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#fff21c'
    //           } else if (nameList[j] == '氮氧化物') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#00B0F0'
    //           } else if (nameList[j] == '烟尘') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#f48183'
    //           } else if (nameList[j] == '温度') {
    //             zdcbcolor = 'red'
    //             zxcolor = '#F206FF'
    //           } else {
    //             zdcbcolor = 'red'
    //             zxcolor = '#9ACD32'
    //           }
    //           var ydata = {
    //             name: nameList[j],
    //             data: dataList[j],
    //             zdcbcolor: zdcbcolor,
    //             zxcolor: zxcolor,
    //             bzz: bzh[j]
    //           }
    //           exhbzz = {
    //             name: nameList[j],
    //             bzhui: bzh[j]
    //           }
    //           exhbzzList.push(exhbzz)
    //           ydatas.push(ydata)
    //         }
    //
    //         var yname = '浓度(mg/m³)'
    //         CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
    //         onsole.log(id, title, legend, xdata, ydatas, yname, id, datatype)
    //       })
    //     }
    //     $('.btm span:nth-child(2)').empty()
    //     var html = '监测时间 （' + datePkg.dateTime1FullStr + ' 至 ' + datePkg.dateTime2FullStr + '）'
    //     $('.btm span:nth-child(2)').html(html)
    //
    //     fore24Time = datePkg.dateTime1FullStr
    //     back24Time = datePkg.dateTime2FullStr
    //   } else {
    //     alert('查询时间不能为空！')
    //   }
    // }
    // drawChart: function () {
    //   window.onresize = function () {
    //     var h1 = document.documentElement.clientHeight// 获取屏幕的高度

 src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue

@@ -31,7 +31,7 @@
    <el-table-column
        label="烟尘">
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="监测值">
      </el-table-column>
      <el-table-column
@@ -42,11 +42,11 @@
    <el-table-column
        label="非甲烷总烃">
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="MonItemId"
          prop="DataTypeName"
          label="标准值">
      </el-table-column>
    </el-table-column>
@@ -54,32 +54,19 @@
</template>

<script>
// import dayjs from 'dayjs'
export default {
  name: 'EChartsTable',
  data () {
    return {
      tableData: [{
        LabMonTime: '2021-02-05 09:54',
        MonItemId: '---',
        EndMonTime: '30',
        NOMonTime: '44',
        NOEndTime: '100',
        SOMontime: '9',
        SoEndTime: '50'
      }, {
        LabMonTime: '2021-01-14 10:15',
        MonItemId: '---',
        EndMonTime: '30',
        NOMonTime: '70',
        NOEndTime: '100',
        SOMontime: '---',
        SoEndTime: '50'
      }]
      tableData: []
    }
  },
  created () {
    // this.tableData = [...this.$attrs.ManualData]
    // console.log(this.tableData)
    this.$attrs.ManualData.forEach((item, index) => {
      this.tableData.push(item)
      this.tableData[index].LabMonTime = this.tableData[index].LabMonTime.replaceAll('T', ' ')
    })
  }
}


 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue

@@ -835,6 +835,7 @@
      }
      console.log(option)
      this.RealTimeChart.setOption(option)
      // this.IntervalEXHRealTimeDate()

      // this.RealTimeChart.on('legendselectchanged', function (params) {
      //   var StdVal = null
@@ -860,153 +861,153 @@
      //   var nowDate = new Date().Format()
      // })
    },
    getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
      if (this.res.length > 0) {
        // 处理数据开始
        var d = res
        var nameList = [] // 存放图例

        var data // 数据类型// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
        var datalist // 存放data的数组
        // var bzh = []
        for (var i = 0; i < d.length; i++) {
          if (d[i].ErrorMessage != null) {
            continue
          }
          // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName

          if (nameList.length === 0) {
            nameList.push(name)

            var newdate = new Date(this.res.ReadTime)
            data = {
              name: name,
              value: [newdate, this.res.TagValue]
            }

            datalist = {
              name: name,
              data: [data]
            }

            this.EXHRealTimeDataList.push(datalist)
          } else if (nameList.indexOf(name) < 0) {
            nameList.push(name)

            // var newdate = new Date(d[i].ReadTime)

            data = {
              name: name,
              value: [newdate, d[i].TagValue]
            }
            datalist = {
              name: name,
              data: [data]
            }
            this.EXHRealTimeDataList.push(datalist)
          } else if (i === d.length - 1) {
            if (nameList.indexOf(name) < 0) {
              nameList.push(name)

              // var newdate = new Date(d[i].ReadTime)

              data = {
                name: name,
                value: [newdate, d[i].TagValue]
              }
              datalist = {
                name: name,
                data: [data]
              }
              // EXHRealTimeDataList.push(datalist)
            } else {
              // var newdate = new Date(d[i].ReadTime)
              data = {
                name: name,
                value: [newdate, d[i].TagValue]
              }
              for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
                if (this.EXHRealTimeDataList[k].name === name) {
                  this.EXHRealTimeDataList[k].data.push(data)
                }
              }
            }
          } else {
            const newdate = new Date(d[i].ReadTime)
            data = {
              name: name,
              value: [newdate, d[i].TagValue]
            }
            for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
              if (this.EXHRealTimeDataList[k].name === name) {
                this.EXHRealTimeDataList[k].data.push(data)
              }
            }
          }
        }

        // var divid = 'mychart_ss'
        // var title = name
        var lengList = []
        var objTemp

        for (var l = 0; l < nameList.length; l++) {
          var obj
          var iconurl
          if (nameList[l] === '二氧化硫') {
            iconurl = 'image://../assets/imgs/legend/SO2.png'
          } else if (nameList[l] === '氮氧化物') {
            iconurl = 'image://../assets/imgs/legend/NOX.png'
          } else if (nameList[l] === '烟尘') {
            iconurl = 'image://../assets/imgs/legend/YanChen.png'
          } else if (nameList[l] === '非甲烷总烃') {
            iconurl = 'image://../assets/imgs/legend/grn.png'
          } else if (nameList[l] === '温度') {
            iconurl = 'image://../assets/imgs/legend/WenDu.png'
          } else {
            iconurl = 'image://../assets/imgs/legend/VOCs.png'
          }

          if (nameList[l] === '废气' || nameList[l] === '废气流量') { // 将废气流量排到数组最后
            objTemp = {
              name: nameList[l],
              icon: iconurl,
              textStyle: {
                color: '#ccc'
              },
              itemWidth: 20,
              itemHeight: 5
            }
          } else {
            obj = {
              name: nameList[l],
              icon: iconurl,
              textStyle: {
                color: '#ccc'
              },
              itemWidth: 20,
              itemHeight: 5
            }
            lengList.push(obj)
          }
        }
        lengList.push(objTemp)

        this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
      }
    },
    // getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
    //   if (this.res.length > 0) {
    //     // 处理数据开始
    //     var d = res
    //     var nameList = [] // 存放图例
    //
    //     var data // 数据类型// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
    //     var datalist // 存放data的数组
    //     // var bzh = []
    //     for (var i = 0; i < d.length; i++) {
    //       if (d[i].ErrorMessage != null) {
    //         continue
    //       }
    //       // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
    //
    //       if (nameList.length === 0) {
    //         nameList.push(name)
    //
    //         var newdate = new Date(this.res.ReadTime)
    //         data = {
    //           name: name,
    //           value: [newdate, this.res.TagValue]
    //         }
    //
    //         datalist = {
    //           name: name,
    //           data: [data]
    //         }
    //
    //         this.EXHRealTimeDataList.push(datalist)
    //       } else if (nameList.indexOf(name) < 0) {
    //         nameList.push(name)
    //
    //         // var newdate = new Date(d[i].ReadTime)
    //
    //         data = {
    //           name: name,
    //           value: [newdate, d[i].TagValue]
    //         }
    //         datalist = {
    //           name: name,
    //           data: [data]
    //         }
    //         this.EXHRealTimeDataList.push(datalist)
    //       } else if (i === d.length - 1) {
    //         if (nameList.indexOf(name) < 0) {
    //           nameList.push(name)
    //
    //           // var newdate = new Date(d[i].ReadTime)
    //
    //           data = {
    //             name: name,
    //             value: [newdate, d[i].TagValue]
    //           }
    //           datalist = {
    //             name: name,
    //             data: [data]
    //           }
    //           // EXHRealTimeDataList.push(datalist)
    //         } else {
    //           // var newdate = new Date(d[i].ReadTime)
    //           data = {
    //             name: name,
    //             value: [newdate, d[i].TagValue]
    //           }
    //           for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
    //             if (this.EXHRealTimeDataList[k].name === name) {
    //               this.EXHRealTimeDataList[k].data.push(data)
    //             }
    //           }
    //         }
    //       } else {
    //         const newdate = new Date(d[i].ReadTime)
    //         data = {
    //           name: name,
    //           value: [newdate, d[i].TagValue]
    //         }
    //         for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
    //           if (this.EXHRealTimeDataList[k].name === name) {
    //             this.EXHRealTimeDataList[k].data.push(data)
    //           }
    //         }
    //       }
    //     }
    //
    //     // var divid = 'mychart_ss'
    //     // var title = name
    //     var lengList = []
    //     var objTemp
    //
    //     for (var l = 0; l < nameList.length; l++) {
    //       var obj
    //       var iconurl
    //       if (nameList[l] === '二氧化硫') {
    //         iconurl = 'image://../assets/imgs/legend/SO2.png'
    //       } else if (nameList[l] === '氮氧化物') {
    //         iconurl = 'image://../assets/imgs/legend/NOX.png'
    //       } else if (nameList[l] === '烟尘') {
    //         iconurl = 'image://../assets/imgs/legend/YanChen.png'
    //       } else if (nameList[l] === '非甲烷总烃') {
    //         iconurl = 'image://../assets/imgs/legend/grn.png'
    //       } else if (nameList[l] === '温度') {
    //         iconurl = 'image://../assets/imgs/legend/WenDu.png'
    //       } else {
    //         iconurl = 'image://../assets/imgs/legend/VOCs.png'
    //       }
    //
    //       if (nameList[l] === '废气' || nameList[l] === '废气流量') { // 将废气流量排到数组最后
    //         objTemp = {
    //           name: nameList[l],
    //           icon: iconurl,
    //           textStyle: {
    //             color: '#ccc'
    //           },
    //           itemWidth: 20,
    //           itemHeight: 5
    //         }
    //       } else {
    //         obj = {
    //           name: nameList[l],
    //           icon: iconurl,
    //           textStyle: {
    //             color: '#ccc'
    //           },
    //           itemWidth: 20,
    //           itemHeight: 5
    //         }
    //         lengList.push(obj)
    //       }
    //     }
    //     lengList.push(objTemp)
    //
    //     this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
    //   }
    // },
    // 钩子调用实时
    IntervalEXHRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
    IntervalEXHRealTimeDate () {
      // 定时器函数
      this.interValHander = setInterval(function () {
      this.DrawEXHRealTimeDateChart()
      setInterval(function () {
        // $('.RealTime').empty()
        this.startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
        this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
        this.step = '15'
        // this.getRtdb15s(this.unionTagCodeList, this.startTime, this.endTime, this.step, this.res)
        // PreQueryTime=endTime;
        this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
        this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
        this.IntervalEXHRealTimeDate()
      }, 15000)
    }
  }

 src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue

@@ -1,6 +1,6 @@
<template>
  <div class="PublicDetailedList">
    <el-table :data="tableData" max-height="400px" border>
    <el-table :data="tableData" max-height="500px" border>
      <el-scrollbar style="height: 50vh">
      <el-table-column prop="OnLineMonEmissPointName" label="排放点"></el-table-column>
      <el-table-column prop="MonTimeStr" label="监测时间"></el-table-column>
@@ -31,6 +31,7 @@
</template>

<script>
// import mapApi from '@/api/mapApi'
export default {
  name: 'PublicDetailedList',
  data () {
@@ -38,16 +39,20 @@
      tableData: []
    }
  },
  mounted () {
  created () {
    // console.log(this.$attrs.value)
    if (this.$attrs.value === 'feiqi') {
      this.tableData = this.$attrs.getWasteGasDetails
      // console.log(this.$attrs.getWasteGasDetails)
    } else if (this.$attrs.value === 'feishui') {
      this.tableData = this.$attrs.getWasteWaterMonitoringDetails
      // console.log(this.$attrs.getWasteWaterMonitoringDetails)
    }
    this.tableData = this.$attrs.getWasteGasDetails
    // this.getWasteGasDetails()
    // console.log(this.tableData)
    // console.log(this.$attrs.getWasteGasDetails)
  }
  // methods: {
  //   async getWasteGasDetails () {
  //     const data = await mapApi.getWasteGasDetails
  //     this.tableData = data
  //     console.log(this.tableData)
  //   }
  // }
}

</script>

 src/components/BaseNav/SoilGroundwater/ReportTable.vue

New file
@@ -0,0 +1,181 @@
<template>
    <div class="waste-water">
        <el-table class="tableBox" :data="tableData" style="width: 100%" @cell-click="handle">
            <el-table-column width="30px" label="">
                <template slot-scope="{row,$index}">
                    <el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
                        <!--  <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater> -->
                        <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column label="序号" width="45px" type="index"></el-table-column>
            <el-table-column prop="UserName" label="企业名称" width="120px">
                <template slot-scope="scope">
                    <div v-if="scope.row.UserName==='集团名称'" style="color: #00ffff">{{scope.row.UserName}}</div>
                    <div v-else-if="scope.row.UserName==='天津石化'" style="color: #00ffff">{{scope.row.UserName}}</div>
                    <div v-else >{{scope.row.UserName}}</div>
                </template>
            </el-table-column>
            <el-table-column prop="normal" >
                <div slot="header">
                    <span>一级风险地块（个）</span>
                </div>
                <template slot-scope="{row,$index}">
                    <u v-if="$index!=2" >{{row.normal}}</u>
                    <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="监测点明细表">
                        <refinery></refinery>
                        <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="normal" >
                <div slot="header">
                    <span>二级风险地块（个）</span>
                </div>
                <template slot-scope="{row,$index}">
                    <u v-if="$index!=2" >{{row.normal}}</u>
                    <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="监测点明细表">
                        <refinery></refinery>
                        <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="normal" >
                <div slot="header">
                    <span>三级风险地块（个）</span>
                </div>
                <template slot-scope="{row,$index}">
                    <u v-if="$index!=2" >{{row.normal}}</u>
                    <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="监测点明细表">
                        <refinery></refinery>
                        <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="normal" >
                <div slot="header">
                    <span>土壤采样点（个）</span>
                </div>
                <template slot-scope="{row,$index}">
                    <u v-if="$index!=2" >{{row.normal}}</u>
                    <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="监测点明细表">
                        <refinery></refinery>
                        <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                </template>
            </el-table-column>
            <el-table-column prop="normal" >
                <div slot="header">
                    <span>地下水采样点（个）</span>
                </div>
                <template slot-scope="{row,$index}">
                    <u v-if="$index!=2" >{{row.normal}}</u>
                    <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="监测点明细表">
                        <refinery></refinery>
                        <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
                    </el-popover>
                </template>
            </el-table-column>
        </el-table>
    </div>
</template>

<script>
// import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
// import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
  name: 'WasteWater',
  components: {
    // MissingAlarm,
    Refinery
    // ChemicalWastewater
  },
  data () {
    return {
      isActive: '',
      isShowIcon: false,
      tableData: [{
        UserName: '集团名称',
        WasteWaters: '',
        AddOutPut: '',
        MonthOutPut: '',
        NH4NPut: '',
        NH4NMonth: '',
        normal: '',
        overProof: '',
        Abnormal: '',
        StopProduction: '',
        deficiency: ''
      }, {
        UserName: '天津石化',
        WasteWaters: '116.6',
        AddOutPut: '58.3',
        MonthOutPut: '13.1',
        NH4NPut: '58.3',
        NH4NMonth: '13.1',
        normal: '21',
        overProof: '2',
        Abnormal: '2',
        StopProduction: '2',
        deficiency: '2'
      }, {
        UserName: 'xxxx炼化3',
        WasteWaters: '116.6',
        MonthOutPut: '13.1',
        NH4NPut: '58.3',
        NH4NMonth: '13.1',
        normal: '21',
        overProof: '2',
        Abnormal: '2',
        StopProduction: '2',
        deficiency: '2'
      }, {
        UserName: 'xxxx4',
        WasteWaters: '116.6',
        AddOutPut: '58.3',
        MonthOutPut: '13.1',
        NH4NPut: '58.3',
        NH4NMonth: '13.1',
        normal: '21',
        overProof: '2',
        Abnormal: '2',
        StopProduction: '2',
        deficiency: '2'

      }]
    }
  },
  methods: {
    tableHeaderColor ({ row, column, owIndex, columnIndex }) {
      //  return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
    },
    // 表头样式设置
    rowClass  () {
      // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
    },
    // 获取点击的表格
    handle (row, column, event, cell) {
      console.log(row.UserName)
    },
    doIcon (index) {
      if (index !== 1) {
        this.isShowIcon = false
        this.isActive = ''
        return
      }
      this.isShowIcon = !this.isShowIcon
      if (index === this.isActive) {
        this.isActive = ''
        return
      }
      this.isActive = index
    }
  }
}
</script>

<style>

</style>

 src/components/LayerController/logic/WasteGas.js

@@ -87,7 +87,8 @@
    instance.$mount()
    document.body.appendChild(instance.$el)
    instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
    this.setPanTo(e.latlng, 80)
    this.setPanTo(e.latlng, 150)
    console.log(e.latlng)
  }
  // 不同类型图片加载
  this.differentTypes = (ContrLevel) => {

 src/components/layer/src/iframe.vue

File was deleted

 src/components/layer/src/layer.js

@@ -1,27 +1,12 @@
import layerVue from './layer.vue'
const Notification = function (Vue, globalOption = {
  msgtime: 1.5 // msg消失时间
}) {
  const NotificationConstructor = Vue.extend(layerVue)
const Layer = function (Vue) {
  const LayerVueExtend = Vue.extend(layerVue)
  const self = {}
  const defOptions = {
    type: 0, // 0（信息框，默认）1（页面层）2（iframe层）3（加载层）4（tips层）,5msg,6prompt
    title: '信息',
    content: '',
    area: 'auto',
    offset: 'auto',
    icon: -1,
    btn: '确定',
    time: 0,
    maxmin: false, // 最大最小化
    shade: true,
    yes: '',
    cancel: '',
    tips: [0, {}], // 支持上右下左四个方向，通过1-4进行方向设定,可以设定tips: [1, '#c00']
    tipsMore: false, // 是否允许多个tips
    shadeClose: true,
    scrollbar: true, // 是否允许浏览器出现滚动条:默认是允许
    resize: false // 是否允许拉伸，默认是不允许
    btn: '确定'
  }
  self.instances = {}
  self.instancesVue = []
@@ -34,17 +19,20 @@
   * @param  {[type]} options [description]
   * @return {[type]}         [description]
   */
  self.open = function (options) {
    options = mergeJson(options, defOptions)
  self.open = function (opt) {
    /* let option = {
      type: 1,
      content: opt.content,
      area: opt.area
    } */
    var options = mergeJson(opt, defOptions)
    const id = `notification_${new Date().getTime()}_${seed++}`
    options.id = id
    options.layer = self
    const instance = new NotificationConstructor({
    options.content.content = Vue.extend(options.content.content)
    const instance = new LayerVueExtend({
      data: options
    })
    if (options.type === 1) {
      options.content.content = Vue.extend(options.content.content)
    }
    instance.id = id
    instance.vm = instance.$mount()
    self.instances[id] = {
@@ -52,6 +40,7 @@
      type: options.type
    }
    document.body.appendChild(instance.vm.$el)
    instance.init()
    self.instancesVue[id] = {
      mask: '',
      main: instance.vm,
@@ -59,28 +48,15 @@
    }
    return id
  }
  /**
   * [description]
   * @param  {[type]} options [description]
   * @return {[type]}         [description]
   */
  self.iframe = function (opt) {
    let option = {
      type: 1,
      content: opt.content,
      area: opt.area
    }
    option = mergeJson(option, opt)
    console.log(option)
    return self.open(option)
  }

  /**
   * 关闭一个弹窗
   * @param  {[type]} id [description]
   * @return {[type]}    [description]
   */
  self.close = function (id) {
    const oElm = document.getElementById(id)
    console.log(id)
    const oElm = document.getElementById(id).parentElement
    if (oElm) {
      document.body.removeChild(oElm)
      delete self.instances[id]
@@ -192,4 +168,4 @@
}

// module.exports = Notification;
export default Notification
export default Layer

 src/components/layer/src/layer.vue

@@ -1,46 +1,114 @@
<template lang="html">
    <component :options="this.$data" :is="getActiveName"></component>
<template>
  <div class="public-bounced map-background" v-drag>
    <div class="public-bounced-title panel-title" ref="publicBounced">
      <span>{{title}}</span>
      <i class="el-icon-circle-close" @click="close"></i>
    </div>
    <div class="public-bounced-content" :id="id">
    </div>
  </div>
</template>

<script>
import pzpage from './page.vue'
import pziframe from './iframe.vue'
import helper from './helper/helper.js'

export default {
  data () {
    return {
      id: '',
      type: 0, // 0（alert默认）1（页面层）2（iframe层）3（loading）4（tips层）,5(msg),6(prompt)
      title: '信息',
      content: '',
      area: 'auto',
      offset: 'auto',
      icon: -1,
      btn: '确定',
      time: 0,
      shade: true,
      yes: '',
      cancel: ''
      cls: {
        'vl-notify-iframe': true
      },
      id: 'vlip' + new Date().getTime()
    }
  },
  props: {
    options: {
      type: Object,
      default: function () {
        return {}
      }
    }
  },
  computed: {
    getActiveName () {
      const comps = [
        'pzpage',
        'pziframe'
      ]
      return comps[this.$data.type]
    contentStyle () {
      return {
        height: 'calc(100% - 50px)', // parseInt(this.options.area[1]) - 50 + "px",
        minHeight: '20px',
        overflow: 'auto'
      }
    }
  },
  mounted () {},
  methods: {},
  watch: {},
  components: {
    pzpage,
    pziframe
  async mounted () {
    helper.hiddenScrollBar(this.options)
  },
  methods: {
    close () {
      this.layer.close(this.id)
    },
    init () {
      const propsData = helper.deepClone(this.content.content.data) || {}
      propsData.layerid = this.id
      propsData.lydata = this.content.data
      propsData.lyoption = this.options
      const instance = new this.content.content({
        // 具体参数信息，请参考vue源码
        parent: this.content.parent,
        propsData: propsData
      })
      instance.vm = instance.$mount()
      document.getElementById(this.id).appendChild(instance.vm.$el)
    }
  }
}
</script>

<style lang="less">
<style lang="less" scoped>
  .public-bounced {
    z-index: 2000;
    position: absolute;
    top: 35%;
    left: 20%;

  .public-bounced-title {
    cursor: move;
    height: 0.1rem;
    padding: 10px 0;
    display: flex;
    align-items: center;
    justify-content: space-between;

  span {
    color: #f4f7ff;
    margin: 0 15px;
    font-size: 14px;
  }

  i {
    color: #C0C4CC;
    margin: 0 15px;
    font-size: 22px;
    cursor: pointer;
  }

  i:hover {
    color: #00fff6;
  }
  }

  .public-bounced-content {
    padding: 0.1rem;
    display: flex;
  //align-items: center;
  //justify-content: space-around;

  .public-bounced-content-left {
  //width: 4.8rem;
  }

  .public-bounced-content-right {
  //width: 3rem;
    margin-left: 0.1rem;
  }
  }
  }
</style>

 src/components/layer/src/page.vue

File was deleted

 src/components/table/components/tabHandover.vue

@@ -23,6 +23,8 @@

<script>
import WasteWater from '@components/table/components/WasteWater'
import ReportTable from '../../../components/BaseNav/SoilGroundwater/ReportTable'

// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'
@@ -64,7 +66,7 @@
          this.gcComp = AirQuality
          break
        case '土壤及地下水':
          this.gcComp = AirQuality
          this.gcComp = ReportTable
          break
        case '管线':
          this.gcComp = AirQuality