From 32e368a87045c93f09370b6051284ab6fabc4bd0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 18 三月 2021 17:32:50 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
src/components/table/summarySheets.vue | 2
src/assets/css/map/map-panel-style.less | 15 +++++--
src/components/panel/ToolBoxPanel.vue | 26 ++++++++++---
src/components/table/components/WasteWater.vue | 29 +++++++-------
4 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 3680c25..0f1628e 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -157,13 +157,17 @@
}
.tools-panel-content {
- border: 1px solid @background-color-tools;
- background: @background-color-tools;
+ //position: absolute;
+ //top: 60px;
+ //left: 55px;
+ background: @background-color;
+ border: 0.00521rem solid @color-shadow;
padding: 0;
//width: 90px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
+ margin-left: 55px;
.el-button {
padding: 0;
@@ -180,9 +184,10 @@
}
}
-.el-popper[x-placement^=bottom] .popper__arrow::after {
- border-bottom-color: @background-color-tools;
-}
.leaflet-control-easyPrint .leaflet-bar .leaflet-control {
display: none;
}
+
+.popper__arrow {
+ display: none !important;
+}
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index d2e6a65..bcd5466 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -15,7 +15,7 @@
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
>
- <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+ <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
@click="changeChoose(index)">
<img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
<img :src="item.icon" alt="" v-else/>
@@ -24,7 +24,7 @@
</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"/>
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem"/>
<img :src="itemT.icon" :title="itemT.title" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
@@ -90,7 +90,7 @@
name: 'ToolBoxPanel',
data () {
return {
- isShow: true,
+ isShow: false,
currentBaseMapCode: 'tianditu_img',
basemapList: [],
selectGroup: false,
@@ -98,9 +98,11 @@
drawLayerArray: [],
map: null,
active: -1,
- Selecd: -1,
checked: false,
checkbutton: -1,
+ checkedItem: false,
+ Selecd: -1,
+ isSelecd: -1,
menuList: [
{
icon: plot,
@@ -265,6 +267,7 @@
this.basemapList = this.basemapHelper.getBasemapList()
},
changeBasemap (itm) {
+ this.active = -1
const code = itm.code
this.basemapList.forEach((item) => {
if (item.code === code) {
@@ -301,7 +304,16 @@
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
- this.checked = false
+ if (this.isSelecd === indexT) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ if (this.isSelecd === -1) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ this.checkedItem = true
+ }
+ }
+ this.isSelecd = indexT
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -379,6 +391,7 @@
printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ this.active = -1
},
setLogic () {
this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -393,7 +406,6 @@
},
changeSelectMouse () {
this.selectGroup = true
- // this.checked = false
}
}
}
@@ -454,6 +466,7 @@
}
.el-button-choice {
+ left: 500px;
z-index: 999;
padding: 0;
margin: 0 0.015rem;
@@ -529,6 +542,7 @@
display: block;
color: @color-shadow;
}
+
.default-span {
display: block;
color: @color-over;
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index 8cbdc0e..0d88a05 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -12,21 +12,18 @@
width="30px"
label=""
>
- <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></ChemicalWastewater>
- <i class="el-icon-caret-right" slot="reference" v-if="!isShowIcon" @click="doIcon"></i>
-<!-- <i class="el-icon-caret-bottom" slot="reference" v-else-if="isShowIcon&&$index===1"></i>-->
-<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
-<!-- <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
-<!-- <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
- </el-popover>
-<!-- <i class="el-icon-caret-right" v-if="!isShowIcon"></i>-->
-<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
+ <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
+ <i class="el-icon-caret-right" slot="reference" v-if="!isShowIcon" @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
@@ -43,7 +40,7 @@
<div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
<div v-else >{{scope.row.UserName}}</div>
</template>
- </el-table-column>v-
+ </el-table-column>
<el-table-column
prop="WasteWaters"
label="澶栨帓搴熸按閲忥紙m鲁锛�"
@@ -149,7 +146,6 @@
},
data () {
return {
- show: false,
isShowIcon: false,
tableData: [{
UserName: '闆嗗洟鍚嶇О',
@@ -214,9 +210,12 @@
handle (row, column, event, cell) {
console.log(row.UserName)
},
- doIcon () {
- console.log(1)
- this.isShowIcon = !this.isShowIcon
+ doIcon (index) {
+ if (index === 1) {
+ this.isShowIcon = !this.isShowIcon
+ } else {
+ this.isShowIcon = false
+ }
}
}
}
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 8e04c11..71f404e 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -38,7 +38,7 @@
left: 1px;
/*width: 850px;*/
/*height: 265px;*/
- z-index:2000;
+ z-index:500;
/*color: #fff;*/
.el-icon-c-scale-to-original {
width: 30px;
--
Gitblit v1.8.0