From 4ac5e561e4e3cefb18cd15a82f2268e4118c4a9f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 25 三月 2021 14:54:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/modules/LcBaseMap.vue | 3
src/components/panel/ToolBoxPanel.vue | 7
src/components/table/components/WasteGas.vue | 49 ++++++-
src/components/table/components/componented/MissingAlarm.vue | 6
src/components/table/components/componented/refinery.vue | 8
src/components/LayerController/modules/LcServiceLayer.vue | 240 ++++++++++++++++++++--------------------
6 files changed, 171 insertions(+), 142 deletions(-)
diff --git a/src/components/LayerController/modules/LcBaseMap.vue b/src/components/LayerController/modules/LcBaseMap.vue
index 3afc8d8..801148f 100644
--- a/src/components/LayerController/modules/LcBaseMap.vue
+++ b/src/components/LayerController/modules/LcBaseMap.vue
@@ -2,7 +2,7 @@
<div class="base-map-inner-panel" v-show="isShow">
<div style="display: flex;" v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" :src="item.conf.icon_actived" width="50" height="50" :title="item.name"
- @click="changeBasemap(item)"/>
+ @click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
label="鏍囨敞" @change="changeBasemap(item)">
</el-checkbox>
@@ -30,6 +30,7 @@
methods: {
updateBasemapList () {
this.basemapList = this.basemapHelper.getBasemapList()
+ console.log(this.basemapList)
},
changeBasemap (itm) {
const code = itm.code
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index fddacf6..4b9aa25 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,134 +1,134 @@
<template>
<div class="inner-panel">
- <div class="title">
- 鍥惧眰鎺у埗
- </div>
- <div class="wms-panel">
- <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
- <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
- @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)"
- class="btn-filter">杩囨护</span>
- </div>
- <div class="layerbox-item">
- <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
- :name="'wmsSublayers_'+item.code+'_'+itm.code"
- :checked="itm.checked"
- :value="itm.code"
- @change="swWmsLayer(item.url,itm)"/>{{
- itm.name }}
- </div>
- </div>
- </div>
- </div>
- <lc-service-layer-filter v-if="layerFilterVisible" ref="serviceLayerFilter"></lc-service-layer-filter>
+<!-- <div class="title">-->
+<!-- 鍥惧眰鎺у埗-->
+<!-- </div>-->
+<!-- <div class="wms-panel">-->
+<!-- <div v-for="item in serviceLayers" :key="item.code" class="layerbox">-->
+<!-- <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"-->
+<!-- @change="swAllLayers(item)"/>{{ item.name }} <span @click="swFilter(item)"-->
+<!-- class="btn-filter">杩囨护</span>-->
+<!-- </div>-->
+<!-- <div class="layerbox-item">-->
+<!-- <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"-->
+<!-- :name="'wmsSublayers_'+item.code+'_'+itm.code"-->
+<!-- :checked="itm.checked"-->
+<!-- :value="itm.code"-->
+<!-- @change="swWmsLayer(item.url,itm)"/>{{-->
+<!-- itm.name }}-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <lc-service-layer-filter v-if="layerFilterVisible" ref="serviceLayerFilter"></lc-service-layer-filter>-->
</div>
</template>
-<script>
-import WfsHelper from '../../helpers/WfsHelper'
-import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
-import AjaxUtils from '../../../utils/AjaxUtils'
+<!--<script>-->
+<!--import WfsHelper from '../../helpers/WfsHelper'-->
+<!--import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'-->
+<!--import AjaxUtils from '../../../utils/AjaxUtils'-->
-export default {
- name: 'LcServiceLayer',
- components: { LcServiceLayerFilter },
- data () {
- return {
- layerFilterVisible: false
- }
- },
- computed: {
- serviceLayers () {
- return this.$store.state.map.serviceLayers.LayerSewersLine
- }
- },
- mounted () {
- // console.log('03姝ラ锛�', this.helper)
- this.updateServiceLayerList()
- },
- methods: {
- swAllLayers (item) {
- // eslint-disable-next-line no-debugger
- item.checked = !item.checked
- for (let i = 0, len = item.layers.length; i < len; ++i) {
- item.layers[i].checked = item.checked
- }
- this.updateWms()
- },
- loadWfs () {
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName('绠＄嚎鐐�')
- wfsHelper.addEquals('pipename', '鐮旂┒闄�01璺痀S000001')
+<!--export default {-->
+<!-- name: 'LcServiceLayer',-->
+<!-- components: { LcServiceLayerFilter },-->
+<!-- data () {-->
+<!-- return {-->
+<!-- layerFilterVisible: false-->
+<!-- }-->
+<!-- },-->
+<!-- computed: {-->
+<!-- serviceLayers () {-->
+<!-- return this.$store.state.map.serviceLayers.LayerSewersLine-->
+<!-- }-->
+<!-- },-->
+<!-- mounted () {-->
+<!-- // console.log('03姝ラ锛�', this.helper)-->
+<!-- this.updateServiceLayerList()-->
+<!-- },-->
+<!-- methods: {-->
+<!-- swAllLayers (item) {-->
+<!-- // eslint-disable-next-line no-debugger-->
+<!-- item.checked = !item.checked-->
+<!-- for (let i = 0, len = item.layers.length; i < len; ++i) {-->
+<!-- item.layers[i].checked = item.checked-->
+<!-- }-->
+<!-- this.updateWms()-->
+<!-- },-->
+<!-- loadWfs () {-->
+<!-- var wfsHelper = new WfsHelper()-->
+<!-- wfsHelper.addTypeName('绠＄嚎鐐�')-->
+<!-- wfsHelper.addEquals('pipename', '鐮旂┒闄�01璺痀S000001')-->
- AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {
- console.log(res)
- })
- },
- swWmsLayer (url, itm) {
- itm.checked = !itm.checked
- if (itm.checked) {
- window.serviceLayerHelper.loadGeojsonLayer(url, itm)
- } else {
- window.serviceLayerHelper.removeLayer(itm)
- }
- // this.updateWms()
- },
- swFilter (item) {
- this.layerFilterVisible = !this.layerFilterVisible
- },
- updateServiceLayerList () {
+<!-- AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {-->
+<!-- console.log(res)-->
+<!-- })-->
+<!-- },-->
+<!-- swWmsLayer (url, itm) {-->
+<!-- itm.checked = !itm.checked-->
+<!-- if (itm.checked) {-->
+<!-- window.serviceLayerHelper.loadGeojsonLayer(url, itm)-->
+<!-- } else {-->
+<!-- window.serviceLayerHelper.removeLayer(itm)-->
+<!-- }-->
+<!-- // this.updateWms()-->
+<!-- },-->
+<!-- swFilter (item) {-->
+<!-- this.layerFilterVisible = !this.layerFilterVisible-->
+<!-- },-->
+<!-- updateServiceLayerList () {-->
- },
- updateWms () {
- var mapConfig = this.mapConfig
- var wmsHelper = new WfsHelper()
- wmsHelper.initMapConfig(mapConfig)
- var wmsLayersMap = wmsHelper.getWmsLayersMap()
- for (var k in wmsLayersMap) {
- var layers = wmsLayersMap[k]
- var tileLayer = window.serviceLayerHelper.getTileLayer(k)
- if (tileLayer) {
- tileLayer.setParams({ layers: layers.join(',') }, false)
- tileLayer.setUrl(tileLayer.config.url, false)
- }
- }
- }
- }
-}
-</script>
+<!-- },-->
+<!-- updateWms () {-->
+<!-- var mapConfig = this.mapConfig-->
+<!-- var wmsHelper = new WfsHelper()-->
+<!-- wmsHelper.initMapConfig(mapConfig)-->
+<!-- var wmsLayersMap = wmsHelper.getWmsLayersMap()-->
+<!-- for (var k in wmsLayersMap) {-->
+<!-- var layers = wmsLayersMap[k]-->
+<!-- var tileLayer = window.serviceLayerHelper.getTileLayer(k)-->
+<!-- if (tileLayer) {-->
+<!-- tileLayer.setParams({ layers: layers.join(',') }, false)-->
+<!-- tileLayer.setUrl(tileLayer.config.url, false)-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
+<!--}-->
+<!--</script>-->
-<style scoped lang="less">
- .inner-panel {
- .title{
- color: #ffffff;
- font-size: 16px;
- font-weight: 600;
- margin: 10px;
- text-align: center;
- }
- .btn-filter {
- cursor: pointer;
- color: #ffffff;
- }
+<!--<style scoped lang="less">-->
+<!-- .inner-panel {-->
+<!-- .title{-->
+<!-- color: #ffffff;-->
+<!-- font-size: 16px;-->
+<!-- font-weight: 600;-->
+<!-- margin: 10px;-->
+<!-- text-align: center;-->
+<!-- }-->
+<!-- .btn-filter {-->
+<!-- cursor: pointer;-->
+<!-- color: #ffffff;-->
+<!-- }-->
- .wms-panel {
- width: 250px;
+<!-- .wms-panel {-->
+<!-- width: 250px;-->
- .layerbox {
- width: 100%;
+<!-- .layerbox {-->
+<!-- width: 100%;-->
- .layerbox-item {
- display: flex;
- flex-flow: row wrap;
- margin-left: 15px;
- margin-top: 5px;
+<!-- .layerbox-item {-->
+<!-- display: flex;-->
+<!-- flex-flow: row wrap;-->
+<!-- margin-left: 15px;-->
+<!-- margin-top: 5px;-->
- .basemap-layer-item {
- width: 50%;
- }
- }
- }
- }
- }
+<!-- .basemap-layer-item {-->
+<!-- width: 50%;-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
+<!-- }-->
-</style>
+<!--</style>-->
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index bcd5466..0e88c14 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -24,13 +24,13 @@
</el-button>
<el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
v-show="item.index!=='2'">
- <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem"/>
- <img :src="itemT.icon" :title="itemT.title" v-else/>
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem" alt=""/>
+ <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
<div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
- @click="changeBasemap(item)"/>
+ @click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
label="鏍囨敞" @change="changeBasemap(item)">
</el-checkbox>
@@ -265,6 +265,7 @@
methods: {
updateBasemapList () {
this.basemapList = this.basemapHelper.getBasemapList()
+ console.log()
},
changeBasemap (itm) {
this.active = -1
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 4ebce10..0c2c839 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/src/components/table/components/WasteGas.vue
@@ -11,10 +11,19 @@
width="30px"
label=""
>
- <template>
- <i class="el-icon-caret-right"></i>
- <span style="margin-left: 10px"></span>
- </template>
+ <template slot-scope="{row,$index}">
+ <!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
+ <el-popover
+ placement="bottom"
+ trigger="click"
+ :disabled="!isShowIcon"
+ popper-class="popovers"
+ >
+ <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
+ <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
+ <!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
+ </el-popover>
+ </template>
</el-table-column>
<el-table-column
label="搴忓彿"
@@ -78,7 +87,7 @@
label="姝ｅ父"
width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=1" >{{row.normal}}</u>
+ <u v-if="$index!==1" >{{row.normal}}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -110,7 +119,7 @@
label="缂哄け"
width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=1" >{{row.deficiency}}</u>
+ <u v-if="$index!==1" >{{row.deficiency}}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -128,18 +137,20 @@
</template>
<script>
-// import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
+import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
export default {
name: 'WasteGas',
components: {
MissingAlarm,
- Refinery
- // ChemicalWastewater
+ Refinery,
+ ChemicalWastewater
},
data () {
return {
+ isActive: '',
+ isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
WasteWaters: '',
@@ -192,7 +203,7 @@
}
},
methods: {
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ tableHeaderColor ({ columnIndex }) {
return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
@@ -202,11 +213,27 @@
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
console.log(row.UserName)
+ },
+ doIcon (index) {
+ if (index !== 1) {
+ this.isShowIcon = false
+ this.isActive = ''
+ return
+ }
+ this.isShowIcon = !this.isShowIcon
+ if (index === this.isActive) {
+ this.isActive = ''
+ return
+ }
+ this.isActive = index
}
}
}
</script>
<style scoped>
-
+.active {
+ /*color: red;*/
+ transform:rotate(90deg);
+}
</style>
diff --git a/src/components/table/components/componented/MissingAlarm.vue b/src/components/table/components/componented/MissingAlarm.vue
index bebabea..f1def62 100644
--- a/src/components/table/components/componented/MissingAlarm.vue
+++ b/src/components/table/components/componented/MissingAlarm.vue
@@ -111,21 +111,21 @@
name: '鐜嬪皬铏�',
province: '涓婃捣',
city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ address: ' 1518 寮�',
zip: 200333
}, {
date: '2016-05-02',
name: '鐜嬪皬铏�',
province: '涓婃捣',
city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ address: ' 1518 寮�',
zip: 200333
}, {
date: '2016-05-04',
name: '鐜嬪皬铏�',
province: '涓婃捣',
city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ address: ' 1518 寮�',
zip: 200333
}]
}
diff --git a/src/components/table/components/componented/refinery.vue b/src/components/table/components/componented/refinery.vue
index c530888..15dda9e 100644
--- a/src/components/table/components/componented/refinery.vue
+++ b/src/components/table/components/componented/refinery.vue
@@ -43,19 +43,19 @@
tableData: [{
date: '2016-05-02',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ address: ' 1518 寮�'
}, {
date: '2016-05-04',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
+ address: ' 1517 寮�'
}, {
date: '2016-05-01',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+ address: ' 1519 寮�'
}, {
date: '2016-05-03',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ address: ' 1516 寮�'
}]
}
}
--
Gitblit v1.8.0