From e154927eecbe36abd245f196ddcfc08a8b0d9be4 Mon Sep 17 00:00:00 2001
From: 王旭 <1377869194@qq.com>
Date: 星期三, 22 二月 2023 17:28:39 +0800
Subject: [PATCH] 1
---
src/views/Tools/LayerTree.vue | 17 ++++++++++++++---
src/assets/css/config.css | 2 +-
public/config/config.js | 2 +-
package.json | 6 ++----
src/views/Synthesis/LeftMenu.vue | 11 ++++++-----
jsconfig.json | 5 +++++
src/assets/css/configure.css | 2 +-
public/globle/globle.js | 7 +++++++
src/components/mapsdk.vue | 2 ++
src/components/MapView/mapSpacePop.vue | 2 +-
10 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..2670831
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,5 @@
+{
+ "include": [
+ "./src/*"
+ ]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index f123eab..12b8a37 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,11 @@
"install": "^0.13.0",
"jquery": "^3.6.0",
"moment": "^2.29.4",
- "node-sass": "^7.0.3",
+ "node-sass": "^4.14.1",
"npm": "^8.15.1",
"object-assign": "^4.1.1",
"ol": "^6.15.1",
- "sql.js": "^1.5.0",
- "sqlite3": "^5.0.2",
+ "sass-loader": "^8.0.0",
"terraformer-wkt-parser": "^1.2.1",
"theme-vue": "0.0.8",
"vant": "^2.12.25",
@@ -57,7 +56,6 @@
"lint-staged": "^9.5.0",
"postcss-pxtorem": "^5.1.1",
"prettier": "^2.2.1",
- "sass-loader": "^10.3.1",
"vue-particles": "^1.0.9",
"vue-template-compiler": "^2.6.11"
},
diff --git a/public/config/config.js b/public/config/config.js
index e16ca7c..bd6dce7 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -24,7 +24,7 @@
var geoserverWFSLine = '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Am_pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
// 妯″瀷鍔犺浇鍦板潃
-var modelUrl = LFData + '/tileset/SN/tileset.json';
+var modelUrl = LFData + '/tileset';
// DEM
var demLayer = LFData + '/dem';
diff --git a/public/globle/globle.js b/public/globle/globle.js
index 5023da2..5c1e8a3 100644
--- a/public/globle/globle.js
+++ b/public/globle/globle.js
@@ -18,3 +18,10 @@
window.TSExcavation = null;
}
}
+
+window.XZOutlie="dlg_100w_boua"; //1:100涓囪鏀块潰layer鍚嶇О
+window.ImageLayer3=null;//1:100涓囪鏀块潰鍥惧眰
+
+
+
+
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index 9550d3b..50cbeb1 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -404,7 +404,7 @@
}
.Black_theme .twoMenu_imge414 {
- background: url("../../assets/img/synthesis/images/3d瑙嗗煙鍒嗘瀽.png") no-repeat center;
+ background: url("../../assets/img/synthesis/images/2.png") no-repeat center;
}
diff --git a/src/assets/css/configure.css b/src/assets/css/configure.css
index 4250793..a63cef0 100644
--- a/src/assets/css/configure.css
+++ b/src/assets/css/configure.css
@@ -236,7 +236,7 @@
}
.twoMenu_imge414 {
- background: url("../../assets/img/synthesis/images/3鐧藉簳_162.png") no-repeat center;
+ background: url("../../assets/img/synthesis/images/1.png") no-repeat center;
}
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 37ef809..648bff5 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -232,7 +232,7 @@
obj = this.optionx.find(function (item) {
return item.field === value;
});
- // debugger
+
// if (obj.type == 'serial' || obj.type == 'int') {
// this.options = this.options2;
// } else {
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index f556173..66270d1 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -415,6 +415,8 @@
})
)
+ window.ImageLayer3=this.layer3;
+
// for (var i in gaoDeBaseUrl) {
// sgworld.Creator.createUrlTemplateImageryProvider(
// gaoDeBaseUrl[i].label,
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 6a322a5..ebffc74 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1167,7 +1167,7 @@
var that = this;
window.model = sgworld.Creator.create3DTilesets(
'',
- modelUrl,
+ modelUrl+'/SN/tileset.json',
{},
{},
'0',
@@ -1214,9 +1214,7 @@
},
function (entity) {
let positions = entity.polygon.hierarchy.getValue().positions;
- console.log(positions);
sgworld.Creator.SimpleGraphic.remove(entity.id);
-
window.DXTerrainFlattening = sgworld.Creator.createTerrainModifier("鍦板舰鍘嬪钩", positions, 10, {});
}
);
@@ -1368,7 +1366,7 @@
window.sgworld.Command.execute(2, 3, '', (data) => {
data.showPoint = false;
data.showLine = true;
- data.mode = 1;
+ data.mode = 0;
// 寮圭獥鏁版嵁
window.PathAnimationData = {
flyData: data,
@@ -1477,8 +1475,10 @@
this.$refs && this.$refs.maplayer && this.$refs.maplayer.open();
this.$store.state.layerMnage = true;
} else if (this.$store.state.layerMnage == true) {
+ this.$bus.$emit("treeDataCopy","true");
this.$refs && this.$refs.maplayer && this.$refs.maplayer.closeAll();
this.$store.state.layerMnage = false;
+
}
break;
@@ -1519,7 +1519,7 @@
margin: 0;
padding: 0;
overflow-y: auto;
- text-align: center;
+ // text-align: center;
display: flex;
flex-wrap: wrap;
align-content: flex-start;
@@ -1533,6 +1533,7 @@
margin-left: 10px;
margin-top: 10px;
border-radius: 5px;
+ text-align: center;
}
.leftMen_div:hover {
background: rgba(64, 158, 255, 0.4);
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index d7217bc..04d664c 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -405,9 +405,20 @@
handleDrop (draggingNode, dropNode, dropType, ev) {
console.log('tree drop: ', dropNode.label, dropType);
},
- handleCheckChange (data, checked, indeterminate) {
+ handleCheckChange(data, checked, indeterminate) {
+
+
+
if (data.type != 2) return;
+ //鍋氬垽鏂槸鍚︽槸1锛�100涓囪鏀跨晫闈�
+ if(data.layer==window.XZOutlie&&checked){
+ window.ImageLayer3.show=false;
+ }else{
+ window.ImageLayer3.show=true;
+ }
+
+
var std = [];
if (data.layerType == 'WMS') {
var layers_ol = window.map.getAllLayers();
@@ -452,7 +463,7 @@
}
}
},
- setAddLayers (res) {
+ setAddLayers(res) {
if (res.layerType == 'WMS') {
var url = geoServerURl;
if (res.url != null && res.url != undefined) {
@@ -669,7 +680,7 @@
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;
--
Gitblit v1.9.3