Commit df9253ad authored by xxx's avatar xxx

1

parent a4c91c91
...@@ -10,44 +10,44 @@ ...@@ -10,44 +10,44 @@
<script> <script>
eruda.init(); eruda.init();
//获取设备IMEI、IMSI、型号、厂商等 //获取设备IMEI、IMSI、型号、厂商等
let webLog = {} // let webLog = {}
let userAgent = navigator.userAgent // let userAgent = navigator.userAgent
// 获取微信版本 // // 获取微信版本
let m1 = userAgent.match(/MicroMessenger.*?(?= )/) // let m1 = userAgent.match(/MicroMessenger.*?(?= )/)
if (m1 && m1.length > 0) { // if (m1 && m1.length > 0) {
webLog.wechat = m1[0] // webLog.wechat = m1[0]
} // }
// 苹果手机 // // 苹果手机
if (userAgent.includes('iPhone') || userAgent.includes('iPad')) { // if (userAgent.includes('iPhone') || userAgent.includes('iPad')) {
// 获取设备名 // // 获取设备名
if (userAgent.includes('iPad')) { // if (userAgent.includes('iPad')) {
webLog.device = 'iPad' // webLog.device = 'iPad'
} else { // } else {
webLog.device = 'iPhone' // webLog.device = 'iPhone'
} // }
// 获取操作系统版本 // // 获取操作系统版本
m1 = userAgent.match(/iPhone OS .*?(?= )/) // m1 = userAgent.match(/iPhone OS .*?(?= )/)
if (m1 && m1.length > 0) { // if (m1 && m1.length > 0) {
webLog.system = m1[0] // webLog.system = m1[0]
console.log(webLog.system) // console.log(webLog.system)
} // }
} // }
// 安卓手机 // // 安卓手机
if (userAgent.includes('Android')) { // if (userAgent.includes('Android')) {
// 获取设备名 // // 获取设备名
m1 = userAgent.match(/Android.*; ?(.*(?= Build))/) // m1 = userAgent.match(/Android.*; ?(.*(?= Build))/)
console.log(userAgent.match(/Android.*; ?(.*(?= Build))/)); // console.log(userAgent.match(/Android.*; ?(.*(?= Build))/));
if (m1 && m1.length > 1) { // if (m1 && m1.length > 1) {
webLog.device = m1[1] // webLog.device = m1[1]
console.log(webLog.device) // console.log(webLog.device)
} // }
// 获取操作系统版本 // // 获取操作系统版本
m1 = userAgent.match(/Android.*?(?=;)/) // m1 = userAgent.match(/Android.*?(?=;)/)
console.log(userAgent.match(/Android.*?(?=;)/)); // console.log(userAgent.match(/Android.*?(?=;)/));
if (m1 && m1.length > 0) { // if (m1 && m1.length > 0) {
webLog.system = m1[0] // webLog.system = m1[0]
} // }
} // }
</script> </script>
<!-- <title><%= htmlWebpackPlugin.options.title %></title> --> <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
......
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
}) })
//三秒后位置 //三秒后位置
graphicLayer4.eachGraphic((graphic) => { graphicLayer4.eachGraphic((graphic) => {
graphic.addDynamicPosition(Cesium.Cartesian3.fromDegrees(that.defaultjd, that.defaultwd, 1000), 1) graphic.addDynamicPosition(Cesium.Cartesian3.fromDegrees(that.defaultjd, that.defaultwd, 1000), 3)
}) })
//定时更新动态位置 //定时更新动态位置
setInterval(() => { setInterval(() => {
...@@ -267,7 +267,7 @@ export default { ...@@ -267,7 +267,7 @@ export default {
}) })
} }
}); });
}, 1000) }, 2000)
}, },
// 装车箭头线 graphicLayer.removeGraphic(graphic); // 装车箭头线 graphicLayer.removeGraphic(graphic);
......
...@@ -136,6 +136,7 @@ export default { ...@@ -136,6 +136,7 @@ export default {
personalName:'', personalName:'',
zongTimer1:null, zongTimer1:null,
zongTimer2:null, zongTimer2:null,
zongTimer3:null,
currentTime:'', currentTime:'',
selectFunction:0, selectFunction:0,
carnumber:'', carnumber:'',
...@@ -176,10 +177,12 @@ export default { ...@@ -176,10 +177,12 @@ export default {
this.setNowTimes(); this.setNowTimes();
this.zongTimer1 = setInterval(() => { this.zongTimer1 = setInterval(() => {
this.setNowTimes(); this.setNowTimes();
}, 1000)
this.zongTimer3 = setInterval(() => {
if(this.equipmentName){ if(this.equipmentName){
this.getCarLoaction(); this.getCarLoaction();
} }
}, 1000) }, 2000)
this.zongTimer2 = setInterval(() => { this.zongTimer2 = setInterval(() => {
if(this.carnumber == ''){ if(this.carnumber == ''){
return return
...@@ -733,6 +736,10 @@ export default { ...@@ -733,6 +736,10 @@ export default {
clearInterval(this.zongTimer2); clearInterval(this.zongTimer2);
this.zongTimer2 = null; this.zongTimer2 = null;
} }
if(this.zongTimer3) {
clearInterval(this.zongTimer3);
this.zongTimer3 = null;
}
} }
} }
</script> </script>
......
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