完善底图切换组件

src/views/Map3d/components/basicLayer.vue

@@ -27,12 +27,10 @@
 			<div class="header">
 				<div style="width: 20rem;"></div>
 				<span>底图</span>
-				<i :class="store.userport == 'PC'?'iconfont icon-youjiantou':'iconfont icon-youjiantou'"
-					@click="closebasicLayer" style="font-size: 16rem;" />
+				<i :class="store.userport == 'PC'?'iconfont icon-youjiantou':'iconfont icon-youjiantou'" @click="closebasicLayer" style="font-size: 16rem;" />
 			</div>
 			<div class="middle">
-				<div class="onceLayer" v-for="(item,index) in layerList" :key="index"
-					@click="changeBasicLayer(item.url,item.layerorder,item.imageurl)">
+				<div class="onceLayer" v-for="(item,index) in layerList" :key="index" @click="changeBasicLayer(item.url,item.layerorder,item.imageurl)">
 					<img v-if="item.imageurl" :src="item.imageurl" :class="item.layerorder==selectImg?'selectImg':''" />
 					<!-- <span>{{item.title}}</span> -->
 				</div>
@@ -203,21 +201,24 @@
 							parameterset = JSON.parse(item.parameterset);
 						}
 
-						if (item.isinit === '1' && item.layertype === '地形') {
-							_self.terrainData.isterrain = true;
+						if (item.layertype === '地形') {
 							_self.terrainData.terrainUrl = item.datasource;
-
 							if (parameterset) {
 								if (parameterset.terrainExaggeration) { //地形夸张系数
 									_self.terrainData.terrainExaggeration = parameterset
 										.terrainExaggeration;
 								}
 							}
+						}
+						if (item.layertype === '标注') {
+							_self.markData.markUrl = item.datasource;
+						}
 
+						if (item.isinit === '1' && item.layertype === '地形') {
+							_self.terrainData.isterrain = true;
 							_self.addTerrain();
 						} else if (item.isinit === '1' && item.layertype === '标注') {
 							_self.markData.ismark = true;
-							_self.markData.markUrl = item.datasource;
 							_self.addMark();
 						} else if (item.isinit === '1') {
 							_self.selectImg = item.layerorder;
@@ -238,8 +239,8 @@
 								imageryLayers.raise(window[_self.layerID]);
 							});
 						}
-						
-						if (item.datasource &&item.datasource != '#' && item.layertype != '地形' && item.layertype != '标注') {
+
+						if (item.datasource && item.datasource != '#' && item.layertype != '地形' && item.layertype != '标注') {
 							if (parameterset) {
 								if (parameterset.imgurl) {
 									_self.layerList.push({
@@ -277,7 +278,7 @@
 				sqlWhere: '"roleId"' + " = '" + roleId + "'",
 				orderByField: ''
 			}).then(res => {
-				_self.roleName = '"atlasType"' + "= '底图'" +" and "+ '"roleId"' + " ='" + roleId + "'"
+				_self.roleName = '"atlasType"' + "= '底图'" + " and " + '"roleId"' + " ='" + roleId + "'"
 				_self.addBaseLayer();
 			})
 		}
@@ -346,7 +347,8 @@
 				flex: 15;
 				font-size: 20rem;
 			}
-			i:hover{
+
+			i:hover {
 				cursor: pointer;
 			}