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

wangqi

2021-04-14 2e0c26ba23e3b8ebdaed0b38e87526cce94bf215

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

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

@@ -48,6 +48,7 @@
}

.el-dialog {
  height: 500px;
  border: 0.00521rem solid @color;
  box-shadow: 0 0 0.03rem @color;
  background: rgba(0, 16, 30, 0.8);

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -61,6 +61,7 @@
  },
  destoryed () {
    this.$refs.PublicChart.$refs.Echats.CreateChart()
    this.$refs.PublicChart.$refs.Echats.effChartShow()
  },
  methods: {
    closePopup () {
@@ -85,12 +86,10 @@
      this.flag = true
      this.value = value
    },
    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
    setWaterData (dataWater, detailData, hourData, dateData, value) {
      this.setWasteWaterdata = dataWater
      // console.log(data)
      this.getQueryOnlineMonData = hourData
      // console.log(drawData)
      this.getWasteWaterMonitoringDetails = dataDetail
      this.getWasteWaterMonitoringDetails = detailData
      this.displayContentTitle = dataWater.Name
      this.flag = true
      this.value = value

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

@@ -51,6 +51,12 @@
    EChartsDateWasteWater,
    EChartsWasteWaterTable
  },
  mounted () {
    this.$refs.Echatrs.CreateChart()
  },
  updated () {
    this.$refs.Echats.CreateChart()
  },
  data () {
    return {
      currentTab: this.current(),
@@ -59,7 +65,7 @@
  },
  methods: {
    tabTaggle (taggleMenu, num) {
      this.currentTab = taggleMenu
      this.currentTab = this.current()
      this.active = num
      // debugger
    },

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

@@ -77,8 +77,8 @@
      formInline: {
        user: '',
        region: '',
        timeStart: '2021-03-14 00:00:00',
        timeEnd: '2021-04-12 00:00:00'
        timeStart: '2021-03-15 00:00:00',
        timeEnd: '2021-04-13 00:00:00'
      },
      JsonDateWater: {
        datatype: 1,
@@ -319,7 +319,8 @@
            grid: { // 网格
              top: '20%',
              left: '7%',
              bottom: '10%'
              bottom: '10%',
              right: '5%'
            },
            legend: {
              data: legend

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

@@ -124,11 +124,6 @@
      }
    }
  },
  created () {
    // this.$nextTick(() => {
    // this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
    // }
  },
  mounted () {
    this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
@@ -452,7 +447,7 @@
        }],
        series: serLists
      }
      console.log(option)
      // console.log(option)
      this.myChart.setOption(option)
      /*
      this.myChart.on('legendselectchanged', function (params) {

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

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

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

export default {
  name: 'ECharts',
@@ -78,8 +79,8 @@
      value: '',
      formInline: {
        region: '',
        timeStart: '2021-04-12 17:00:00',
        timeEnd: '2021-04-13 16:00:00'
        timeStart: '2021-04-12 10:00:00',
        timeEnd: '2021-04-13 09:00:00'
      },
      myChart: null,
      JsonHourWater: {
@@ -137,6 +138,11 @@
    }
  },
  mounted () {
    // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
    // this.onSubmit()
  },
  updated () {
    this.onSubmit()
  },
  methods: {
@@ -322,7 +328,8 @@
      grid: { // 网格
        top: '20%',
        left: '7%',
        bottom: '10%'
        bottom: '10%',
        right: '5%'
      },
      legend: {
        data: legend,
@@ -683,9 +690,7 @@
        }
    }
    .el-dialog-div {
        //height: 50vh!important;
        overflow: auto;
        //overflow: hidden;
    }

    #echarts {

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

@@ -249,16 +249,18 @@
    }
  },
  mounted () {
    // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    // this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
    // this.DrawEXHRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
    this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
    this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
    // console.log(this.formInline.timeStart)
    console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
    this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
  },
  methods: {
    onSubmit () {
      this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
    },
    DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
      this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
      this.RealTimeChart = this.$echarts.init(this.$refs.main)
      var serLists = []
      for (var i = 0; i < ydatas.length; i++) {
        // var zdcbcolor = ydatas[i].zdcbcolor
@@ -412,7 +414,8 @@
        grid: { // 网格
          top: '20%',
          left: '7%',
          bottom: '10%'
          bottom: '10%',
          right: '5%'
        },
        legend: {
          data: legend
@@ -489,7 +492,7 @@
          }
        }, {
          type: 'value',
          name: '流量(m³/h)',
          name: '流量(m³/d)',
          axisLabel: {
            formatter: '{value}',
            textStyle: {

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

@@ -6,58 +6,117 @@
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <div style="width: 755px">
  <el-table
      :data="tableData"
      max-height="255px"
      style="width: 100%;height: 100%">
    <el-table-column
        prop="tableData.LabMonTime"
        prop="date"
        width="130"
        label="检测时间">
    </el-table-column>
    <el-table-column
        label="BOD5">
      <el-table-column
          prop="codWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="codTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="COD">
      <el-table-column
          prop="tableData.MonItemId"
          prop="phWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="codTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="PH">
      <el-table-column
          prop="tableData.MonItemId"
          prop="bod5Watch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="BOD5">
      <el-table-column
          prop="tableData.MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="bod5Time"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="氨氮">
      <el-table-column
          prop="tableData.MonItemId"
          prop="adWatch"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="adTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="挥发酚">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="氟离子">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="硫化物">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="石油类">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
            label="悬浮物">
      <el-table-column
              prop="adWatch"
              label="监测值">
      </el-table-column>
      <el-table-column
              prop="adTime"
              label="标准值">
      </el-table-column>
    </el-table-column>
  </el-table>
  </div>
</template>

<script>
@@ -65,71 +124,181 @@
  name: 'EChartsTable',
  data () {
    return {
      // tableLabel: [
      //   {
      //     label: '检测时间',
      //     prop: 'StoragePlaceId'
      //   },
      //   {
      //     label: '二氧化硫',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '氮氧化物',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '烟尘',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   },
      //   {
      //     label: '黑度',
      //     prop: [
      //       {
      //         label: '监测值',
      //         NOMonitor: ''
      //       },
      //       {
      //         label: '标准值',
      //         NOtandard: ''
      //       }]
      //   }
      // ],
      tableData: []
      tableData: [{
        date: '2016-05-03 12:00:00',
        codWatch: '1',
        codTime: '-',
        phWatch: '1',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:00:15',
        codWatch: '-',
        codTime: '2',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '2',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:00:30',
        codWatch: '1',
        codTime: '2',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:01:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:01:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '2',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '1',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:02:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:02:30',
        codWatch: '-',
        codTime: '-',
        phWatch: '2',
        phTime: '-',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:03:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:03:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      },
      {
        date: '2016-05-03 12:04:15',
        codWatch: '-',
        codTime: '-',
        phWatch: '1',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '2'
      },
      {
        date: '2016-05-03 12:04:30',
        codWatch: '-',
        codTime: '1',
        phWatch: '2',
        phTime: '-',
        bod5Watch: '1',
        bod5Time: '-',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:05:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:05:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      },
      {
        date: '2016-05-03 12:06:15',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '-'
      },
      {
        date: '2016-05-03 12:06:30',
        codWatch: '1',
        codTime: '-',
        phWatch: '-',
        phTime: '-',
        bod5Watch: '-',
        bod5Time: '1',
        adWatch: '-',
        adTime: '1'
      }]
    }
  },
  created () {
    this.$nextTick(() => {
      this.$attrs.ManualData.forEach(item => {
        this.tableData = [...item]
      })
      this.tableData.LabMonTime = 100
      console.log(this.tableData)
    })
    // this.$nextTick(() => {
    //   this.$attrs.ManualData.forEach(item => {
    //     this.tableData = [...item]
    //   })
    //   this.tableData.LabMonTime = 100
    //   console.log(this.tableData)
    // })
  }
}


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

@@ -39,7 +39,7 @@
    }
  },
  mounted () {
    console.log(this.$attrs.value)
    // console.log(this.$attrs.value)
    if (this.$attrs.value === 'feiqi') {
      this.tableData = this.$attrs.getWasteGasDetails
      // console.log(this.$attrs.getWasteGasDetails)

 src/components/LayerController/logic/WasteWater.js

@@ -71,15 +71,13 @@
      endTime: '2020-04-07',
      dataType: '1'
    }
    const hourData = await mapApi.getQueryOnlineMonData(hourValue)
    const dateData = await mapApi.getQueryOnlineMonData(dateValue)
    // console.log(dateData)
    const detailData = await mapApi.getWasteWaterMonitoringDetails(dataValue) // 明细表返回数据
    const hourData = await mapApi.getQueryOnlineMonData(hourValue) // 小时数据
    const dateData = await mapApi.getQueryOnlineMonData(dateValue) // 日数据
    // const drawback = await mapApi.getWasteWaterMonitoring()
    // console.log(drawback)
    const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
    instance.setWaterData(e.layer.options.test, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
    // console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)

 src/components/panel/topicSearch/SolidWasteSearch.vue

@@ -152,26 +152,6 @@
      // console.log(this.form.keyword)
      const result = await mapApi.getSolidWaste(data)
      this.searchDataDisplay = result.Result.DataInfo
      // 循环遍历数据 根据进行marker 的创建
      for (let i = 0; i < this.searchDataDisplay.length; i++) {
        // 经纬度 位置
        const positionX = this.searchDataDisplay[i].Latitude
        const positionY = this.searchDataDisplay[i].Longitude

        // 定义类型 用来区分数据的不同 1.接口接口数据来进行数据的判断 2.根据数据类型的不同，进行不同类型的图片显示
        const judgeValue = this.searchDataDisplay[i].StorageQty
        var iconUrl = this.differentTypes(judgeValue)

        const marker = this.L.marker([positionX, positionY], {
          // totransferData: this.searchDataDisplay[i],
          icon: this.L.icon({
            iconUrl: iconUrl,
            iconSize: [30, 30],
            iconAnchor: [15, 15]
          })
        })
        this.layer.addLayer(marker)
      }
    },
    // 不同类型图片封装
    differentTypes (judgeValue) {
@@ -187,6 +167,26 @@
    async setBounced (val) {
      const pos = [val.Latitude, val.Longitude]
      window.map.flyTo(pos, 11)
      // 循环遍历数据 根据进行marker 的创建
      // for (let i = 0; i < this.searchDataDisplay.length; i++) {
      // 经纬度 位置
      const positionX = val.Latitude
      const positionY = val.Longitude

      // 定义类型 用来区分数据的不同 1.接口接口数据来进行数据的判断 2.根据数据类型的不同，进行不同类型的图片显示
      const judgeValue = val.StorageQty
      var iconUrl = this.differentTypes(judgeValue)

      const marker = this.L.marker([positionX, positionY], {
        // totransferData: this.searchDataDisplay[i],
        icon: this.L.icon({
          iconUrl: iconUrl,
          iconSize: [30, 30],
          iconAnchor: [15, 15]
        })
      })
      this.layer.addLayer(marker)
      // }
      const t1 = setTimeout(async () => {
        const dataValue = {
          StoragePlaceId: val.StoragePlaceId