From e6ac09332e92782446152e1ba0e031196272edd1 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 16:19:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/WaterWasteSearch.vue | 108 +++++++++++++++-----------
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 2
src/components/panel/topicSearch/GasWasteSearch.vue | 15 +--
src/assets/css/map/map-panel-style.less | 6 -
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 16 +++-
src/components/panel/topicSearch/SolidWasteSearch.vue | 56 +++++++------
6 files changed, 114 insertions(+), 89 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 7f2e9ef..9a403a6 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -391,6 +391,7 @@
}
.el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+
text-align: center;
}
@@ -409,12 +410,9 @@
.el-table td, .el-table th.is-leaf {
font-size: 0.08rem;
}
-.el-table td, .el-table th.is-leaf {
- border-bottom: none;
-}
.el-table .warning-row {
- background: #27304d;
+ background: #28304d;
}
.el-table .success-row {
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTable.vue b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
index 4b610e3..1515187 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
@@ -13,7 +13,7 @@
<span></span>
<span></span>
<div class="main-table">
- <el-table :data="listData" style="width: 100%" height="255px" :row-class-name="tableRowClassName">
+ <el-table :data="listData" style="width: 100%" height="325px" :row-class-name="tableRowClassName">
<el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
:label="item.label" :show-overflow-tooltip="true"></el-table-column>
</el-table>
@@ -62,7 +62,7 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push(this.displayContentTable[0], {}, {})
+ this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
})
},
methods: {
@@ -100,8 +100,12 @@
// //border: 1px red solid;
// }
//}
-/deep/ .el-table td, .el-table th.is-leaf {
- border-bottom: none;
+/deep/ .el-table td {
+ border-bottom: none !important;
+}
+
+/deep/ .el-table th.is-leaf {
+ border-bottom: none !important;
}
/deep/ .el-table td {
@@ -109,6 +113,10 @@
line-height: 45px !important;
}
+/deep/ .el-table tbody tr:hover > td {
+ background: none !important
+}
+
.main {
position: relative;
background: rgba(33, 41, 69, 0.9);
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
index a01b178..ba844dd 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
@@ -88,7 +88,7 @@
line-height: 0.09rem;
padding: 0.03rem .5%;
}
- li:last-child {
+ .lastli {
visibility: hidden
}
}
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b390331..1e0ac3b 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -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)
}
}
}
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 676551d..76793a7 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,7 +15,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-radio-group v-model="form.type" class="levelOfRisk">
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
<span class="levelOfRisk-type">{{ item.name }}</span>
</el-radio>
@@ -115,47 +115,49 @@
key: 'length'
}]
}],
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
- ],
form: {
keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
// 鏁版嵁鐨勪紶閫�
- transferData: ''
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: []
}
},
methods: {
- setBounced (val) {
- const pos = [val.Latitude, val.Longitude]
- window.map.flyTo(pos, 11)
- },
- handlePipelineType (val) {
- this.solidWasteTypeOptions.forEach(item => {
- if (val === item.value) {
- this.handleSearch(item.value)
- }
- })
- },
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
console.log(result)
this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
+ handlePipelineType (val) {
+ this.solidWasteTypeOptions.forEach(item => {
+ if (val === item.value) {
+ this.handleSearch(item.value)
+ }
+ })
}
}
}
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 11992d8..edad7fb 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -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)
}
}
}
--
Gitblit v1.8.0