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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

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

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

@@ -160,9 +160,9 @@
      this.mychartDay.clear()
      var dataUnit = ''
      if (datatype === 1) {
        dataUnit = '气量(m³/d)'
        dataUnit = '废气气量(m³/d)'
      } else {
        dataUnit = '气量(m³/h)'
        dataUnit = '废气气量(m³/h)'
      }

      var serLists = []
@@ -304,12 +304,12 @@
              var seriesName = params[i].seriesName
              // 值
              var value = params[i].value
              var valueFliter
              if (value === 'NaN') {
                valueFliter = ''
              } else {
                // valueFliter = formatter(value)
              }
              // var valueFliter
              // if (value === 'NaN') {
              //   valueFliter = ''
              // } else {
              //   valueFliter = this.formatter(value)
              // }
              var maker = params[i].marker
              if (seriesName === '二氧化硫') {
                maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -322,7 +322,7 @@
              } else {
                maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
              }
              s += maker + seriesName + ':' + valueFliter + '<br />'
              s += maker + seriesName + ':' + value + '<br />'
            }
            return s
          }
@@ -734,6 +734,7 @@
                padding: 0;
                border:none;
                text-align: center;
              z-index: 9999;
                //padding-left:20px ;
                //padding: 0!important;
            }

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

@@ -15,7 +15,7 @@
                    <div class="pickerData">
                        <span> 开始时间:</span>
                        <span class="pickerTable">
                          <el-date-picker  type="datetime"  v-model="formInline.timeStart"></el-date-picker>
                          <el-date-picker  type="datetime"  v-model="formInline.timeStart" @click="pickerBtn"></el-date-picker>
                        </span>
                    </div>
                    <div class="pickerData">
@@ -54,16 +54,13 @@
  },
  data () {
    return {
      value1: '',
      value2: '',
      watchData: [],
      dialogVisible: false,
      myChar: null,
      value: '',
      formInline: {
        region: '',
        timeStart: '',
        timeEnd: ''
        timeStart: null,
        timeEnd: null
      },
      myChart: null,
      JsonCtarts: {
@@ -124,22 +121,23 @@
      }
    }
  },
  created () {
  },
  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.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 () {
    this.onSubmit()
  },
  methods: {
    pickerBtn () {
      this.formInline.timeEnd = ''
      this.formInline.timeStart = ''
      console.log(1)
    },
    onSubmit () {
      this.CreateChart()
      // console.log(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
      // 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)
    },
    CreateChart: function () {
    CreateChart () {
      // var id = this.JsonCtarts.id
      // var title = this.JsonCtarts.title
      var legend = this.JsonCtarts.legend
@@ -153,9 +151,9 @@
      this.myChart.clear()
      var dataUnit = ''
      if (datatype === 1) {
        dataUnit = '气量(m³/d)'
        dataUnit = '废气气量(m³/d)'
      } else {
        dataUnit = '气量(m³/h)'
        dataUnit = '废气气量(m³/h)'
      }

      var serLists = []
@@ -298,12 +296,11 @@
              var seriesName = params[i].seriesName
              // 值
              var value = params[i].value
              var valueFliter
              if (value === 'NaN') {
                valueFliter = ''
              }
              // else {
              //   // valueFliter = formatter(value)
              // var valueFliter
              // if (value === 'NaN') {
              //   valueFliter = ''
              // } else {
              //   valueFliter = this.formatter(value)
              // }
              var maker = params[i].marker
              if (seriesName === '二氧化硫') {
@@ -317,7 +314,7 @@
              } else {
                maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
              }
              s += maker + seriesName + ':' + valueFliter + '<br />'
              s += maker + seriesName + ':' + value + '<br />'
            }
            return s
          }
@@ -588,6 +585,7 @@
                height: 0.15rem;
                padding: 0;
                border:none;
              z-index: 9999;
                text-align: center;
                //padding-left:20px ;
                //padding: 0!important;

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

@@ -1,4 +1,4 @@
git<!--  小时数据  -->
<!--  小时数据  -->
<template>
    <div id="Tab">
        <div class="infomation">

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

@@ -6,7 +6,7 @@
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <div style="width: 755px">
  <div style="width: 5.9rem">
  <el-table
      :data="tableData"
      max-height="255px"
@@ -305,4 +305,7 @@
</script>

<style scoped>
.el-table--border::after, .el-table--group::after, .el-table::before{
  background: none;
}
</style>

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

@@ -811,7 +811,7 @@
          }
        }, { // 流量轴
          type: 'value',
          name: '流量(m3/h)',
          name: '废气流量(m3/h)',
          axisLabel: {
            formatter: '{value}',
            textStyle: {
@@ -1067,6 +1067,7 @@
      padding: 0;
      border-color:#00fff6;
      text-align: center;
      z-index: 9999;
      //padding-left:20px ;
      //padding: 0!important;
    }

 src/components/BaseNav/SolidWaste/directive/dir.js

File was deleted

 src/components/BaseNav/SolidWaste/directive/directive.js

File was deleted

 src/components/BaseNav/SolidWaste/directive/index.js

File was deleted

 src/components/BaseNav/WasteGas/flueGas.js

 src/components/BaseNav/WasteSolid/PublicTable.vue

New file
@@ -0,0 +1,166 @@
<template>
  <!--  <div class="react">-->
  <!--    <div class="main-table">-->
  <!--      <el-table :data="listData" style="width: 100%" height="255px" :row-class-name="tableRowClassName">-->
  <!--        <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"-->
  <!--                         :label="item.label" :show-overflow-tooltip="true"></el-table-column>-->
  <!--      </el-table>-->
  <!--    </div>-->
  <!--  </div>-->
  <div class="main">
    <span></span>
    <span></span>
    <span></span>
    <span></span>
    <div class="main-table">
      <el-table :data="listData" style="width: 100%" height="325px" :row-class-name="tableRowClassName">
        <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
                         :label="item.label" :show-overflow-tooltip="true"></el-table-column>
      </el-table>
    </div>
  </div>
</template>

<script>
export default {
  name: 'PublicTable',
  props: ['displayContentTable'],
  data () {
    return {
      listData: [],
      listLabel: [
        {
          label: '序号',
          prop: 'StoragePlaceId'
        },
        {
          label: '类别',
          prop: 'StoragePlaceTypeName'
        },
        {
          label: '固废名称',
          prop: 'StoragePlaceName'
        },
        {
          label: '代码',
          prop: 'StorageZDMJ'
        },
        {
          label: '产生量(t)',
          prop: 'StorageZCL'
        },
        {
          label: '贮存量(t)',
          prop: 'StorageZCNL'
        },
        {
          label: '产生装置',
          prop: 'StorageType'
        }
      ]
    }
  },
  mounted () {
    this.$nextTick(() => {
      this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
    })
  },
  methods: {
    // 隔行颜色设置
    tableRowClassName ({
      row,
      rowIndex
    }) {
      if (rowIndex % 2 === 0) {
        return 'warning-row'
      } else if (rowIndex % 2 === 1) {
        return 'success-row'
      }
      return ''
    }
  }
}
</script>

<style lang="less" scoped>
//.react {
//  position: relative;
//  background: rgba(33, 41, 69, 0.9);
//  background: linear-gradient(to left, #02a6b5, #02a6b5) left top no-repeat,
//  linear-gradient(to bottom, #02a6b5, #02a6b5) left top no-repeat,
//  linear-gradient(to left, #02a6b5, #02a6b5) right top no-repeat,
//  linear-gradient(to bottom, #02a6b5, #02a6b5) right top no-repeat,
//  linear-gradient(to left, #02a6b5, #02a6b5) left bottom no-repeat,
//  linear-gradient(to bottom, #02a6b5, #02a6b5) left bottom no-repeat,
//  linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat,
//  linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat;
//  background-size: 2px 20px, 20px 2px, 2px 20px, 20px 2px;
//
//  .main-table {
//    //border: 1px red solid;
//  }
//}
/deep/ .el-table td {
  border-bottom: none !important;
}

/deep/ .el-table th.is-leaf {
  border-bottom: none !important;
}

/deep/ .el-table td {
  height: 45px !important;
  line-height: 45px !important;
}

/deep/ .el-table tbody tr:hover > td {
  background: none !important
}

.main {
  position: relative;
  background: rgba(33, 41, 69, 0.9);
  //border: 1px solid red;
}

.main span:nth-child(1) {
  position: absolute;
  left: -1px;
  top: -1px;
  padding: 10px;
  border-style: solid;
  border-color: #02a6b5;
  border-width: 1px 0 0 1px;
}

.main span:nth-child(2) {
  position: absolute;
  right: -1px;
  top: -1px;
  padding: 10px;
  border-style: solid;
  border-color: #02a6b5;
  border-width: 1px 1px 0 0;
}

.main span:nth-child(3) {
  position: absolute;
  right: -1px;
  bottom: -1px;
  padding: 10px;
  border-style: solid;
  border-color: #02a6b5;
  border-width: 0 1px 1px 0;
}

.main span:nth-child(4) {
  position: absolute;
  left: -1px;
  bottom: -1px;
  padding: 10px;
  border-style: solid;
  border-color: #02a6b5;
  border-width: 0 0 1px 1px;
}

</style>

 src/components/BaseNav/WasteSolid/PublicTabs.vue

New file
@@ -0,0 +1,134 @@
<template>
  <!-- 框 -->
  <div class="win">
    <!-- 四个角的边框效果 -->
    <div class="border_corner border_corner_left_top"></div>
    <div class="border_corner border_corner_right_top"></div>
    <div class="border_corner border_corner_left_bottom"></div>
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <div class="main-matter">
        <div v-if="value === 'feiqi'">
          <ul>
            <li>监测点名称:{{ setWasteGasdata.Name }}</li>
            <li>生产单位:{{ setWasteGasdata.porltName }}</li>
            <li>排放类型名称:{{ setWasteGasdata.MonTypeName }}</li>
            <li>排放去向:{{ setWasteGasdata.EmissDirecti }}</li>
            <li>控制级别名称:{{ setWasteGasdata.ContrLevelShowName }}</li>
            <li>内/外排口:{{ setWasteGasdata.OrOutPortName }}</li>
          </ul>
        </div>
        <div v-if="value === 'gufei'">
          <ul>
            <li>场所名称:{{ setSolidWaste.StoragePlaceName }}</li>
            <li>贮存能力:{{ setSolidWaste.StorageQty }}(吨)</li>
            <li>剩余贮存能力:{{ setSolidWaste.SurplusFloorArea }}(吨)</li>
            <li>占地面积(㎡):{{ setSolidWaste.DesignFloorArea }}(㎡)</li>
            <li>最近贮存日期:{{ setSolidWaste.StorageDate }}</li>
            <li class="lastli"></li>
          </ul>
        </div>
        <div v-else-if="value === 'feishui'">
          <ul>
            <li>监测点名称:{{ setWasteWaterdata.Name }}</li>
            <li>生产单位:{{ setWasteWaterdata.porltName }}</li>
            <li>排放类型名称:{{ setWasteWaterdata.MonTypeName }}</li>
            <li>排放去向:{{ setWasteWaterdata.EmissDirecti }}</li>
            <li>控制级别名称:{{ setWasteWaterdata.ContrLevelShowName }}</li>
            <li>内/外排口:{{ setWasteWaterdata.OrOutPortName }}</li>
          </ul>
        </div>
      </div>
    </div>
  </div>
</template>

<script>
export default {
  name: 'GasTable',
  props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata']
}
</script>

<style scoped lang="less">

.win {
  position: relative;
  margin-bottom: 0.04rem;
  background-color: @background-color;
  //width: 6rem;
  //height: 0.5rem;
}

.main {
  //width: 100%;
  //height: 100%;

  .main-matter {
    font-size: 0.06rem;
    font-weight: normal;
    padding: 0.04rem 0;
    border: 1px solid #396d83;
    ul {
      //width: 100%;
      //height: 100%;
      display: flex;
      align-items: center;
      justify-content: space-around;
      flex-wrap: wrap;
      margin-bottom: -0.04rem;
      li {
        margin-bottom: 0.04rem;
        text-align: center;
        min-width: 31%;
        background-color: #243a55;
        color: #00d0f9;
        border-radius: 0.02rem;
        font-size: 0.08rem;
        line-height: 0.09rem;
        padding: 0.03rem .5%;
      }
      .lastli {
        visibility: hidden
      }
    }
  }
}

.border_corner {
  z-index: 999;
  position: absolute;
  width: 10px;
  height: 10px;
  background: rgba(0, 0, 0, 0);
  border: 1px solid #47d5ea;
}

.border_corner_left_top {
  top: 0;
  left: 0;
  border-right: none;
  border-bottom: none;
}

.border_corner_right_top {
  top: 0;
  right: 0;
  border-left: none;
  border-bottom: none;
}

.border_corner_left_bottom {
  bottom: 0;
  left: 0;
  border-right: none;
  border-top: none;
}

.border_corner_right_bottom {
  bottom: 0;
  right: 0;
  border-left: none;
  border-top: none;
}
</style>

 src/components/BaseNav/WasteSolid/PublicVideo.vue

New file
@@ -0,0 +1,80 @@
<template>
  <div class="win">
    <!-- 四个角的边框效果 -->
    <div class="border_corner border_corner_left_top"></div>
    <div class="border_corner border_corner_right_top"></div>
    <div class="border_corner border_corner_left_bottom"></div>
    <div class="border_corner border_corner_right_bottom"></div>
    <div class="main">
      <!--      <div class="main-video">-->
      <video controls>
        <source src="movie.mp4" type="video/mp4">
        <source src="movie.ogg" type="video/ogg">
      </video>
      <!--      </div>-->
    </div>
  </div>
</template>

<script>
export default {
  name: 'GasVideo'
}
</script>

<style scoped lang="less">
.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  //height: 2rem;

}

.main {
  border: 1px solid #396d83;
  width: 2.5rem;
  height: 2.5rem;
  video {
    width: 100%;
    height: 100%;
    outline: none;
  }
}

.border_corner {
  z-index: 999;
  position: absolute;
  width: 14px;
  height: 14px;
  background: rgba(0, 0, 0, 0);
  border: 1px solid #47d5ea;
}

.border_corner_left_top {
  top: 0;
  left: 0;
  border-right: none;
  border-bottom: none;
}

.border_corner_right_top {
  top: 0;
  right: 0;
  border-left: none;
  border-bottom: none;
}

.border_corner_left_bottom {
  bottom: 0;
  left: 0;
  border-right: none;
  border-top: none;
}

.border_corner_right_bottom {
  bottom: 0;
  right: 0;
  border-left: none;
  border-top: none;
}
</style>

 src/components/BaseNav/WasteSolid/SolidWaste.js

 src/components/BaseNav/WireSurface/index.js

File was deleted

 src/components/panel/topicSearch/WaterWasteSearch.vue

@@ -30,7 +30,8 @@
    <el-scrollbar style="height:264px">
      <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)">
        <!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
<!--        <i class="state"></i>-->
        <img src="../../../../public/assets/images/map/wastewater/fs_bright_green.png" alt="" class="state">
        <div>
          <h3>###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>

 src/components/table/summarySheets.vue

@@ -47,7 +47,9 @@
import Warn from './components/Warn'
import IndexStatistics from './components/IndexStatistics'

import '@/components/BaseNav/SolidWaste/directive/dir'
// import '@/components/BaseNav/SolidWaste/directive/dir'
// import '@/components/plugin/DialogDrag'

import bus from '@/eventBus'
export default {
  name: 'summary-sheet.vue',