From 6f5331c9ba8b6ba44b45b6a89d7c7c813ab8052d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 08 Jul 2022 20:28:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/remote/index.vue | 128 +++++++++++++++---------------------------
1 files changed, 46 insertions(+), 82 deletions(-)
diff --git a/src/components/remote/index.vue b/src/components/remote/index.vue
index 90e6af9..505957a 100644
--- a/src/components/remote/index.vue
+++ b/src/components/remote/index.vue
@@ -1,7 +1,15 @@
/* eslint-disable camelcase */
<template>
<div style="height: 100%; width: 100%; position: relative;">
- <div class="location-box">
+ <div v-show="SelectTimeFlag">
+ <select-time ref="leftRoller" :leftOrRight="'left'" class="l-time"></select-time>
+ </div>
+
+ <div v-show="SelectTimeFlag">
+ <select-time ref="rightRoller" :leftOrRight="'right'" class="r-time"></select-time>
+ </div>
+
+ <div class="location-box" v-show="!rollerCloseShow && !screenShow">
<el-input
placeholder="请输入地点/经纬度：113.25，30.53"
v-model="location"
@@ -12,21 +20,21 @@
</div>
<div class="tool-box">
- <div class="measure" v-show="screenShow">
+ <!-- <div class="measure" v-show="screenShow">
<div class="btn">
<span>
<i class="el-icon-time"></i>
</span>
标注
</div>
- </div>
+ </div>-->
<div class="measure" v-show="!screenShow">
- <div class="btn">
+ <div class="btn" @click="deactivate">
<span>
<i class="el-icon-time"></i>
</span>
- 标注
+ 清除
</div>
<div class="line"></div>
<div class="btn" @click="distanceSurface">
@@ -45,7 +53,7 @@
</div>
<div v-show="!rollerCloseShow && !screenShow" class="func">
- <div class="btn">
+ <div class="btn" style="color: #fff; background: #469CF3; height: 100%;">
<span>
<i class="el-icon-time"></i>
</span>
@@ -95,6 +103,7 @@
data () {
return {
+ SelectTimeFlag: false,
rollerCloseShow: false,
screenShow: false,
location: ''
@@ -138,76 +147,6 @@
)
// http://arcgis.jxpskj.com:6080/arcgis/rest/services/nanchengdom/MapServer
-
- global.viewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/nanchengyjjddom/MapServer/WMTS',
- // url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/nanchengdom/MapServer/WMTS',
- layer: 'nanchengyjjddom',
- style: 'default',
- tileMatrixSetID: 'default028mm',
- format: 'image/png',
- tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
- maximumLevel: 19,
- tileMatrixLabels: [
- '0',
- '1',
- '2',
- '3',
- '4',
- '5',
- '6',
- '7',
- '8',
- '9',
- '10',
- '11',
- '12',
- '13',
- '14',
- '15',
- '16',
- '17',
- '18',
- '19'
- ]
- })
- )
-
- global.viewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/nanchengdom/MapServer/WMTS',
- // url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/nanchengdom/MapServer/WMTS',
- layer: 'nanchengdom',
- style: 'default',
- tileMatrixSetID: 'default028mm',
- format: 'image/png',
- tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
- maximumLevel: 19,
- tileMatrixLabels: [
- '0',
- '1',
- '2',
- '3',
- '4',
- '5',
- '6',
- '7',
- '8',
- '9',
- '10',
- '11',
- '12',
- '13',
- '14',
- '15',
- '16',
- '17',
- '18',
- '19'
- ]
- })
- )
// 矢量电子
// global.viewer.imageryLayers.addImageryProvider(
@@ -354,12 +293,13 @@
}
},
- closeSplitScreen () {
- this.screenShow = false
- },
-
splitScreen () {
this.screenShow = true
+ this.deactivate()
+ },
+
+ closeSplitScreen () {
+ this.screenShow = false
},
distanceSurface () {
@@ -376,19 +316,27 @@
key: 'e9533f5acb2ac470b07f406a4d24b4f0'
})
global.viewer.mapSplit.enable = true
-
- global.viewer.mapSplit.addBaseLayer(baselayerElc)
} else {
global.viewer.mapSplit.enable = true
}
num++
this.rollerCloseShow = true
+ this.SelectTimeFlag = true
+ this.deactivate()
+ this.$refs.leftRoller.init()
+ this.$refs.rightRoller.init()
},
closeRollerShutters () {
global.viewer.mapSplit.enable = false
this.rollerCloseShow = false
+ this.SelectTimeFlag = false
+
+ this.$refs.leftRoller.clearLayer()
+ this.$refs.rightRoller.clearLayer()
+
+ // global.viewer.imageryLayers.removeAll()
}
}
}
@@ -415,6 +363,22 @@
width: 320px;
}
+.l-time {
+ position: absolute;
+ top: 30px;
+ left: 25%;
+ transform: translate(-50%, 0);
+ z-index: 99;
+}
+
+.r-time {
+ position: absolute;
+ top: 30px;
+ right: 25%;
+ transform: translate(50%, 0);
+ z-index: 99;
+}
+
.tool-box {
display: flex;
justify-content: space-between;
--
Gitblit v1.9.3