From 59e80a39400f37168027ca02526e9ea3d85680c7 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 14 二月 2023 18:25:57 +0800
Subject: [PATCH] 综合展示样式修改
---
src/views/Tools/maplayer.vue | 5 +
src/views/Tools/LayerTree.vue | 63 ++++++++++++++++-----
src/store/index.js | 8 +-
src/components/MapView/mapMenuTop.vue | 5 +
src/views/Synthesis/LeftMenu.vue | 6 +
src/components/mapsdk.vue | 62 ++------------------
6 files changed, 71 insertions(+), 78 deletions(-)
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 5ba0202..a3832ca 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -364,10 +364,11 @@
setTurfCircle(position, radius) {
var options = {
steps: 10,
- units: 'miles',
+ units: 'meters',
properties: { foo: 'bar' },
};
var circle = turf.circle(position, radius, options);
+ debugger
this.setJonToWKT(circle);
},
setTurfPolyOrLine(res, type) {
@@ -379,7 +380,7 @@
}
if (type == 'polyline') {
var line = turf.lineString(std, { name: 'polyline' });
- restVal = turf.buffer(line, 10, { units: 'miles' });
+ restVal = turf.buffer(line, 10, { units: 'meters' });
} else if (type == 'rectangle') {
var ste = this.setCartesianToEightFour(res[0]);
std.push([ste.lng, ste.lat]);
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index f2d00c6..cf8375c 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -2,7 +2,7 @@
<div class="mapBox">
<div id="mapdiv">
<div
- class="menu_Top"
+ class="menu_Top box_divm"
v-if="$store.state.mapMenuBoolean"
>
<map-menu-top v-if="$store.state.mapMenuBoxFlag == '1'" />
@@ -13,7 +13,7 @@
class="bufferBox"
v-if="showBufferBoxDialog"
>
- <el-card class="box-card">
+ <el-card class="box-card box_divm">
<div
slot="header"
class="clearfix"
@@ -64,7 +64,7 @@
<el-card class="box-card">
<div
slot="header"
- class="clearfix"
+
>
<span>鍧愭爣瀹氫綅</span>
<div style="float: right; cursor: pointer">
@@ -896,63 +896,15 @@
right: 1%;
bottom: 1%;
}
- .box-body {
- padding: 18px;
- /deep/ .el-form-item__label {
- color: white !important;
- }
- /deep/ .el-input__inner {
- background: rgba(255, 255, 255, 0.2) !important;
- color: white !important;
- }
-
- /deep/.el-table,
- .el-table__expanded-cell {
- background-color: transparent;
- color: white;
- }
-
- /deep/ .el-table tr {
- background-color: transparent !important;
- }
- /deep/ .el-table tbody tr:hover > td {
- background-color: rgba(255, 255, 255, 0.2) !important;
- }
- /deep/.el-table鈥揺nable-row-transition .el-table__body td,
- .el-table .cell {
- background-color: transparent !important;
- }
- /deep/ .el-table th.el-table__cell {
- background-color: transparent !important;
- color: white;
- }
- /deep/.el-pager li {
- background-color: transparent !important;
- color: white;
- }
- /deep/ .btn-prev {
- background-color: transparent !important;
- }
- /deep/ .btn-next {
- background-color: transparent !important;
- color: white !important;
- }
- /deep/ .el-pagination__total {
- color: white;
- }
- /deep/ .el-pagination__jump {
- color: white;
- }
- }
-
+
.box-card {
- background: #303030;
+
opacity: 0.85;
border: 1px solid rgba(32, 160, 255, 0.6);
- color: white;
+
}
.menu_Top {
- background: #303030;
+
opacity: 0.85;
width: 100%;
padding: 1%;
diff --git a/src/store/index.js b/src/store/index.js
index 16e42f3..81a8183 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,9 +52,11 @@
pipelineEntity: [],
reporturl: null,
layerMnage: false,
- themeflag:false,
+ themeflag: false,
language: true,
- isNaviget:false,
+ isNaviget: false,
+ treeData: null,
+ checkedKeys: [],
},
mutations: {
//鑾峰彇鏉冮檺鍚堥泦
@@ -168,7 +170,7 @@
});
});
},
- setCookies(res) {
+ setCookies(res) {
var value = localStorage.getItem('LFToken');
if (value != null) {
this.rmCookies();
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 7bf1a0a..a41aa50 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -377,7 +377,7 @@
isContrastFlag: false,
UndergroundMode: false,
scaleLine: null,
- Excavation:false,
+ Excavation: false,
};
},
methods: {
@@ -923,7 +923,7 @@
}
break
case "d13":
- if (this.Excavation ) {
+ if (this.Excavation) {
this.Excavation.destroy()
this.Excavation = null
} else {
@@ -1182,6 +1182,8 @@
this.$store.state.showAllLayers = true;
this.$store.state.layerMnage = false;
+ this.$store.state.treeData = null;
+ this.$store.state.checkedKeys = [];
this.setCoverage('a1');
},
};
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index fc0c1c1..6696753 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -147,8 +147,8 @@
import GeoJSON from 'ol/format/GeoJSON.js';
import Map from 'ol/Map.js';
-import { Vector as VectorSource } from "ol/source";
-import { Vector as VectorLayer, } from "ol/layer";
+import { Vector as VectorSource } from "ol/source";
+import { Vector as VectorLayer, } from "ol/layer";
import View from 'ol/View.js';
import { Fill, Stroke, Style } from 'ol/style.js';
@@ -306,6 +306,30 @@
deleteNode() {
this.foo();
+ var label = this.currentNode.data.label;
+ if (this.currentNode.data.layerType == 'WMS') {
+ for (var i in window.Viewer.imageryLayers_layers) {
+ if (window.Viewer.imageryLayers_layers[i].name === label) {
+ window.Viewer.imageryLayers.remove(window.Viewer.imageryLayers_layers[i])
+ }
+ }
+
+ } else if (this.currentNode.data.layerType == 'WFS') {
+ for (var i in window.Viewer.dataSources._dataSources) {
+ if (window.Viewer.dataSources._dataSources[i].name == label) {
+ window.Viewer.dataSources.remove(window.Viewer.dataSources._dataSources[i]);
+ std.push(data.label)
+ }
+ }
+ }
+ var layers_ol = window.map.getAllLayers();
+ for (var i in layers_ol) {
+ var layerOl = layers_ol[i];
+ if (layerOl.values_.name == label) {
+ window.map.removeLayer(layerOl); //鏄剧ず鍥惧眰
+ }
+ }
+
this.$refs.tree.remove(this.currentNode);
},
@@ -330,7 +354,7 @@
var node = this.currentNode;
var data = this.currentData;
let copyNode = this.currentNode
- debugger
+
// copyNode.previousSibling = {...node. }
// copyNode.nextSibling = {...node.nextSibling}
// window.sessionStorage.setItem('menuNode',CircularJSON.stringify(copyNode))
@@ -431,10 +455,12 @@
setAddLayers(res) {
if (res.layerType == 'WMS') {
+
var url = geoServerURl;
if (res.url != null && res.url != undefined) {
url = res.url
}
+ var imageryLayers = window.Viewer.scene.imageryLayers;
let layerWMS = new Cesium.WebMapServiceImageryProvider({
url: url,
layers: res.resource,
@@ -444,7 +470,11 @@
},
});
layerWMS.name = res.label;
- window.Viewer.imageryLayers.addImageryProvider(layerWMS);
+ //閫忔槑搴�
+ var tdtAnnoLayer = imageryLayers.addImageryProvider(layerWMS);
+ if (res.opacity) {
+ tdtAnnoLayer.alpha = parseInt(res.opacity) / 100;
+ }
var layer2 = new Image({
name: res.label,
source: new ImageWMS({
@@ -458,6 +488,9 @@
},
}),
});
+ if (res.opacity) {
+ layer2.setOpacity(parseInt(res.opacity) / 100);
+ }
window.map.addLayer(layer2);
} else if (res.layerType == 'WFS') {
@@ -470,7 +503,8 @@
success: function (data) {
var datasource = Cesium.GeoJsonDataSource.load(data, {
stroke: Cesium.Color.YELLOW,
- fill: Cesium.Color.YELLOW.withAlpha(0.5),
+ fill: Cesium.Color.YELLOW.withAlpha(0.1),
+ alpha: 0.1,
strokeWidth: 8,
clampToGround: true //鏄惁璐村湴
});
@@ -486,20 +520,15 @@
});
var vectorLayer = new VectorLayer({
- name: res.label,
+ name: res.label,
source: new VectorSource({
url: url,
format: new GeoJSON(),
}),
-
+
});
window.map.addLayer(vectorLayer);
-
-
}
-
-
-
},
async layersStart() {
const data = await perms_selectLayers();
@@ -624,17 +653,21 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
+
},
},
mounted() {
-
+ this.$bus.$on("treeDataCopy", (res) => {
+ this.$store.state.treeData = this.treeData;
+ this.$store.state.checkedKeys = this.$refs.tree.getCheckedKeys()
+ });
if (this.$store.state.showAllLayers == true) {
this.layersStart();
this.$store.state.showAllLayers = false;
} else {
- this.treelayersStart();
-
+ this.treeData = this.$store.state.treeData;
+ this.$refs.tree.setCheckedKeys(this.$store.state.checkedKeys);
}
},
diff --git a/src/views/Tools/maplayer.vue b/src/views/Tools/maplayer.vue
index 4053435..0ad9e0c 100644
--- a/src/views/Tools/maplayer.vue
+++ b/src/views/Tools/maplayer.vue
@@ -48,12 +48,15 @@
},
// 鍏抽棴寮圭獥
close(id) {
+ this.$bus.$emit("treeDataCopy","true");
let index = this.PopupData.findIndex((item) => {
return item.id === id;
});
let data = this.PopupData.splice(index, 1)[0];
data.close && data.close();
- this.$store.state.layerMnage = false;
+ this.$store.state.layerMnage = false;
+
+
},
// 鎵撳紑寮圭獥
open(title, value, style = {}) {
--
Gitblit v1.9.3