From 59f41216be10124f7203ef4b08352f4aaa821491 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/ToolBoxPanel.vue | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 6c0ed6f..ce0c138 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -5,7 +5,6 @@
<img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
<span class="span-default">宸ュ叿</span>
</el-button>
-
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
@@ -29,15 +28,16 @@
<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 basemapHelper.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)" alt=""/>
- <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
- label="鏍囨敞" @change="changeBasemap(item)">
- </el-checkbox>
- </div>
- </div>
+<!-- <div class="base-map-inner-panel" v-show="item.index==='2'">-->
+<!-- <div v-for="item in basemapHelper.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)" alt=""/>-->
+<!-- <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"-->
+<!-- label="鏍囨敞" @change="changeBasemap(item)">-->
+<!-- </el-checkbox>-->
+<!-- </div>-->
+<!-- </div>-->
+ <lc-base-map v-show="item.index==='2'"></lc-base-map>
</el-popover>
<el-button @click="changeSelect" class="special-button">
<i class="el-icon-d-arrow-left"></i>
@@ -49,6 +49,7 @@
</template>
<script>
+import LcBaseMap from '@components/LayerController/modules/LcBaseMap'
// 鍔熻兘瀵艰埅
import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
@@ -95,11 +96,14 @@
export default {
name: 'ToolBoxPanel',
+ components: {
+ LcBaseMap
+ },
data () {
return {
isShow: [],
- currentBaseMapCode: 'tianditu_img',
- basemapList: [],
+ // currentBaseMapCode: 'tianditu_img',
+ // basemapList: [],
selectGroup: false,
drawLayer: null,
drawLayerArray: [],
@@ -257,33 +261,10 @@
]
}
},
- computed: {
- basemapHelper () {
- return this.$store.state.map.basemapHelper
- }
- },
methods: {
init (map) {
this.map = map
this.toolBoxPanelVisible = true
- },
- changeBasemap (itm) {
- this.active = -1
- const code = itm.code
- this.basemapHelper.basemapList.forEach((item) => {
- if (item.code === code) {
- if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
- this.currentBaseMapCode = code
- this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
- } else {
- this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
- }
-
- this.basemapHelper.basemapList.forEach((item) => {
- item.layer.bringToBack()
- })
- }
- })
},
changeChoose (index) {
if (this.drawLayer == null) {
--
Gitblit v1.8.0