From 20d94ba53e1b8c64754bda684a7350d32be10d99 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 25 Mar 2022 16:22:41 +0800
Subject: [PATCH] 部分更改
---
src/components/map/components/dimension.vue | 75 ++++++++------
src/pcviews/large/index.vue | 189 ++++++++++++++++++++++++++++++++++++-
src/pcviews/specialmap/welcome.vue | 28 ++++-
3 files changed, 247 insertions(+), 45 deletions(-)
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 4f209e9..2fe92f0 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -97,7 +97,9 @@
[114.03954722, 27.62819644, 100],
[114.04006133, 27.628038, 100]
],
- mapCenter: [115.871863, 28.743861, 400.0]
+ mapCenter: [116.35381525,
+ 27.95839468, 400.0]
+ // mapCenter: [115.871863, 28.743861, 400.0]
}
},
computed: {
@@ -207,39 +209,44 @@
// minimumLevel: 19
}))
- // global.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- // url: 'http://www.tdtfz.com/OneMapServer/rest/services/fzsw2019/MapServer/WMTS',
- // layer: 'fzsw2019',
- // style: 'default',
- // tileMatrixSetID: 'default028mm',
- // format: 'image/jpgpng',
- // 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/FZ25DMap/MapServer/WMTS',
+ layer: 'fzsw2019',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/jpgpng',
+ 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.ArcGisMapServerImageryProvider({
+ // url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/FZ25DMap/MapServer',
+ // layer: 'fzsw2019',
+ // }))
// wallLayer = new global.DC.VectorLayer('wallLayer')
// global.viewer.addLayer(wallLayer)
diff --git a/src/pcviews/large/index.vue b/src/pcviews/large/index.vue
index dd121de..36c58ab 100644
--- a/src/pcviews/large/index.vue
+++ b/src/pcviews/large/index.vue
@@ -20,8 +20,8 @@
</div>
<div class="right-container">
<div class="top" id="RightTop"></div>
- <div class="center"></div>
- <div class="bottom"></div>
+ <div class="center" id="RightCenter"></div>
+ <div class="bottom" id="RightBottom"></div>
</div>
</div>
</template>
@@ -43,7 +43,10 @@
this.$nextTick(() => {
this.initPillerOne()
this.initPillerTwo()
- this.ecartsInitCircle()
+ this.initCircle()
+ this.initPlineThree()
+ this.initGather()
+ this.initPlines()
})
},
methods: {
@@ -51,9 +54,24 @@
// 柱形图
// 因为初始化echarts 的时候,需要指定的容器 id='main'
this.$echarts.init(document.getElementById('LeftTop')).setOption({
+ title: {
+ text: '建筑物统计'
+ },
+ grid: {
+ // top: '2%',
+ left: '3%',
+ right: '3%',
+ bottom: '2%',
+ containLabel: true
+ },
xAxis: {
type: 'category',
- data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ nameRotate: 45,
+ data: ['文教建筑', '医疗建筑', '体育建筑', '展览建筑', '商业建筑', '行政建筑', '观演建筑'],
+ axisLabel: {
+ color: '#5ce7ff',
+ rotate: 35
+ }
},
yAxis: {
type: 'value'
@@ -108,7 +126,7 @@
]
})
},
- ecartsInitCircle () {
+ initCircle () {
this.$echarts.init(document.getElementById('LeftCenter')).setOption({
title: {
text: 'Referer of a Website',
@@ -141,6 +159,166 @@
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
+ }
+ ]
+ })
+ },
+ initPlineThree () {
+ let base = new Date(1968, 9, 3)
+ const oneDay = 24 * 3600 * 1000
+ const date = []
+ const data = [Math.random() * 300]
+ for (let i = 1; i < 20000; i++) {
+ var now = new Date((base += oneDay))
+ date.push([now.getFullYear(), now.getMonth() + 1, now.getDate()].join('/'))
+ data.push(Math.round((Math.random() - 0.5) * 20 + data[i - 1]))
+ }
+ this.$echarts.init(document.getElementById('LeftBottom')).setOption({
+ tooltip: {
+ trigger: 'axis',
+ position: function (pt) {
+ return [pt[0], '10%']
+ }
+ },
+ title: {
+ left: 'center',
+ text: 'Large Area Chart'
+ },
+ toolbox: {
+ feature: {
+ dataZoom: {
+ yAxisIndex: 'none'
+ },
+ restore: {},
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: date
+ },
+ yAxis: {
+ type: 'value',
+ boundaryGap: [0, '100%']
+ },
+ dataZoom: [
+ {
+ type: 'inside',
+ start: 0,
+ end: 10
+ },
+ {
+ start: 0,
+ end: 10
+ }
+ ],
+ series: [
+ {
+ name: 'Fake Data',
+ type: 'line',
+ symbol: 'none',
+ sampling: 'lttb',
+ itemStyle: {
+ color: 'rgb(255, 70, 131)'
+ },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: 'rgb(255, 158, 68)'
+ },
+ {
+ offset: 1,
+ color: 'rgb(255, 70, 131)'
+ }
+ ])
+ },
+ data: data
+ }
+ ]
+ })
+ },
+ initGather () {
+ this.$echarts.init(document.getElementById('RightCenter')).setOption({
+ legend: {},
+ tooltip: {},
+ dataset: {
+ source: [
+ ['product', '2015', '2016', '2017'],
+ ['Matcha Latte', 43.3, 85.8, 93.7],
+ ['Milk Tea', 83.1, 73.4, 55.1],
+ ['Cheese Cocoa', 86.4, 65.2, 82.5],
+ ['Walnut Brownie', 72.4, 53.9, 39.1]
+ ]
+ },
+ xAxis: { type: 'category' },
+ yAxis: {},
+ // Declare several bar series, each will be mapped
+ // to a column of dataset.source by default.
+ series: [{ type: 'bar' }, { type: 'bar' }, { type: 'bar' }]
+ })
+ },
+ initPlines () {
+ this.$echarts.init(document.getElementById('RightBottom')).setOption({
+ title: {
+ text: 'Stacked Line'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: 'Email',
+ type: 'line',
+ stack: 'Total',
+ data: [120, 132, 101, 134, 90, 230, 210]
+ },
+ {
+ name: 'Union Ads',
+ type: 'line',
+ stack: 'Total',
+ data: [220, 182, 191, 234, 290, 330, 310]
+ },
+ {
+ name: 'Video Ads',
+ type: 'line',
+ stack: 'Total',
+ data: [150, 232, 201, 154, 190, 330, 410]
+ },
+ {
+ name: 'Direct',
+ type: 'line',
+ stack: 'Total',
+ data: [320, 332, 301, 334, 390, 330, 320]
+ },
+ {
+ name: 'Search Engine',
+ type: 'line',
+ stack: 'Total',
+ data: [820, 932, 901, 934, 1290, 1330, 1320]
}
]
})
@@ -251,7 +429,6 @@
}
.top {
- background: rgba(248, 248, 248, 0.75);
}
.center {
diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
index 3834019..fa80c6d 100644
--- a/src/pcviews/specialmap/welcome.vue
+++ b/src/pcviews/specialmap/welcome.vue
@@ -103,7 +103,8 @@
audioSynth: null,
audioMsg: null,
panoramaShow: false,
- audioImgUrl: '/img/icon/start-video.png'
+ audioImgUrl: '/img/icon/start-video.png',
+ urlDataName: null
}
},
created () { },
@@ -120,10 +121,29 @@
that.audioCourse = false
that.audioImgUrl = '/img/icon/close-video.png'
}
- this.getData()
window.onbeforeunload = e => { // 刷新时弹出提示
this.audioSynth.cancel()
+ }
+ },
+ watch: {
+ $route: {
+ immediate: true,
+ handler (newData, oldData) {
+ if (this.urlDataName == null) {
+ this.urlDataName = this.$route.query.name
+ this.getData()
+ } else if (newData.query.name != this.urlDataName) {
+ this.audioSynth.cancel()
+ global.viewer.removeLayer(pathLayer)
+ global.viewer.removeLayer(pointLayer)
+ this.urlDataName = this.$route.query.name
+ this.getData()
+ }
+ // if (this.$route.query.type) {//需要监听的参数
+ // this.type = this.$route.query.type
+ // }
+ }
}
},
computed: {
@@ -136,7 +156,7 @@
},
methods: {
getData () {
- getWelcome({ hdname: this.$route.query.name }).then((res) => {
+ getWelcome({ hdname: this.urlDataName }).then((res) => {
var result = res.data.data
this.title = result.hdname
this.time = result.time
@@ -249,7 +269,6 @@
}
}
},
-
closeModel () {
global.viewer.removeLayer(pathLayer)
global.viewer.removeLayer(pointLayer)
@@ -261,7 +280,6 @@
this.$store.dispatch('delVisitedViews', this.$route)
this.$router.push('/pcLayout/default')
},
-
panoramaPlay () {
this.panoramaShow = true
this.panoramaUrl = this.panoramaUrlOne
--
Gitblit v1.9.3