From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/WasteWaterSearch.vue | 86 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WasteWaterSearch.vue
similarity index 81%
rename from src/components/panel/topicSearch/WaterWasteSearch.vue
rename to src/components/panel/topicSearch/WasteWaterSearch.vue
index cb3343d..7d0df00 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WasteWaterSearch.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
@@ -13,7 +13,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'">
@@ -25,7 +25,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇鍗曚綅锛�" size="mini">
+ <el-form-item label="鍗曚綅閮ㄩ棬锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType"
:popper-class="'select-down'">
<el-option
@@ -36,11 +36,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"
+ <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">
@@ -77,11 +77,10 @@
<el-scrollbar style="height:264px">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
@click="handleLocation(item)"><!-- -->
- <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
+ <img src="../../../../public/assets/images/map/wastewater/fs_bright_green.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>
@@ -114,7 +113,7 @@
import { pulseEffect, setPanTo } from '../../../utils/utils'
export default {
- name: 'WaterWasteSearch',
+ name: 'WasteWaterSearch',
props: ['title'],
data () {
return {
@@ -124,40 +123,33 @@
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: '1'
},
- // pageSize: 10,
- // current: 1,
isWaybillHover: true,
isRouteHover: false,
levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '瓒呮爣',
- value: '3'
- },
- {
- name: '寮傚父',
- value: '4'
- },
- {
- name: '鍋滀骇',
- value: '5'
- }
+ { name: '鍏ㄩ儴', value: '1' },
+ { name: '姝ｅ父', value: '2' },
+ { name: '瓒呮爣', value: '3' },
+ { name: '棰勮', value: '4' },
+ { name: '寮傚父', value: '5' },
+ { name: '缂哄け', value: '6' },
+ { name: '鍋滆繍', value: '7' }
]
}
},
@@ -168,13 +160,13 @@
this.handleSearch()
},
// 鍖哄煙绛涢��
- areaType (val) {
+ /* areaType (val) {
this.pipelineTypeOptions.forEach((itm) => {
if (val === itm.value) {
}
})
- },
+ }, */
// 浼佷笟绛涢��
enterpriseType (val) {
this.dataTypeOptions.forEach((itm) => {
@@ -187,17 +179,29 @@
enterpriseSubunitsType (val) {
},
- // 涓夌骇鍗曚綅绛涢��
+ // 鎺у埗绾у埆绛涢��
+ enterpriseLevelType (val) {
+
+ },
+
async handleSearch () {
const param = {
- pipelineType: this.form.pipelineType,
- dataType: this.form.dataType
+ companyId: 3900100145, // 浼佷笟缂栫爜
+ id: '',
+ monType: 1, // 搴熸按
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
}
- // console.log(param)
const res = await mapApi.getWasteWater(param)
- // console.log(res)
- this.list = res.Result.DataInfo
- console.log(this.list)
+ this.list = res.Result.DataInfo || {}
+ this.total = this.list.length
},
// 寮圭獥灞曠ず
handleLocation (val) {
--
Gitblit v1.8.0