Commit 3dca2ea3 authored by xxx's avatar xxx

1

parent 88eb517e
{ {
"map3d": { "map3d": {
"scene": { "scene": {
"center": {"lat":34.52912,"lng":117.662855,"alt":1000,"heading":360,"pitch":-90}, "center": {"lat":37.4890,"lng":122.04700,"alt":1000,"heading":360,"pitch":-90},
"scene3DOnly": false, "scene3DOnly": false,
"shadows": false, "shadows": false,
"removeDblClick": true, "removeDblClick": true,
......
...@@ -75,9 +75,9 @@ export default { ...@@ -75,9 +75,9 @@ export default {
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
//删除路径 //删除路径
this.$parent.zhixinglujing(false); //this.$parent.zhixinglujing(false);
this.$parent.zhixinglujing2(true); //this.$parent.zhixinglujing2(true);
//查询指定目的地围栏以及判该车是否在围栏里 //查询指定目的地围栏以及判该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => { httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = []; let weilanArr1 = [];
resSon2[this.carDestination].forEach((item,index)=>{ resSon2[this.carDestination].forEach((item,index)=>{
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
} }
}); });
//执行路径 //执行路径
this.$parent.zhixinglujing(true); //this.$parent.zhixinglujing(true);
}, },
//拒绝派单 //拒绝派单
refusePaidanFn(){ refusePaidanFn(){
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
} }
}); });
httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => { httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
this.$parent.zhixinglujing2(false); //this.$parent.zhixinglujing2(false);
}); });
} }
......
...@@ -117,15 +117,14 @@ export default { ...@@ -117,15 +117,14 @@ export default {
//地图图片 //地图图片
configUrl: basePathUrl + 'config/config.json', configUrl: basePathUrl + 'config/config.json',
notifyPromise:Promise.resolve(), notifyPromise:Promise.resolve(),
systemTitle:'莲花山卡车调度系统卡车终端', systemTitle:'卡车调度系统卡车终端',
orderReceiving:'开始接单', orderReceiving:'开始接单',
carName:'4001', personalName:'',
personalName:'李三',
zongTimer1:null, zongTimer1:null,
zongTimer2:null, zongTimer2:null,
currentTime:'', currentTime:'',
selectFunction:0, selectFunction:0,
carnumber:'鲁k123456', carnumber:'',
userName1:'', userName1:'',
carclass:'', carclass:'',
daizhangCar:[], daizhangCar:[],
...@@ -165,12 +164,12 @@ export default { ...@@ -165,12 +164,12 @@ export default {
if(res1.code == 200){ if(res1.code == 200){
res1.data.forEach((item,index) => { res1.data.forEach((item,index) => {
this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{ this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{
// this.$notify({ this.$notify({
// title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警', title: (item.type == 1 ? "限入" : item.type == 2 ? '限出' : (item.type == 3 && this.carclass != '铲车') ? '无故停车' : item.type == 4 ? '防碰撞' : '') + (item.areaName == undefined ? '' : item.areaName) + '报警',
// type: 'warning', type: 'warning',
// duration: 10000, duration: 10000,
// dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
// }); });
}); });
}); });
} }
...@@ -202,7 +201,7 @@ export default { ...@@ -202,7 +201,7 @@ export default {
this.carclass = res.data.content[0].carclass; this.carclass = res.data.content[0].carclass;
if(this.carclass == '铲车'){ if(this.carclass == '铲车'){
this.loadData1(); this.loadData1();
this.systemTitle = '莲花山卡车调度系统铲车终端'; this.systemTitle = '卡车调度系统铲车终端';
}else{ }else{
return; return;
} }
...@@ -509,15 +508,14 @@ export default { ...@@ -509,15 +508,14 @@ export default {
}, },
//执行路径 //执行路径
zhixinglujing(boo){ zhixinglujing(boo){
this.$refs.mars3dViewerMapMethod.addArrowGraphic3(boo); //this.$refs.mars3dViewerMapMethod.addArrowGraphic3(boo);
}, },
//执行路径 //执行路径
zhixinglujing2(boo){ zhixinglujing2(boo){
if(!this.boo1){ // if(!this.boo1){
this.boo1 = boo; // this.boo1 = boo;
this.$refs.mars3dViewerMapMethod.addArrowGraphic4(boo); // this.$refs.mars3dViewerMapMethod.addArrowGraphic4(boo);
} // }
}, },
}, },
beforeDestroy(){ beforeDestroy(){
......
...@@ -10,7 +10,6 @@ module.exports = { ...@@ -10,7 +10,6 @@ module.exports = {
productionSourceMap:false, //去掉打包的时候生成的map文件 productionSourceMap:false, //去掉打包的时候生成的map文件
lintOnSave: false, // 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码 lintOnSave: false, // 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码
devServer: { devServer: {
//host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
host: 'localhost', host: 'localhost',
port: 3002, // 端口号 port: 3002, // 端口号
https: false, // https:{type:Boolean} https: false, // https:{type:Boolean}
......
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