From b5db7d99041a1ea1dbd01c8c5d8f55eb36f7c71e Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期日, 30 五月 2021 15:45:25 +0800
Subject: [PATCH] 废水和废气查询修改
---
src/components/panel/RightSearchPanel.vue | 12 +-
src/components/LayerController/logic/WasteGas.js | 18 +++
src/api/host.js | 3
src/api/mapApi.js | 7 -
src/components/LayerController/logic/WasteWater.js | 13 +-
src/components/panel/topicSearch/WasteWaterSearch.vue | 86 +++++++++++----------
src/api/mapUrl.js | 10 +-
src/components/panel/topicSearch/WasteGasSearch.vue | 71 +++++++++++------
8 files changed, 129 insertions(+), 91 deletions(-)
diff --git a/src/api/host.js b/src/api/host.js
index 04d5a4f..919fce0 100644
--- a/src/api/host.js
+++ b/src/api/host.js
@@ -4,10 +4,11 @@
import { getSchemeHost } from '../utils/tools'
export const $HOST = getSchemeHost()
+// 鐜繚浜屾湡
+export const $HOSTII = 'http://10.246.162.140:8080'
// 绠＄嚎鍒嗘瀽-绾夸笂
// export const $HOSTANALYSE = 'http://xearth.cn:6202'
export const $HOSTANALYSE = 'http://10.238.235.179:6202'
-
// 绠＄嚎鍒嗘瀽-鏈湴
// export const $HOSTANALYSE = 'http://10.238.105.124:8089'
diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index 2897794..9654615 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -31,7 +31,7 @@
},
// 搴熸皵鐐瑰姞杞�
getWasteGas (data) {
- return axios.get(mapUrl.getWasteGas, data)
+ return axios.post(mapUrl.getWasteGas, qs.stringify(data), { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
},
// 搴熸皵鏄庣粏琛�
getWasteGasDetails (data) {
@@ -54,7 +54,7 @@
return axios.get(mapUrl.getWasteWaterMonitoringDetails, data)
},
// 搴熸按鏃ユ暟鎹拰灏忔椂鏁版嵁鍙婃槑缁嗚〃
- getQueryOnlineMonData (data, setHeaders) {
+ getQueryOnlineMonData (data) {
return axios.post(mapUrl.getQueryOnlineMonData, qs.stringify(data), { 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' })
},
// 搴熸按浜哄伐鏁版嵁
@@ -89,9 +89,6 @@
},
getSourcesPoll (data) {
return axios.get(mapUrl.getSourcesPoll, data)
- },
- getGovernEquipment (data) {
- return axios.get('/assets/governEquipment.json', data)
},
getEnvironmentRisk (data) {
return axios.get('/assets/environmentRisk.json', data)
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 4ce8883..3b36f17 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -1,7 +1,7 @@
/**
* 璇ユ枃浠堕厤缃帴鍙ｇ殑URL鍦板潃
*/
-import { $HOST, $HOSTANALYSE } from './host'
+import { $HOST, $HOSTII, $HOSTANALYSE } from './host'
export const GetUser = $HOST + '/user/getUser'
@@ -12,18 +12,18 @@
export const getSolidWasteSurveyDetail = $HOST + '/wasteSolid/getSolidWasteSurveyDetail'
// 搴熸皵
-export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
+export const getWasteGas = $HOSTII + '/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo'
export const getWasteGasDetails = $HOST + '/wasteGas/getWasteGasMonitoringDetails'
export const DataItems = $HOST + '/wasteGas/RTDB/DataItems' // 搴熸皵瀹炴椂鏁版嵁
export const getWasteGasMonData = $HOST + '/wasteGas/QueryOnlineMonData'
export const getWasteGasManualData = $HOST + '/wasteGas/QueryLabMonData'
// 搴熸按
-export const getWasteWater = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo' // 搴熸按鐐逛俊鎭�
+export const getWasteWater = $HOSTII + '/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo' // 搴熸按鐐逛俊鎭�
export const getWasteWaterMonitoring = $HOST + '/wasteWater/getWasteWaterMonitoring' // 搴熸按鐩戞祴鏁版嵁
export const getWasteWaterMonitoringDetails = $HOST + '/wasteWater/getWasteWaterMonitoringDetails' // 搴熸按鐩戞祴鏁版嵁鏄庣粏琛�
-export const getQueryOnlineMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
-export const getQueryLabMonData = 'http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/QueryLabMonData' // 浜哄伐鏁版嵁
+export const getQueryOnlineMonData = $HOSTII + '/EPInterface/DataService/EPMapService.asmx/QueryOnlineMonData' // 搴熸按鏃ユ暟鎹皬鏃舵暟鎹強鏄庣粏琛ㄦ暟鎹�
+export const getQueryLabMonData = $HOSTII + '/EPInterface/DataService/EPMapService.asmx/QueryLabMonData' // 浜哄伐鏁版嵁
export const getDataItems = $HOST + '/wasteWater/RTDB/DataItems' // 瀹炴椂鏁版嵁
// 鍏徃
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index b591f19..8a2fa53 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -26,10 +26,22 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteGas()
- // console.log(res)
+ const param = {
+ companyId: 3900100145, // 浼佷笟缂栫爜
+ id: '',
+ monType: 2, // 搴熸皵
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ const res = await mapApi.getWasteGas(param)
const data = res.Result.DataInfo || {}
- // console.log(data)
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 29658e1..01cd150 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -27,11 +27,11 @@
L: L,
layer: layer
})
- const res = await mapApi.getWasteWater({
- companyId: 3900100145, // 浼佷笟鍚嶇О
+ const param = {
+ companyId: 3900100145, // 浼佷笟缂栫爜
id: '',
- monType: 1, // 鍊间负1鏌ヨ搴熸按
- userCode: 'wenchun.deng', // 瑙掕壊鍚嶇О
+ monType: 1, // 搴熸按
+ userCode: 'wenchun.deng', // 鐢ㄦ埛鍚嶇О
monDuration: '',
epName: '',
secdDeptId: '',
@@ -40,7 +40,8 @@
dataFlag: '',
runStatus: '',
emissTypeId: ''
- })
+ }
+ const res = await mapApi.getWasteWater(param)
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
@@ -54,7 +55,7 @@
totransferData: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [35, 35],
+ iconSize: [30, 30],
iconAnchor: [15, 15]
})
})
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index e0b822c..2283ad0 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -53,8 +53,8 @@
import DischargeSearch from './topicSearch/DischargeSearch'
import { topicList } from '../../conf/Topic'
-import GasWasteSearch from '@components/panel/topicSearch/GasWasteSearch'
-import WaterWasteSearch from '@components/panel/topicSearch/WaterWasteSearch'
+import WasteGasSearch from '@components/panel/topicSearch/WasteGasSearch'
+import WasteWaterSearch from '@components/panel/topicSearch/WasteWaterSearch'
import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch'
import SewersSearch from '@components/panel/topicSearch/SewersSearch'
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
@@ -65,8 +65,8 @@
export default {
name: 'MonitorPanel',
components: {
- GasWasteSearch,
- WaterWasteSearch,
+ WasteGasSearch,
+ WasteWaterSearch,
SolidWasteSearch,
EnvRiskSearch,
DischargeSearch,
@@ -153,10 +153,10 @@
this.gcComp = DischargeSearch
break
case '搴熸按':
- this.gcComp = WaterWasteSearch
+ this.gcComp = WasteWaterSearch
break
case '搴熸皵':
- this.gcComp = GasWasteSearch
+ this.gcComp = WasteGasSearch
break
case '鍥哄簾':
this.gcComp = SolidWasteSearch
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/WasteGasSearch.vue
similarity index 78%
rename from src/components/panel/topicSearch/GasWasteSearch.vue
rename to src/components/panel/topicSearch/WasteGasSearch.vue
index 57b7faa..4ca1a8d 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/WasteGasSearch.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) {
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