From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/riskLevelManage/fourColorMap/oneHundredAndThirty/index.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/fourColorMap/oneHundredAndThirty/index.vue b/src/views/doublePreventAction/riskLevelManage/fourColorMap/oneHundredAndThirty/index.vue
index 4920741..503dffc 100644
--- a/src/views/doublePreventAction/riskLevelManage/fourColorMap/oneHundredAndThirty/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/fourColorMap/oneHundredAndThirty/index.vue
@@ -1,8 +1,8 @@
<template>
-
+
<div class="map-layout">
<Map @init="init" :option="option" v-if="option" />
- <Tab v-if="loaded" />
+ <Tab v-if="loaded" :type='type' :colorMapList='colorMapList'/>
</div>
@@ -16,7 +16,7 @@
getCatesian3FromPX,
Cartesian3_to_WGS84,
} from '../../../../../components/Map/libs/Point';
-
+ import { getMap } from '@/api/fourColorMap'
export default {
name: 'App',
components: {
@@ -31,6 +31,8 @@
option: null,
heatLayer: null,
shineishiwai: true,
+ colorMapList:[],
+ type:2,
};
},
mounted() {
@@ -71,7 +73,7 @@
map.addModel({
link: 'http://222.92.213.22:8006/b3dm130/tileset.json',
- name: '130吨模型图',
+ name: '130万吨模型图',
callback: tileset => {
var boundingSphere = tileset.boundingSphere;
var cartographic = Cesium.Cartographic.fromCartesian(
@@ -115,9 +117,26 @@
testLoadedData() {
const map = global.map;
if (!map) return;
- $.get('./public/data/plots_namisuo.geojson', res => {
- map.loadGeoJSON(res);
- });
+ let params = {}
+ params['eType'] = 2
+ getMap(params).then(res =>{
+ this.colorMapList = res.data.result
+ const list = res.data.result.map(item =>{
+ return{
+ type:item.type,
+ geometry:JSON.parse(item.geometry),
+ properties:JSON.parse(item.properties)
+ }
+ })
+ const fourMapList = {
+ "type": "FeatureCollection",
+ "features": list
+ }
+ map.loadGeoJSON(fourMapList)
+ })
+ // $.get('./public/data/plots_namisuo.geojson', res => {
+ // map.loadGeoJSON(res);
+ // });
},
initEvent(map) {
let popup = null;
--
Gitblit v1.9.2