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

chenyabin

2021-04-19 b765df07d1b732dad563712a49d0c0d810d940c9

 src/components/BaseNav/WasteWater/HourData.vue

@@ -45,28 +45,28 @@
            </div>
        </div>
        <!-- 明细弹框 -->
        <el-dialog :visible.sync="dialogVisible"
                   :append-to-body="true"
                   :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
                   width="68%"
                   center
                   v-dialogDrag
        >
            <div class="el-dialog-div" style="height: 500px">
                <public-detailed-list v-bind="$attrs"></public-detailed-list>
            </div>
        </el-dialog>
<!--        <el-dialog :visible.sync="dialogVisible"-->
<!--                   :append-to-body="true"-->
<!--                   :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
<!--                   width="68%"-->
<!--                   center-->
<!--                   v-dialogDrag-->
<!--        >-->
<!--            <div class="el-dialog-div" style="height: 500px">-->
<!--                <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
<!--            </div>-->
<!--        </el-dialog>-->
    </div>
</template>

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

export default {
  name: 'ECharts',
  components: {
    PublicDetailedList
    // PublicDetailedList
  },
  data () {
    return {