From 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index c4691d5..90166ea 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/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,
--
Gitblit v1.8.0