Commit 2d64580a authored by caicaicai's avatar caicaicai

修改

parent e9eb04be
...@@ -2,10 +2,10 @@ ENV = 'development' ...@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000' #VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.0.111:8001' VUE_APP_BASE_API = 'http://192.168.0.110:8001'
VUE_APP_WS_API = 'ws://localhost:8000' VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_LOCAL_API = 'http://192.168.0.111:8001' VUE_APP_LOCAL_API = 'http://192.168.0.110:8001'
VUE_APP_LOCAL_API2 = 'http://192.168.0.111:8001' VUE_APP_LOCAL_API2 = 'http://192.168.0.110:8001'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
getCoordinate() { getCoordinate() {
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){
...@@ -155,20 +155,24 @@ export default { ...@@ -155,20 +155,24 @@ export default {
that.zuobianData = data1 that.zuobianData = data1
//console.log("zuobianData",that.zuobianData); //console.log("zuobianData",that.zuobianData);
//console.log("weilanName",that.weilanName); //console.log("weilanName",that.weilanName);
if (this.appendToBody) {
document.body.appendChild(this.$el)
}
if (this.mapKey) {
this.initMars3d(this.options)
} else {
mars3d.Resource.fetchJson({ url: this.url }).then((data) => {
this.initMars3d(data.map3d)// 构建地图
})
}
} }
}) })
this.$nextTick(()=>{
if (this.appendToBody) {
document.body.appendChild(this.$el)
}
if (this.mapKey) {
this.initMars3d(this.options)
} else {
mars3d.Resource.fetchJson({ url: this.url }).then((data) => {
this.initMars3d(data.map3d)// 构建地图
})
}
})
}, },
//上传围栏数据 //上传围栏数据
uploaded(){ uploaded(){
...@@ -246,18 +250,18 @@ export default { ...@@ -246,18 +250,18 @@ export default {
}) })
//创建矢量数据图层2 //创建矢量数据图层2
var graphicLayer1 = new mars3d.layer.GraphicLayer(); // var graphicLayer1 = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer1); // map.addLayer(graphicLayer1);
var item = `<table style="width: auto;"> // var item = `<table style="width: auto;">
<tr> // <tr>
<th scope="col" colspan="2" style="text-align:center;font-size:15px;">卡车号码:鲁K12345</th> // <th scope="col" colspan="2" style="text-align:center;font-size:15px;">卡车号码:鲁K12345</th>
</tr> // </tr>
<tr> // <tr>
<td>名称:卡车一</td> // <td>名称:卡车一</td>
</tr> // </tr>
</table>`; // </table>`;
initGraphicManager(graphicLayer1,item); // initGraphicManager(graphicLayer1,item);
this.addGraphic_02(graphicLayer1,this.persons); // this.addGraphic_02(graphicLayer1,this.persons);
// 抛出事件 // 抛出事件
this.$emit('onload', map) this.$emit('onload', map)
......
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