派生自 wuyushui/SewerAndRainNetwork

wangqi
2021-04-14 6d4e23a29f40b4739aa46436e5b703ecde4b39aa
table数据
4个文件已修改
137 ■■■■ 已修改文件
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/GasWasteSearch.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -335,7 +335,8 @@
        },
        grid: { // 网格
          top: '20%',
          left: '5%'
          left: '12%',
          bottom: '15%'
          // containLabel: true
        },
        legend: { // 图例
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -25,16 +25,6 @@
                        </span>
                    </div>
                </div>
<!--                <div>-->
<!--                    采样点数:-->
<!--                    <el-select v-model="formInline.region">-->
<!--                        <el-option label="0" value="0"></el-option>-->
<!--                        <el-option label="25" value="25"></el-option>-->
<!--                        <el-option label="50" value="50"></el-option>-->
<!--                        <el-option label="75" value="75"></el-option>-->
<!--                        <el-option label="100" value="100"></el-option>-->
<!--                    </el-select>-->
<!--                </div>-->
                <div class="detailbtn"  @click="onSubmit">查询</div>
                <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
             </div>
@@ -43,7 +33,6 @@
        <!-- 明细弹框 -->
        <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
@@ -143,7 +132,7 @@
  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()
    // this.onSubmit()
    // 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)
  },
  updated () {
@@ -346,7 +335,8 @@
        },
        grid: { // 网格
          top: '20%',
          left: '5%'
          left: '6%',
          bottom: '15%'
          // containLabel: true
        },
        legend: { // 图例
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -1,59 +1,52 @@
<template>
<!--  <el-table :data="tableData" style="width:730px" height="200px">-->
<!--    <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
<!--                     :label="item.label">-->
<!--       <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <el-table
      :data="tableData"
      style="width: 100%;height: 100%">
    <el-table-column
        prop="tableData.LabMonTime"
        prop="LabMonTime"
        label="检测时间">
    </el-table-column>
    <el-table-column
        label="氮氧化物">
      <el-table-column
          prop="tableData.MonItemId"
          prop="NOMonTime"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="NOEndTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="二氧化硫">
      <el-table-column
          prop="tableData.MonItemId"
          prop="SOMontime"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="SoEndTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="烟尘">
      <el-table-column
          prop="tableData.MonItemId"
          prop="MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="EndMonTime"
          label="标准值">
      </el-table-column>
    </el-table-column>
    <el-table-column
        label="黑度">
        label="非甲烷总烃">
      <el-table-column
          prop="tableData.MonItemId"
          prop="MonItemId"
          label="监测值">
      </el-table-column>
      <el-table-column
          prop="tableData.LabMonTime"
          prop="MonItemId"
          label="标准值">
      </el-table-column>
    </el-table-column>
@@ -65,71 +58,28 @@
  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: [{
        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'
      }]
    }
  },
  created () {
    this.$nextTick(() => {
      // this.$attrs.ManualData.forEach(item => {
      this.tableData = [...this.$attrs.ManualData]
      // })
      // this.tableData.LabMonTime = 100
      console.log(this.tableData)
    })
    // this.tableData = [...this.$attrs.ManualData]
    // console.log(this.tableData)
  }
}
src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,24 +97,18 @@
</template>
<script>
<<<<<<< HEAD
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
=======
// import WfsHelper from '@components/helpers/WfsHelper'
// import AjaxUtils from '@utils/AjaxUtils'
import mapApi from '@/api/mapApi'
// import WfsHelper from '@components/helpers/WfsHelper'
>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
export default {
  name: 'GasWasteSearch',
  data () {
    return {
      gdVisible: true,
      list: [],
<<<<<<< HEAD
=======
      // labelList: PipelineTypeOptions[0].labelList,
>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
      total: 0,
      inareaTypeOptions: [],
      enterpriseTypeOptions: [],