From 3140ec8fc9ac7d7fce42ee2d3ef222323a1c05ff Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 23 四月 2021 11:19:04 +0800
Subject: [PATCH] 修改滚动条
---
src/conf/layers/LayerPipeLines.js | 10 +++
src/conf/layers/LayerWasteWater.js | 4 +
src/conf/LayerTopic.js | 1
src/conf/layers/LayerPollutionSources.js | 3 +
src/conf/layers/LayerWasteGas.js | 5 +
src/assets/css/map/map-panel-style.less | 3 +
src/conf/layers/LayerAirQuality.js | 2
src/conf/layers/LayerArea.js | 4 +
src/conf/layers/LayerPk.js | 3 +
src/conf/layers/LayerVideo.js | 3
src/views/popup/Popup.vue | 6 +-
src/components/LayerController/modules/LcServiceLayer.vue | 69 +++++++++++++++++-----
src/conf/layers/LayerBasin.js | 5 +
src/conf/layers/LayerWasteSolid.js | 2
src/conf/layers/LayerEnvRisk.js | 7 ++
src/conf/layers/LayerSoilGroundWater.js | 6 ++
16 files changed, 113 insertions(+), 20 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 51d8c87..61e07a0 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -454,6 +454,7 @@
}
/*****婊氬姩鏉�***/
.scroll::-webkit-scrollbar,
+.s-map-popup-panel .el-tabs__content::-webkit-scrollbar,
.el-table__body-wrapper::-webkit-scrollbar,
.el-scrollbar__wrap::-webkit-scrollbar {
/*婊氬姩鏉℃暣浣撴牱寮�*/
@@ -462,6 +463,7 @@
}
.scroll::-webkit-scrollbar-thumb,
+.s-map-popup-panel .el-tabs__content::-webkit-scrollbar-thumb,
.el-table__body-wrapper::-webkit-scrollbar-thumb,
.el-scrollbar__wrap::-webkit-scrollbar-thumb {
/*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
@@ -469,6 +471,7 @@
background: #000;
}
.scroll::-webkit-scrollbar-track,
+.s-map-popup-panel .el-tabs__content::-webkit-scrollbar-track,
.el-table__body-wrapper::-webkit-scrollbar-track,
.el-scrollbar__wrap::-webkit-scrollbar-track {
/*婊氬姩鏉￠噷闈㈣建閬�*/
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 71df312..cbaa2c9 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -3,24 +3,21 @@
<div class="panel-title"> 鍥惧眰鎺у埗 </div>
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
- <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
+ <div v-for="(item,index1) in serviceLayers" :key="index1" class="layerbox">
<i class="downUp el-icon-caret-bottom" @click="item.isShow=!item.isShow" :class="item.isShow?'':'active'" ></i><!-- el-icon-arrow-down -->
<!-- 涓�绾у浘灞傞亶鍘� -->
<div style="padding-left:25px;padding-top:10px;color:#fff;font-size: 16px;">
- <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item,'')"/>{{ item.name }}
+ <input type="checkbox" :class="item.type==1?'active':''" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item,'')"/>{{ item.name }}
</div>
<div class="layerbox-item" v-show="item.isShow">
<!-- 浜岀骇鍥惧眰閬嶅巻 -->
- <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="swAllLayers(itm,item.name)"/>{{ itm.name }}
+ <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2">
+ <input type="checkbox" :class="itm.type==1?'active':''" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm,item.name)"/>{{ itm.name }}
<!-- 涓夌骇鍥惧眰閬嶅巻 -->
<div class="layerbox-item-3">
- <div class="basemap-layer-item" v-for="layer in itm.layers" :key="layer.code">
+ <div class="basemap-layer-item" v-for="(layer,index3) in itm.layers" :key="index3">
<input type="checkbox"
+ :class="layer.type==1?'active':''"
:name="'wmsSublayers_'+item.code+'_'+layer.code"
:checked="layer.checked"
:value="layer.code"
@@ -59,6 +56,44 @@
if (v === '涓撻鍥惧眰') {
bus.$emit('changeSearchBar', item)
}
+
+ this.serviceLayers.forEach(function (item1, index1) {
+ if (item1.layers) {
+ item1.istrue = 0
+ item1.isfalse = 0
+ item1.layers.forEach(function (item2, index2) {
+ if (item2.layers) {
+ item2.istrue = 0
+ item2.isfalse = 0
+ item2.layers.forEach(function (item3, index3) {
+ if (item3.checked) { item2.istrue += 1 } else { item2.isfalse += 1 }
+ })
+ // console.log(item2.layers.length, item2.istrue, item2.isfalse, item2.type)
+ if (item2.istrue === item2.layers.length) {
+ item2.type = 2
+ item2.checked = true
+ } else if (item2.isfalse === item2.layers.length) {
+ item2.type = 0
+ item2.checked = false
+ } else {
+ item2.type = 1
+ }
+ if (item2.checked) { item1.istrue += 1 } else { item1.isfalse += 1 }
+ }
+ })
+ if (item1.istrue === item1.layers.length) {
+ item1.type = 2
+ item1.checked = true
+ } else if (item1.isfalse === item1.layers.length) {
+ item1.type = 0
+ item1.checked = false
+ } else {
+ item1.type = 1
+ }
+ // console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
+ }
+ })
+ console.log(this.serviceLayers)
},
swLayers (layers, checked) {
if (layers) {
@@ -95,8 +130,8 @@
.wms-panel-scrollbar{
height: 600px;
- width: 285px;
- //width: 2.5rem;
+ //width: 285px;
+ width: 1.79rem;
font-size: 14px;
}
.layerbox {
@@ -119,14 +154,16 @@
}
.downUp:hover{font-size: 26px;font-weight: 900}
.layerbox-item {
- padding-left: 30px;
+ padding-left: 0.1rem;
padding-top: 5px;
- .basemap-layer-item {
- margin-bottom: 5px;
+ .basemap-layer-item {margin-bottom: 5px;
input[type="checkbox"]{width:10px;height:10px;display: inline-block;text-align: center;vertical-align: middle; line-height: 10px;position: relative;}
input[type="checkbox"]::before{content: "";position: absolute;top: 0;left: 0;background: #fff;width: 100%;height: 100%;border: 1px solid #d9d9d9}
- input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;color:@background-color;font-size: 10px;font-weight: bold;}
-
+ input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;
+ color:@background-color;font-size: 10px;font-weight: bold;}
+ input.active[type="checkbox"]::before,
+ input.active[type="checkbox"]:checked::before{content: "\2713";background: @background-color;position: absolute;top: 0;left: 0;width:100%;border: 1px solid @background-color;
+ color:@color-highlight;font-size: 10px;font-weight: bold;}
}
}
.layerbox-item-3{
diff --git a/src/conf/LayerTopic.js b/src/conf/LayerTopic.js
index 0e1f844..e27ab87 100644
--- a/src/conf/LayerTopic.js
+++ b/src/conf/LayerTopic.js
@@ -18,5 +18,6 @@
name: '涓撻鍥惧眰',
checked: false,
isShow: true,
+ type: 0,
layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea]
}
diff --git a/src/conf/layers/LayerAirQuality.js b/src/conf/layers/LayerAirQuality.js
index ba96008..2004562 100644
--- a/src/conf/layers/LayerAirQuality.js
+++ b/src/conf/layers/LayerAirQuality.js
@@ -7,12 +7,14 @@
code: 'sewersAirQuality',
name: '绌烘皵璐ㄩ噺',
checked: false,
+ type: 0,
layers: [
{
code: 'airQualityStation',
name: '鐩戞祴绔�',
sname: '鐩戞祴绔�', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: WFS_URL + '?TYPENAME=鍏徃'
}
]
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 0ec2ae6..b16cf81 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -7,12 +7,14 @@
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
checked: false,
+ type: 0,
layers: [
{
code: 'sewersAreaGs',
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
+ type: 0,
url: WFS_URL + '?TYPENAME=鍏徃'
},
{
@@ -20,6 +22,7 @@
name: '鐮佸ご',
sname: '鐮佸ご',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=鐮佸ご'
},
{
@@ -27,6 +30,7 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
}
]
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index 7e8b80e..0c56d92 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -8,12 +8,14 @@
name: '鍖哄煙鍥惧眰',
checked: true,
isShow: true,
+ type: 2,
layers: [
{
code: 'basinCj',
name: '闀挎睙娴佸煙',
sname: '闀挎睙娴佸煙', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
+ type: 2,
url: WFS_URL + '?TYPENAME=鍏徃'
},
{
@@ -21,6 +23,7 @@
name: '榛勬渤娴佸煙',
sname: '榛勬渤娴佸煙',
checked: true, // 榛樿閫変腑鐘舵��
+ type: 2,
wfs: WFS_URL + '?TYPENAME=鐮佸ご'
},
{
@@ -28,6 +31,7 @@
name: '娓ゆ捣娴佸煙',
sname: '娓ゆ捣娴佸煙',
checked: true, // 榛樿閫変腑鐘舵��
+ type: 2,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
},
{
@@ -35,6 +39,7 @@
name: '鍏朵粬',
sname: '鍏朵粬',
checked: true, // 榛樿閫変腑鐘舵��
+ type: 2,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
}
]
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index 51ea802..712ac55 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -7,12 +7,14 @@
code: 'sewersEnvRisk',
name: '鐜椋庨櫓',
checked: false,
+ type: 0,
layers: [
{
code: 'envRiskChart',
name: '椋庨櫓缁熻鍥�',
sname: '椋庨櫓缁熻鍥�', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: WFS_URL + '?TYPENAME=鍏徃',
color: ''
},
@@ -21,6 +23,7 @@
name: '鐗╄祫搴�',
sname: '鐗╄祫搴�',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=鐮佸ご',
color: ''
},
@@ -29,6 +32,7 @@
name: '閲嶅ぇ椋庨櫓',
sname: '閲嶅ぇ椋庨櫓',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
minZoom: 10,
color: 'red'
@@ -38,6 +42,7 @@
name: '涓�绾ч闄�',
sname: '涓�绾ч闄�',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
minZoom: 10,
color: 'sandybrown'
},
@@ -46,6 +51,7 @@
name: '浜岀骇椋庨櫓',
sname: '浜岀骇椋庨櫓',
checked: false,
+ type: 0,
minZoom: 10,
color: 'yellow'
},
@@ -54,6 +60,7 @@
name: '涓夌骇椋庨櫓',
sname: '涓夌骇椋庨櫓',
checked: false,
+ type: 0,
minZoom: 10,
color: 'green'
}
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 016ba63..dc24179 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -11,6 +11,7 @@
code: 'sewersPipeLines',
name: '绠＄嚎',
checked: false,
+ type: 0,
childLayer: [LayerFsss, LayerHbss],
layers: [
{
@@ -18,6 +19,7 @@
name: '闆ㄦ按绾�',
sname: '绠＄綉',
checked: false,
+ type: 0,
// wfs: WFS_URL + '?TYPENAME=绠＄綉&FILTER=<Filter xmlns="http://www.opengis.net/ogc"><PropertyIsEqualTo><PropertyName>mediumtype</PropertyName><Literal>闆ㄦ按绠＄嚎</Literal></PropertyIsEqualTo></Filter>',
wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=linenumtype=\'闆ㄦ按绠＄嚎\'',
icon: 'sewers/闆ㄦ按绾�.png',
@@ -33,6 +35,7 @@
name: '浜嬫晠姘寸嚎',
sname: '浜嬫晠姘�',
checked: false,
+ type: 0,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
},
@@ -41,6 +44,7 @@
name: '鍚补姹℃按绾�',
sname: '鍚补姹℃按',
checked: false,
+ type: 0,
minZoom: 13,
color: '#ffaa00',
wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
@@ -54,6 +58,7 @@
name: '鍚洂姹℃按绾�',
sname: '鍚洂姹℃按',
checked: false,
+ type: 0,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按'
},
@@ -62,6 +67,7 @@
name: '鍚⒈姹℃按绾�',
sname: '鍚⒈姹℃按',
checked: false,
+ type: 0,
wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
minZoom: 10
},
@@ -70,6 +76,7 @@
name: '鐢熸椿姹℃按',
sname: '鐢熸椿姹℃按',
checked: false,
+ type: 0,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按'
},
@@ -78,6 +85,7 @@
name: '鍑�鍖栨按绾�',
sname: '鍑�鍖栨按',
checked: false,
+ type: 0,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按'
},
@@ -85,6 +93,7 @@
code: 'loopline',
name: '寰幆姘寸嚎',
sname: '寰幆姘�',
+ type: 0,
checked: false,
minZoom: 13,
wfs: WFS_URL + '?TYPENAME=寰幆姘�'
@@ -94,6 +103,7 @@
name: '鐢熶骇姹℃按',
sname: '鐢熶骇姹℃按',
checked: false,
+ type: 0,
minZoom: 13,
color: '#a8a800',
wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鐢熶骇姹℃按\'',
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 3750c1f..4b3fc8b 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -6,12 +6,14 @@
name: '鎺掓斁鍙�',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: true,
+ type: 0,
layers: [
{
code: 'sewersNpk',
name: '鍐呮帓鍙�',
sname: '鍐呮帓鍙�',
checked: true,
+ type: 0,
icon: 'sewers/闆ㄦ按鎺掑彛.png',
wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'鍐呮帓\'',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
@@ -22,6 +24,7 @@
sname: '澶栨帓鍙�',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: true, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=sewer:dischargeport&maxFeatures=50&outputFormat=application/json&cql_filter=pfktype=\'澶栨帓\'',
minZoom: 10
}
diff --git a/src/conf/layers/LayerPollutionSources.js b/src/conf/layers/LayerPollutionSources.js
index 369016c..2aba1e0 100644
--- a/src/conf/layers/LayerPollutionSources.js
+++ b/src/conf/layers/LayerPollutionSources.js
@@ -6,12 +6,14 @@
code: 'pollutionSources',
name: '姹℃煋婧�',
checked: false,
+ type: 0,
layers: [
{
code: 'pollutionSourcesSczz',
name: '鐢熶骇瑁呯疆',
sname: '鐢熶骇瑁呯疆', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
@@ -20,6 +22,7 @@
name: '娌荤悊璁炬柦',
sname: '娌荤悊璁炬柦', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
}]
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index b7d1e28..4177d22 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -7,12 +7,14 @@
code: 'sewersSoilGroundWater',
name: '鍦熷￥鍙婂湴涓嬫按',
checked: false,
+ type: 0,
layers: [
{
code: 'soil',
name: '鍦熷￥',
sname: '鍦熷￥', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: WFS_URL + '?TYPENAME=鍏徃'
},
{
@@ -20,6 +22,7 @@
name: '鍦颁笅姘�',
sname: '鍦颁笅姘�',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=鐮佸ご'
},
{
@@ -27,6 +30,7 @@
name: '涓�绾ч闄╁湴鍧�',
sname: '涓�绾ч闄╁湴鍧�',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
color: 'red'
},
@@ -35,6 +39,7 @@
name: '浜岀骇椋庨櫓鍦板潡',
sname: '浜岀骇椋庨櫓鍦板潡',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
color: 'yellow'
},
@@ -43,6 +48,7 @@
name: '涓夌骇椋庨櫓鍦板潡',
sname: '涓夌骇椋庨櫓鍦板潡',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
color: 'green'
}
diff --git a/src/conf/layers/LayerVideo.js b/src/conf/layers/LayerVideo.js
index 2222f80..7599043 100644
--- a/src/conf/layers/LayerVideo.js
+++ b/src/conf/layers/LayerVideo.js
@@ -4,5 +4,6 @@
export const LayerVideo = {
code: 'sewersVideo',
name: '瑙嗛鐩戞帶',
- checked: false
+ checked: false,
+ type: 0
}
diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index 6156087..199c70e 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -6,12 +6,14 @@
code: 'wasteGas',
name: '搴熸皵',
checked: false,
+ type: 0,
layers: [
{
code: 'wasteGasPfk',
name: '鎺掓斁鍙�',
sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: false,
+ type: 0,
url: 'http://www.baidu.com'
},
{
@@ -19,6 +21,7 @@
name: '鍙噧姘�',
sname: '鍙噧姘�',
checked: false,
+ type: 0,
url: ''
},
{
@@ -26,6 +29,7 @@
name: '鏈夊姘�',
sname: '鏈夊姘�',
checked: false,
+ type: 0,
url: ''
},
{
@@ -33,6 +37,7 @@
name: 'VOCs',
sname: 'VOCs',
checked: false,
+ type: 0,
url: ''
}
]
diff --git a/src/conf/layers/LayerWasteSolid.js b/src/conf/layers/LayerWasteSolid.js
index ca2129b..e2b104f 100644
--- a/src/conf/layers/LayerWasteSolid.js
+++ b/src/conf/layers/LayerWasteSolid.js
@@ -7,12 +7,14 @@
code: 'wasteSolid',
name: '鍥哄簾',
checked: false,
+ type: 0,
layers: [
{
code: 'wasteSolidCcd',
name: '璐瓨鐐�',
sname: '璐瓨鐐�',
checked: false,
+ type: 0,
url: 'http://www.baidu2.com'
}
]
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index b3ed821..9ddc1c7 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -6,12 +6,14 @@
code: 'wasteWater',
name: '搴熸按',
checked: false,
+ type: 0,
layers: [
{
code: 'wasteWaterPfk',
name: '鎺掓斁鍙�',
sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: 'http://www.baidu.com'
},
{
@@ -19,6 +21,7 @@
name: '娴侀噺',
sname: '娴侀噺',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: 'http://www.baidu2.com'
},
{
@@ -26,6 +29,7 @@
name: '娑蹭綅',
sname: '娑蹭綅',
checked: false, // 榛樿閫変腑鐘舵��
+ type: 0,
url: ''
}
]
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index 46a5d1c..02703b5 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -96,9 +96,9 @@
<style lang="less" >
@import '../../assets/css/map/map-popup.less';
#popup{
- .el-tabs__content{
- max-height: 300px;
- overflow: auto;
+ .el-tabs__content{
+ max-height: 240px;
+ overflow-y: scroll;
}
}
</style>
--
Gitblit v1.8.0