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

chenyabin

2021-04-07 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -33,7 +33,17 @@
            </el-option>
          </el-select>
        </el-form-item>
        <!--        <el-form-item label="风险级别" size="mini"></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-option
                v-for="item in enterpriseSubunitsTypeOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value">
            </el-option>
          </el-select>
        </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-group>
@@ -156,7 +166,7 @@
        { name: '正常', value: '2' },
        { name: '超标', value: '3' },
        { name: '异常', value: '4' },
        { name: '停产', value: '4' }
        { name: '停产', value: '5' }
      ]
    }
  },
@@ -182,6 +192,7 @@
    enterpriseSubunitsType (val) {

    },
    // 三级单位筛选
    async handleSearch () {
      const param = {
        pipelineType: this.form.pipelineType,