From d7920424b7997ed2a39e0fb19462531cfc0ed645 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 13 六月 2023 16:27:02 +0800
Subject: [PATCH] 在线制图基添加础矢量图层；修改地图切换按钮，放大后没有同步
---
src/views/exportMap/index.vue | 4
src/components/mapol.vue | 61 +++++++------------
src/components/mapsdk.vue | 66 +++++++++++-----------
src/views/datamanage/dataStatistics.vue | 13 +++
src/views/datamanage/dataUpdata.vue | 1
5 files changed, 70 insertions(+), 75 deletions(-)
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 3dc2939..8ee1c0e 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -4,6 +4,17 @@
<div
@click="changeMenulayer"
class="changeLayer"
+ style=" position: absolute;
+ bottom: 84px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="搴曞浘鍒囨崲"
@@ -15,6 +26,17 @@
<div
@click="changeMapType"
class="changeMapType"
+ style=" position: absolute;
+ bottom: 52px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="2/3缁村垏鎹�"
@@ -36,7 +58,7 @@
<!-- </div>-->
<div
class="sindagis-map-compass"
- style=" bottom: 130px; right: 35px;"
+ style=" bottom: 130px; right: 40px;"
>
<span
class="left"
@@ -308,10 +330,8 @@
.sindagis-map-compass {
position: absolute;
- right: 50px;
z-index: 5;
-
width: 52px;
height: 54px;
background: url("../assets/img/compass.png") 0% 0% / 266px no-repeat;
@@ -371,30 +391,6 @@
background-size: contain;
}
.changeMapType {
- position: absolute;
- bottom: 52px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
- //position: absolute;
- //bottom: 1%;
- //left: calc(1% + 75px);
- //height: 40px;
- //width: 60px;
- //z-index: 101;
- //display: flex;
- //justify-content: center;
- //align-items: center;
- //// box-shadow: 3px 3px 6px #666;
- //border-radius: 5px;
- //// background: #fff;
- //cursor: pointer;
}
.mapTypeTwo {
width: 100%;
@@ -415,16 +411,5 @@
background-size: contain;
}
.changeLayer {
- position: absolute;
- bottom: 84px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
</style>
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 41278f1..7116c36 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -311,6 +311,17 @@
<div
class="changeTerrain"
@click="changeTerrainLayer"
+ style=" position: absolute;
+ bottom: 84px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="鍦板舰鍒囨崲"
@@ -322,6 +333,17 @@
<div
@click="changeMenulayer"
class="changeLayer"
+ style=" position: absolute;
+ bottom: 116px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="搴曞浘鍒囨崲"
@@ -333,6 +355,17 @@
<div
@click="changeMapType"
class="changeMapType"
+ style=" position: absolute;
+ bottom: 52px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="2/3缁村垏鎹�"
@@ -2159,43 +2192,10 @@
// cursor: pointer;
//}
.changeTerrain {
- position: absolute;
- bottom: 84px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
.changeLayer {
- position: absolute;
- bottom: 116px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
.changeMapType {
- position: absolute;
- bottom: 52px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
//.changeTerrain {
// position: absolute;
diff --git a/src/views/datamanage/dataStatistics.vue b/src/views/datamanage/dataStatistics.vue
index 852dc7b..6441b9b 100644
--- a/src/views/datamanage/dataStatistics.vue
+++ b/src/views/datamanage/dataStatistics.vue
@@ -75,7 +75,7 @@
@click="setCountFlagChange(2)"
>{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item v-show="setDownloadType">
<el-button
icon="el-icon-download"
size="small"
@@ -345,6 +345,7 @@
setCountFlag: false,
option: null,
showDownLoadFlag: false,
+ setDownloadType: false,
};
},
@@ -460,7 +461,6 @@
var m1 = this.tableData[i].m1;
dataAxis.push(m1);
}
- debugger
} else {
for (var i in this.tableData) {
if (this.tableData[i].count > yMax) {
@@ -620,6 +620,7 @@
async setQueryCountData() {
this.tjlxData.region = 'sjccl';
var data, val;
+ this.setDownloadType = true;
if (this.queryData.value == "countServices") {
data = await dataCount_selectCountServices();
@@ -629,10 +630,18 @@
data = await dataCount_selectCountOperates();
} else if (this.queryData.value == "countSizesByType") {
data = await dataCount_countSizesByType();
+ this.setDownloadType = false;
} else if (this.queryData.value == "countSizesByPrj") {
data = await dataCount_countSizesByPrj();
+ this.setDownloadType = false;
}
+
+
+
+
+
+
if (this.queryData.value == 'countServices' || this.queryData.value == 'countOperates') {
this.tjlxData.flag = false;
debugger
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index f86fcf6..738e08a 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -2035,6 +2035,7 @@
//鑷姩鍖归厤纭
async setInsrtWareTable() {
this.loading = true;
+ this.dialogWarehousing = false;
this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..."
if (this.tableWareThree.length != 0) {
for (var i in this.tableWareThree) {
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 0f8b46d..8c74e75 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -383,9 +383,9 @@
for (var i in res) {
var str = res[i];
- if (str.type == 1 && str.icon == 1) {
+ if (str.type == 1) {
val.push(str)
- } else if (str.url != null && str.type == 2 && str.icon == 1) {
+ } else if (str.url != null && str.type == 2 && str.serveType == 'WMS') {
if (str.isShow == 1) {
std.push(str.id)
--
Gitblit v1.9.3