|
@@ -472,7 +472,7 @@
|
|
单位分布
|
|
单位分布
|
|
</div>
|
|
</div>
|
|
<el-image
|
|
<el-image
|
|
- @click="showFull('mapData')"
|
|
|
|
|
|
+ @click="showFull('chart-earth')"
|
|
style="width: 20px; height: 20px; margin-right:6px; margin-top: -10px;"
|
|
style="width: 20px; height: 20px; margin-right:6px; margin-top: -10px;"
|
|
:src="require('../assets/img/iconMore.svg')"
|
|
:src="require('../assets/img/iconMore.svg')"
|
|
fit="contain"
|
|
fit="contain"
|
|
@@ -481,9 +481,9 @@
|
|
</el-image>
|
|
</el-image>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <div v-if="!echartMapFlag" id="mapData" style="height:260px; width:100%; top:-20px;"></div>
|
|
|
|
- <div v-if="echartMapFlag" class="tempalte_no_data" style="height:86%;"> 暂无数据</div>
|
|
|
|
-
|
|
|
|
|
|
+ <!-- <div v-if="!echartMapFlag" id="mapData" style="height:260px; width:100%; top:-20px;"></div>
|
|
|
|
+ <div v-if="echartMapFlag" class="tempalte_no_data" style="height:86%;"> 暂无数据</div> -->
|
|
|
|
+ <div id="chart-earth" style="height:260px; width:100%; top:-20px;"></div>
|
|
<div class="center_no_data" v-if="false">
|
|
<div class="center_no_data" v-if="false">
|
|
<el-image
|
|
<el-image
|
|
style="width: 100px; height: 100px; margin-right:6px;"
|
|
style="width: 100px; height: 100px; margin-right:6px;"
|
|
@@ -713,7 +713,7 @@ import { request } from '../utils/request';
|
|
var uploadedDataURL = require('../../public/json/taiyuan.json')
|
|
var uploadedDataURL = require('../../public/json/taiyuan.json')
|
|
import './taskScreen.css'
|
|
import './taskScreen.css'
|
|
import Videojs from "video.js"; // 引入Videojs
|
|
import Videojs from "video.js"; // 引入Videojs
|
|
-
|
|
|
|
|
|
+import 'echarts-gl';
|
|
export default {
|
|
export default {
|
|
components:{
|
|
components:{
|
|
myFlylineChartEnhanced,
|
|
myFlylineChartEnhanced,
|
|
@@ -737,6 +737,7 @@ export default {
|
|
websocketOrder: null, //建立的连接
|
|
websocketOrder: null, //建立的连接
|
|
|
|
|
|
updatekey:'1',
|
|
updatekey:'1',
|
|
|
|
+ myChart:'',
|
|
myChart1:'',
|
|
myChart1:'',
|
|
myChart2:'',
|
|
myChart2:'',
|
|
myChart3:'',
|
|
myChart3:'',
|
|
@@ -806,7 +807,83 @@ export default {
|
|
// window.location.href = "/taskScreen"
|
|
// window.location.href = "/taskScreen"
|
|
this.$router.push("/taskScreen")
|
|
this.$router.push("/taskScreen")
|
|
},
|
|
},
|
|
|
|
+ getEarth(){
|
|
|
|
+ // 获取DOM容器
|
|
|
|
+ const chartContainer = document.getElementById('chart-earth');
|
|
|
|
+ // 初始化ECharts图表
|
|
|
|
+ this.myChart = echarts.init(chartContainer);
|
|
|
|
+ var datas = [];
|
|
|
|
+ console.log('this.taiyuanMapDatas :>> ', this.taiyuanMapData);
|
|
|
|
+ for (let item in this.taiYuanMapData){
|
|
|
|
+ var array = this.taiYuanMapData[item]
|
|
|
|
+ let data = {
|
|
|
|
+ value:[array[0],array[1],0],
|
|
|
|
+ name:item
|
|
|
|
+ }
|
|
|
|
+ console.log('data :>> ', data);
|
|
|
|
+ datas.push(data)
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ console.log('datas :>> ', datas);
|
|
|
|
+
|
|
|
|
+ // 设置图表的配置项和数据
|
|
|
|
+ const option = {
|
|
|
|
+ backgroundColor: '#000',
|
|
|
|
+
|
|
|
|
+ globe: {
|
|
|
|
+ baseTexture: require('../assets/img/earth.jpg'),
|
|
|
|
+ heightTexture: require('../assets/img/bathymetry_bw_composite_4k.jpg'),
|
|
|
|
+ displacementScale: 0.1,
|
|
|
|
+ shading: 'lambert',
|
|
|
|
+ environment: require('../assets/img/starfield.jpg'),
|
|
|
|
+ viewControl: {
|
|
|
|
+ distance: 1, // 地球与相机之间的距离
|
|
|
|
+ targetCoord: [112.548879, 37.87059], // 设置地球的目标位置为太原市的经纬度
|
|
|
|
+ autoRotate: false, // 自动旋转地球
|
|
|
|
|
|
|
|
+ },
|
|
|
|
+ light: {
|
|
|
|
+ ambient: {
|
|
|
|
+ intensity: 0.1
|
|
|
|
+ },
|
|
|
|
+ main: {
|
|
|
|
+ intensity: 1.5
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ layers: [
|
|
|
|
+ {
|
|
|
|
+ type: 'blend',
|
|
|
|
+ blendTo: 'emission',
|
|
|
|
+ texture: require('../assets/img/night.jpg')
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ type: 'overlay',
|
|
|
|
+ texture: require('../assets/img/clouds.png'),
|
|
|
|
+ shading: 'lambert',
|
|
|
|
+ distance: 5
|
|
|
|
+ }
|
|
|
|
+ ]
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ series: [ {
|
|
|
|
+ type: 'scatter3D',
|
|
|
|
+ symbolSize: 10,
|
|
|
|
+ coordinateSystem: 'globe',
|
|
|
|
+ data: datas,
|
|
|
|
+ itemStyle: {
|
|
|
|
+ color: 'red' // 设置标记点的颜色
|
|
|
|
+ },
|
|
|
|
+ label: {
|
|
|
|
+ show: true,
|
|
|
|
+ formatter: '{b}', // 设置标记点的文本显示为数据的名称
|
|
|
|
+ position: 'top'
|
|
|
|
+ }
|
|
|
|
+ }]
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ // 使用配置项和数据显示图表
|
|
|
|
+ this.myChart.setOption(option);
|
|
|
|
+ },
|
|
// 获取单位名称
|
|
// 获取单位名称
|
|
getName(list, id) {
|
|
getName(list, id) {
|
|
var tmp = list.find(k => k["value"] == id)
|
|
var tmp = list.find(k => k["value"] == id)
|
|
@@ -1203,6 +1280,7 @@ export default {
|
|
|
|
|
|
// 建立指令websocket 链接
|
|
// 建立指令websocket 链接
|
|
this.initInstructWebsoket()
|
|
this.initInstructWebsoket()
|
|
|
|
+ console.log('this.taiYuanMapData :>> ', this.taiYuanMapData);
|
|
},
|
|
},
|
|
|
|
|
|
// 获取任务地图的信息
|
|
// 获取任务地图的信息
|
|
@@ -2592,6 +2670,10 @@ export default {
|
|
this.getAllSystems()
|
|
this.getAllSystems()
|
|
// 建立任务的weksocket链接
|
|
// 建立任务的weksocket链接
|
|
this.initWebsoket()
|
|
this.initWebsoket()
|
|
|
|
+
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ this.getEarth();
|
|
|
|
+ }, 3000);
|
|
},
|
|
},
|
|
beforeDestroy() {
|
|
beforeDestroy() {
|
|
if(this.playerList.length){
|
|
if(this.playerList.length){
|