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

wangqi

2021-04-07 c6cd6c7a9db14e889c35916f733fe41cc646ff66

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


 Conflicts:

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

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

@@ -37,13 +37,9 @@
  data () {
    return {
      watchData: [],
      dialogVisible: false
    }
  },
  methods: {
    drawChart: function () {
      const myChart = this.$echarts.init(this.$refs.main)
      const option = {
      dialogVisible: false,
      dataDate: [],
      options: {
        title: {
          // text: '折线图堆叠'
        },
@@ -123,7 +119,7 @@
        xAxis: {
          type: 'category',
          boundaryGap: false,
          data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周六'],
          axisLabel: { // x轴全部显示
            rotate: 20,
            interval: 0,
@@ -199,13 +195,22 @@
          }
        ]
      }
      myChart.setOption(option)
    }
  },
  methods: {
    drawChart: function () {
      const myChart = this.$echarts.init(this.$refs.main)
      myChart.setOption(this.options)
    }
  },
  mounted () {
    this.drawChart()
    const dataWatch = JSON.parse(JSON.stringify(this.$attrs))
    const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
    console.log(dataWatch)
    for (var i = 0; i < dataWatch.length; i++) {
      this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
    }
    console.log(this.dataDate)
  }
}
</script>
@@ -214,6 +219,7 @@
    .Infomation{
        margin-left: 10px;
    }

    .el-tag{
        height: 25px;
        line-height: 25px;
@@ -227,7 +233,7 @@
    .form-echrts{
      width: 100%;
      height: 100%;
      border-top: 1px solid #396d83;
      border: 1px solid #396d83;
      //margin: 10px 10px 10px 10px;
      .el-dialog-div{
        //height: 50vh!important;

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

@@ -5,9 +5,9 @@
        <div class="border_corner border_corner_left_bottom"></div>
        <div class="border_corner border_corner_right_bottom"></div>
        <ul class="tab">
            <li @click='tabTaggle("ECharts")'>实试数据</li>
            <li @click='tabTaggle("ECharts")'>实时数据</li>
            <li @click='tabTaggle("ECharts")'>小时数据</li>
            <li @click='tabTaggle("ECharts")'>日数据</li>
            <li @click='tabTaggle("ECharts")'>月数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
        </ul>
        <component :is="currentTab" v-bind="$attrs"></component>

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

@@ -38,7 +38,9 @@
  },
  mounted () {
    this.tableData = this.$attrs.getWasteGasDetails
    console.log(this.$attrs.getWasteGasDetails)
    // console.log(this.$attrs.getWasteGasDetails)
    this.tableData = this.$attrs.getWasteWaterMonitoringDetails
    console.log(this.$attrs.getWasteWaterMonitoringDetails)
  }
}


 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -11,7 +11,10 @@
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart>
                    <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                                  :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
                                  :getWasteWaterMonitoring="getWasteWaterMonitoring">
                    </public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">

 src/components/LayerController/logic/WasteWater.js

@@ -61,7 +61,7 @@
    const PublicBounced = window.Vue.extend(publicBounced)
    const instance = new PublicBounced()
    instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
    console.log(e.layer.options.test)
    // console.log(e.layer.options.test)
    instance.$mount()
    document.body.appendChild(instance.$el)
    this.setPanTo(e.latlng, 240)

 src/components/LayerController/modules/LcServiceLayerFilter.vue

@@ -103,7 +103,7 @@
        font-size: 13px;

        position: absolute;
        left: 2.5rem;
        left: 260px;
        z-index: 1000;
        height: 220px;
        top: 0;