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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/components/panel/topicSearch/WasteGasSearch.vue

File was renamed from src/components/panel/topicSearch/GasWasteSearch.vue
@@ -3,7 +3,7 @@
    <div class="panel-title">{{title}}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">
        <el-form-item label="区域：" size="mini" class="search-panel-item">
<!--        <el-form-item label="区域：" size="mini" class="search-panel-item">
          <el-select style="width: 100%"  v-model="form.areaVal" @change="areaType"  :popper-class="'select-down'">
            <el-option
                v-for="item in inareaTypeOptions"
@@ -12,7 +12,7 @@
                :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
        </el-form-item>-->
        <el-form-item label="企业名称：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseVal"  @change="enterpriseType" :popper-class="'select-down'">
            <el-option
@@ -23,8 +23,9 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="二级单位：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
        <el-form-item label="单位部门：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType"
                     :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
@@ -33,10 +34,11 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="三级单位：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
        <el-form-item label="控制级别：" size="mini">
          <el-select style="width: 100%"  v-model="form.enterpriseLevelVal"  @change="enterpriseLevelType"
                     :popper-class="'select-down'">
            <el-option
                v-for="item in enterpriseSubunitsTypeOptions"
                v-for="item in enterpriseLevelTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
@@ -45,7 +47,9 @@
        </el-form-item>
<!--        <el-form-item label="风险级别" size="mini"></el-form-item>-->
        <el-radio-group v-model="form.type" class="levelOfRisk">
          <el-radio  v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
          <el-radio  v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
            <span class="levelOfRisk-type">{{item.name}}</span>
          </el-radio>
        </el-radio-group>
        <!--              <el-form-item >-->
        <div class="page_total">
@@ -74,8 +78,7 @@
        <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
        <div>
          <h3>{{ item.Name }}</h3>
          <p>所属部门：<span>{{ item.porltName }}</span></p>
          <p>风险级别：<span>三级</span></p>
          <p>所属部门：<span>{{ item.DeptSname }}</span></p>
        </div>
      </div>

@@ -108,7 +111,7 @@
import { pulseEffect, setPanTo } from '../../../utils/utils'

export default {
  name: 'GasWasteSearch',
  name: 'WasteGasSearch',
  props: ['title'],
  data () {
    return {
@@ -117,23 +120,31 @@
      total: 0,
      // 分页
      pageSize: 10,
      current: 1,
      inareaTypeOptions: [],
      enterpriseTypeOptions: [],
      enterpriseSubunitsTypeOptions: [],
      enterpriseLevelTypeOptions: [
        { label: '国控', value: '1' },
        { label: '省控', value: '2' },
        { label: '市控', value: '3' },
        { label: '其他', value: '4' }
      ],
      form: {
        areaVal: '',
        enterpriseVal: '',
        enterpriseSubunitsVal: '',
        enterpriseLevelVal: '',
        type: ''
      },
      // pageSize: 10,
      // current: 1,
      levelOfRisk: [
        { name: '全部', value: '1' },
        { name: '正常', value: '2' },
        { name: '超标', value: '3' },
        { name: '异常', value: '4' },
        { name: '停产', value: '5' }
        { name: '预警', value: '4' },
        { name: '异常', value: '5' },
        { name: '缺失', value: '6' },
        { name: '停运', value: '7' }
      ]
    }
  },
@@ -144,13 +155,13 @@
      this.handleSearch()
    },
    // 区域筛选
    areaType (val) {
    /* areaType (val) {
      this.pipelineTypeOptions.forEach((itm) => {
        if (val === itm.value) {

        }
      })
    },
    }, */
    // 企业筛选
    enterpriseType (val) {
      this.dataTypeOptions.forEach((itm) => {
@@ -163,17 +174,29 @@
    enterpriseSubunitsType (val) {

    },
    // 三级单位筛选
    // 控制级别筛选
    enterpriseLevelType (val) {

    },

    async handleSearch () {
      const param = {
        pipelineType: this.form.pipelineType,
        dataType: this.form.dataType
        companyId: 3900100145, // 企业编码
        id: '',
        monType: 2, // 废气
        userCode: 'wenchun.deng', // 用户名称
        monDuration: '',
        epName: '',
        secdDeptId: '',
        contrLevel: '',
        dataStatus: '',
        dataFlag: '',
        runStatus: '',
        emissTypeId: ''
      }
      // console.log(param)
      const res = await mapApi.getWasteGas(param)
      // console.log(res)
      this.list = res.Result.DataInfo
      console.log(this.list)
      this.list = res.Result.DataInfo || {}
      this.total = this.list.length
    },
    // 弹窗展示
    async handleLocation (val) {