From 44517cf9375441d8a84808ca52d7ce474d8e0b17 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 15 四月 2023 15:21:28 +0800
Subject: [PATCH] 地图更改为本地服务，柱状图效果更改
---
src/components/Screen/bottom.vue | 39 ++++++---
src/assets/img/imageLayer/dixing.png | 0
src/components/mapol.vue | 13 ++-
public/config/config.js | 6 +
src/assets/img/imageLayer/25dizhi.png | 0
src/views/Synthesis/LeftMenu.vue | 35 ++++++++
src/components/mapsdk.vue | 33 ++++++++
src/components/MapView/mapSpacePop.vue | 16 +++
src/components/Screen/mapsdk.vue | 34 +++++++-
src/views/Tools/AddOnlineMap.vue | 11 --
10 files changed, 153 insertions(+), 34 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 6363b4a..39af600 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -43,6 +43,12 @@
fly: 'http://' + iisHost + '/LFData/fly/' + (isWeb ? "lfgd.fly" : "lfgd_127.fly"),
//
positionBtn: [],
+ //褰卞儚
+ baseUrl: "http://" + iisHost + "/LFData/2d/tiles/img/{z}/{x}/{y}.png",
+ //鐭㈤噺
+ baseUrl_sl: 'http://' + iisHost + '/LFData/2d/tiles/vec/{z}/{x}/{y}.png',
+ //鍦板舰
+ baseUrl_yx: 'http://' + iisHost + '/LFData/2d/tiles/ter/{z}/{x}/{y}.png'
};
//宸ョ偣淇℃伅琛�
var workSite = [
diff --git a/src/assets/img/imageLayer/25dizhi.png b/src/assets/img/imageLayer/25dizhi.png
new file mode 100644
index 0000000..7bd589d
--- /dev/null
+++ b/src/assets/img/imageLayer/25dizhi.png
Binary files differ
diff --git a/src/assets/img/imageLayer/dixing.png b/src/assets/img/imageLayer/dixing.png
new file mode 100644
index 0000000..88fa24c
--- /dev/null
+++ b/src/assets/img/imageLayer/dixing.png
Binary files differ
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 87b0d48..d20a926 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -359,7 +359,9 @@
{ 'name': '鍗电煶', 'color': 'rgba(54,83,173,1)' },
{ 'name': '娉ュ博', 'color': 'rgba(47,30,13,1)' },
{ 'name': '缁嗙爞', 'color': 'rgba(93,88,15,1)' },
- { 'name': '涓爞', 'color': 'rgba(164,140,21,1)' }
+ { 'name': '涓爞', 'color': 'rgba(164,140,21,1)' },
+ { 'name': '娣ゆ偿璐ㄥ湡', 'color': 'rgba(75,74,78,1)' },
+ { 'name': '鍏朵粬', 'color': 'rgba(225,225,225,1)' },
]
}
},
@@ -909,6 +911,14 @@
return res
}
})
+ console.log(1, col)
+ if (col.length == 0) {
+ col = outlineList.filter((ste) => {
+ if (ste.name == '鍏朵粬') {
+ return res
+ }
+ })
+ }
line = col[0].color
var height = num - std[i].botdepth
@@ -1036,7 +1046,9 @@
{ 'name': '鍗电煶', 'color': [54, 83, 173, 1] },
{ 'name': '娉ュ博', 'color': [47, 30, 13, 1] },
{ 'name': '缁嗙爞', 'color': [93, 88, 15, 1] },
- { 'name': '涓爞', 'color': [164, 140, 21, 1] }
+ { 'name': '涓爞', 'color': [164, 140, 21, 1] },
+ { 'name': '娣ゆ偿璐ㄥ湡', 'color': [75, 74, 78, 1] },
+ { 'name': '鍏朵粬', 'color': [225, 225, 225, 1] }
]
for (var i = 0; i < list.length; i++) {
var out_color = list[i].color
diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index aa111f0..a8b94da 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -228,6 +228,7 @@
methods: {
ChangeBaseLayer(name) {
this.currYX = name
+ Viewer.imageryLayers._layers[2].show = false
Viewer.imageryLayers._layers[1].show = false
// Viewer.imageryLayers._layers[2].show = false
// Viewer.imageryLayers._layers[3].show = false
@@ -253,17 +254,30 @@
// true,
// ""
// )
- var urls = "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=";
- var tokne = "94a34772eb88317fcbf8428e10448561"
- yunxuanLayer = Viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider({
- url: urls + tokne,
- layer: "tdtImgLayer",
- style: "default",
- format: "image/jpeg",
- tileMatrixSetID: "GoogleMapsCompatible",
- }))
- Viewer.imageryLayers.lowerToBottom(yunxuanLayer);//灏嗗浘灞傜Щ鍒版渶搴曞眰
+ // var urls = "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=";
+ // var tokne = "94a34772eb88317fcbf8428e10448561"
+ // yunxuanLayer = Viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider({
+ // url: urls + tokne,
+ // layer: "tdtImgLayer",
+ // style: "default",
+ // format: "image/jpeg",
+ // tileMatrixSetID: "GoogleMapsCompatible",
+ // }))
+
+ var baseUrl_yx = window.sceneConfig.baseUrl_yx;
+ if (baseUrl_yx.indexOf('{host}') > -1) {
+ baseUrl_yx = baseUrl_yx.replace("{host}", iisHost)
+ }
+ debugger
+ yunxuanLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: baseUrl_yx,
+ maximumLevel: 22,
+ })
+ );
+
+ Viewer.imageryLayers.lowerToBottom(yunxuanLayer);//灏嗗浘灞傜Щ鍒版渶搴曞眰
Viewer.imageryLayers.raise(yunxuanLayer);//灏嗗浘灞備笂绉讳竴灞�
}
@@ -271,11 +285,10 @@
break
case "褰卞儚鍥�":
- // Viewer.imageryLayers._layers[2].show = true
-
+ Viewer.imageryLayers._layers[1].show = true
break
case "娉ㄨ鍥�":
- Viewer.imageryLayers._layers[1].show = true
+ Viewer.imageryLayers._layers[2].show = true
break
default:
diff --git a/src/components/Screen/mapsdk.vue b/src/components/Screen/mapsdk.vue
index 219af16..e509d41 100644
--- a/src/components/Screen/mapsdk.vue
+++ b/src/components/Screen/mapsdk.vue
@@ -67,12 +67,38 @@
})
}, 1000);
- Viewer.imageryLayers.addImageryProvider(
+ // Viewer.imageryLayers.addImageryProvider(
+ // new Cesium.UrlTemplateImageryProvider({
+ // url: gaoDeBaseUrl[0].url,
+ // })
+ // )
+ //
+
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
- url: gaoDeBaseUrl[0].url,
+ url: base_ulr,
+ maximumLevel: 22,
})
- )
- Viewer.imageryLayers._layers[1].show = false
+ );
+
+ var base_ulr_sl = window.sceneConfig.baseUrl_sl;
+ if (base_ulr_sl.indexOf('{host}') > -1) {
+ base_ulr_sl = base_ulr_sl.replace("{host}", iisHost)
+ }
+
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr_sl,
+ maximumLevel: 22,
+ })
+ );
+
+ Viewer.imageryLayers._layers[2].show = false
// Viewer.imageryLayers.addImageryProvider(
// new Cesium.UrlTemplateImageryProvider({
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 51876c4..ad45c74 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -121,11 +121,14 @@
]),
interactions: defaultInteractions().extend([new DragRotateAndZoom()]),
})
-
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
window.olBaseMapLayer = new TileLayer({
title: "楂樺痉鍦板浘",
source: new XYZ({
- url: gaoDeBaseUrl[1].url,
+ url: base_ulr,
wrapX: false
})
});
@@ -362,7 +365,7 @@
justify-content: center;
align-items: center;
cursor: pointer;
- border: 1px solid rgba(255,255,255,.5);
+ border: 1px solid rgba(255, 255, 255, 0.5);
//position: absolute;
//bottom: 1%;
//left: calc(1% + 75px);
@@ -395,7 +398,7 @@
background-repeat: no-repeat;
background-size: contain;
}
-.changeLayer{
+.changeLayer {
position: absolute;
bottom: 84px;
right: 46px;
@@ -406,6 +409,6 @@
justify-content: center;
align-items: center;
cursor: pointer;
- border: 1px solid rgba(255,255,255,.5);
+ border: 1px solid rgba(255, 255, 255, 0.5);
}
</style>
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 999a8b7..659caff 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -409,6 +409,20 @@
</div>
</td>
</tr>
+ <tr>
+ <td>娣ゆ偿璐ㄥ湡</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(75,74,78,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>鍏朵粬</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(225,225,225,1)">
+ </div>
+ </td>
+ </tr>
</table>
</el-card>
</div>
@@ -935,6 +949,23 @@
//寮�鍚繁搴︽娴�
// sgworld.Analysis.depthTestAgainstTerrain(true)
Viewer.scene.globe.depthTestAgainstTerrain = true;
+
+
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ maximumLevel: 22,
+ })
+ );
+
+
+
+
var option = {
url: window.sceneConfig.SGUrl,
@@ -1495,7 +1526,7 @@
return
}
if (res.result.length <= 0) {
- this.$message.error('鏆傛棤闄勪欢');
+ this.$message('鏆傛棤闄勪欢');
return
}
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 3f79a80..d55d280 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -2689,6 +2689,34 @@
this.getTableData()
}
},
+ //鏍煎紡鍖栨椂闂�
+ format(shijianchuo) {
+ //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return (
+ y +
+ '-' +
+ this.add0(m) +
+ '-' +
+ this.add0(d) +
+ ' ' +
+ h +
+ ':' +
+ mm +
+ ':' +
+ s
+ );
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? '0' + m : m;
+ },
async getTableData() {
this.tableData = []
const data = await dataQuery_selectByGid(this.$store.state.pickoption)
@@ -2702,6 +2730,13 @@
valste.verid = valste.verName;
valste.createuser = valste.createName;
valste.updateuser = valste.updateName;
+ if (valste.createtime) {
+ valste.createtime = this.format(valste.createtime)
+ }
+ if (valste.updatetime) {
+ valste.updatetime = this.format(valste.updatetime)
+ }
+
for (var j in this.optionx) {
if (
this.optionx[j].domainNa != null &&
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index f749f66..d269f9d 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -200,12 +200,12 @@
},
{
name: "鍦板舰",
- image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
+ image: require("../../assets/img/imageLayer/dixing.png"),
urls: "http://{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
},
{
name: "1:20涓囧尯鍩熷湴璐ㄥ浘",
- image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
+ image: require("../../assets/img/imageLayer/25dizhi.png"),
urls: "http://{host}/LFData/2d/tiles/20w_qydz/{z}/{x}/{y}.png",
},
],
@@ -335,13 +335,6 @@
Viewer.imageryLayers.raise(window.BaseMapLayer);//灏嗗浘灞備笂绉讳竴灞�
},
-
-
-
-
-
-
-
// 娣诲姞鏁版嵁
addData() {
if (this.data.urls && this.data.sourceType) {
--
Gitblit v1.9.3