~xingchuan/SewerAndRainNetwork.git

			@@ -64,7 +64,7 @@
			</el-form>
			</div>
			<el-scrollbar style="height:264px">
			<div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
			<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)"><!-- -->
			<i class="state"></i>
			<div>
			<h3>###炼化部</h3>
			@@ -165,16 +165,15 @@
			// const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
			const res = await mapApi.getWasteGas()
			console.log(res)
			if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
			this.list = res.data.features
			}
			this.list = res.Result.DataInfo
			// if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
			// this.list = res.data.features
			// }
			},
			handleLocation (val) {
			console.log(val)
			const bound = this.L.geoJSON([val], {}).getBounds()
			var layer = window.serviceLayerHelper.getByLayerId(val.id)
			layer && layer.openPopup()
			this.$store.state.map.map.flyToBounds(bound)
			const pos = [val.Latitude, val.Longitude]
			window.map.flyTo(pos, 17)
			}
			}
			}

			@@ -1,40 +1,44 @@
			<template>
			<div class="sewers-search" v-if="judgeVisible">
			<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 v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'：'" size="mini"
			class="search-panel-item">
			<el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
			:popper-class="'select-down'">
			<el-option
			v-for="item in solidWasteTypeOptions"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</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>
			<div class="rightButtonSearch">
			<el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
			<el-button class="el-icon-search" @click="handleSearch"></el-button>
			</div>
			</el-form>
			<div class="sewers-search" v-if="judgeVisible">
			<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 v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'：'" size="mini"
			class="search-panel-item">
			<el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
			:popper-class="'select-down'">
			<el-option
			v-for="item in solidWasteTypeOptions"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</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>
			<div class="rightButtonSearch">
			<el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
			<el-button class="el-icon-search" @click="handleSearch"></el-button>
			</div>
			<el-scrollbar style="height:264px">
			<div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
			<i class="state"></i>
			<div>
			<h3>###炼化部</h3>
			<p>所属部门：<span>炼化部</span></p>
			<p>风险级别：<span>三级</span></p>
			</div>
			</div>
			</el-scrollbar>
			</el-form>
			</div>
			<el-scrollbar style="height:264px">
			<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)">
			<!-- v-for="(item,index) in list" :key="index" -->
			<i class="state"></i>
			<div>
			<h3>###炼化部</h3>
			<p>所属部门：<span>炼化部</span></p>
			<p>风险级别：<span>三级</span></p>
			</div>
			</div>
			</el-scrollbar>
			</div>
			</template>

			<script>
			@@ -47,12 +51,28 @@
			data () {
			return {
			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'
			}
			],
			list: [],
			judgeVisible: true,
			solidWasteTypeOptions: [{
			value: '1',
			@@ -144,15 +164,13 @@
			// console.log(this.form.keyword)
			const result = await mapApi.getWasteWater()
			console.log(result)
			this.searchDataDisplay = result.Result.DataInfo
			this.list = result.Result.DataInfo
			this.total = result.Result.DataInfo.length
			},
			handleLocation (val) {
			// console.log(val)
			const bound = this.L.geoJSON([val], {}).getBounds()
			var layer = window.serviceLayerHelper.getByLayerId(val.id)
			layer && layer.openPopup()
			this.$store.state.map.map.flyToBounds(bound)
			console.log(val)
			const pos = [val.Latitude, val.Longitude]
			window.map.flyTo(pos, 17)
			}
			}
			}

	src/assets/css/map/map-panel-style.less	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/BaseNav/PublicBounced/common/PublicTabs.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/panel/topicSearch/GasWasteSearch.vue	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/panel/topicSearch/WaterWasteSearch.vue	108 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -391,6 +391,7 @@
			}

			.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {

			text-align: center;
			}

			@@ -411,7 +412,7 @@
			}

			.el-table .warning-row {
			background: #27304d;
			background: #28304d;
			}

			.el-table .success-row {

			@@ -88,7 +88,7 @@
			line-height: 0.09rem;
			padding: 0.03rem .5%;
			}
			li:last-child {
			.lastli {
			visibility: hidden
			}
			}