Commit 55c868a8 authored by caicaicai's avatar caicaicai

修改

parent ce936dcf
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
<div :id="`mars3d-container${mapKey}`" <div :id="`mars3d-container${mapKey}`"
:class="['mars3d-container', customClass, { 'mars3d-container-compare-rh' : compare }]"></div> :class="['mars3d-container', customClass, { 'mars3d-container-compare-rh' : compare }]"></div>
<div class="infoview"> <!-- <div class="infoview">
<!-- <el-input id="btnStartDraw" type="button" class="btn btn-primary" value="设置围栏" title="在图上绘制矢量数据" /> -->
<el-button type="primary" @click="btnStartDraw()">设置围栏</el-button> <el-button type="primary" @click="btnStartDraw()">设置围栏</el-button>
<el-button type="primary" @click="uploaded()">上传围栏</el-button> <el-button type="primary" @click="uploaded()">上传围栏</el-button>
<div style="display: inline-block;color:red;font-weight:bolder;">每次只允许上传一个围栏,并且围栏必须是封闭图形</div> <div style="display: inline-block;color:red;font-weight:bolder;">每次只允许上传一个围栏,并且围栏必须是封闭图形</div>
</div> </div> -->
</div> </div>
...@@ -99,7 +98,7 @@ export default { ...@@ -99,7 +98,7 @@ export default {
let that = this; let that = this;
HttpReq.truckDispatching.screenMapSetUpQuery({size:9999}).then((res) => { HttpReq.truckDispatching.screenMapSetUpQuery({size:9999}).then((res) => {
if(true){; if(true){;
console.log(res); //console.log(res);
let data1 = []; let data1 = [];
for(let key in res){ for(let key in res){
that.weilanName.push(key); that.weilanName.push(key);
...@@ -114,7 +113,8 @@ export default { ...@@ -114,7 +113,8 @@ export default {
data1.push(arrays) data1.push(arrays)
} }
that.zuobianData = data1 that.zuobianData = data1
console.log("zuobianData",that.zuobianData); //console.log("zuobianData",that.zuobianData);
//console.log("weilanName",that.weilanName);
if (this.appendToBody) { if (this.appendToBody) {
document.body.appendChild(this.$el) document.body.appendChild(this.$el)
...@@ -205,12 +205,6 @@ export default { ...@@ -205,12 +205,6 @@ export default {
that.addGraphic_01(graphicLayer,item,that.weilanName[index]); that.addGraphic_01(graphicLayer,item,that.weilanName[index]);
}) })
//创建矢量数据图层1
// var graphicLayer = new mars3d.layer.GraphicLayer();
// map.addLayer(graphicLayer);
// initLayerManager(graphicLayer);
// this.addGraphic_01(graphicLayer,this.persons);
//创建矢量数据图层2 //创建矢量数据图层2
var graphicLayer1 = new mars3d.layer.GraphicLayer(); var graphicLayer1 = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer1); map.addLayer(graphicLayer1);
...@@ -226,7 +220,7 @@ export default { ...@@ -226,7 +220,7 @@ export default {
</tr> </tr>
</table>`; </table>`;
initGraphicManager(graphicLayer1,item); initGraphicManager(graphicLayer1,item);
//this.addGraphic_02(graphicLayer1,this.coordinates); this.addGraphic_02(graphicLayer1,this.persons);
// 抛出事件 // 抛出事件
this.$emit('onload', map) this.$emit('onload', map)
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
//在图层级处理一些事物 //在图层级处理一些事物
import { Tools, HttpReq, CAMap} from '@/assets/js/common.js'; import { Tools, HttpReq, CAMap} from '@/assets/js/common.js';
import 'mars3d/dist/mars3d.css'
import * as mars3d from 'mars3d'
import $ from 'jquery'
export function initLayerManager(graphicLayer,index) { export function initLayerManager(graphicLayer,index) {
let rowName = index; let rowName = index;
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<dataAnalysis ref="dataAnalysisMethod" v-show="selectModule == 'dataAnalysis'"/> <dataAnalysis ref="dataAnalysisMethod" v-show="selectModule == 'dataAnalysis'"/>
<carSpecificInfor ref="carSpecificInforMethod" v-show="selectModule == 'carSpecificInfor'"/> <carSpecificInfor ref="carSpecificInforMethod" v-show="selectModule == 'carSpecificInfor'"/>
</div> </div>
<div class="carExample" @click="showSpecificInforFn()"> <!-- <div class="carExample" @click="showSpecificInforFn()">
<span class="el-icon-location"></span> <span class="el-icon-location"></span>
</div> </div> -->
<div id="centerDiv" class="mapcontainer"> <div id="centerDiv" class="mapcontainer">
<mars3dViewerMap :url="configUrl" @onload="onMapload"/> <mars3dViewerMap :url="configUrl" @onload="onMapload"/>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment