fix

pages/amap/amap.html

@@ -36,9 +36,9 @@
                     </div>
                 </div>
 
-                <div class="insurance-img">
+                <!-- <div class="insurance-img">
                     <img style="max-width: 100%!important;max-height: 100%!important;width: auto;height: auto;" src="./images/insurance.png" alt="">
-                </div>
+                </div> -->
 
                 <div style="z-index:555;flex: 0 0 auto;">
 

pages/amap/amap.js

@@ -26,7 +26,7 @@
 				*/  
 				_html += '\
 					<div class="f-page-title alarm">\
-						<button type="button" class="lr-btn" style="font-size:16px;line-height:1;color:#0c86d8;">\
+						<button id="alarm-110" type="button" class="lr-btn" style="font-size:16px;line-height:1;color:#0c86d8;">\
 								110丢失报警\
 						</button>\
 					</div>';
@@ -78,7 +78,7 @@
 				// 		}
 				// 	});
                 // });
-                $('.alarm').on('tap', function () {
+                $('#alarm-110').on('tap', function () {
                     learun.nav.go({ path: 'baojingindex', title: '110丢失报警', isBack: true, isHead: true,type:'right' });
                     if(infoWindow){infoWindow.close( );}
 				});
@@ -239,7 +239,6 @@
                 var mapData = null;
                 learun.httpget(config.webapi+"/?s=api/get_map_index_data", {deviceNumber:deviceNumber}, function (_res) {
                     mapData = _res.data;
-                    console.log(mapData);
                     if(!mapData){
                         learun.layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
                         return;
@@ -267,32 +266,24 @@
 
                     //在线状态
                     if(mapData.onlineTime){
-                        if(parseInt(mapData.onlineTime) < 0 ){
-                            $('#on-off-online').text('未在线过');
-                            $('#on-off-online').css({color:"gray"})
-                            var routeTime = new Date(0);
-                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
-                            console.log('---------a-------')
-                            console.log(mapData.onlineTime)
+                        var routeTime = new Date(mapData.onlineTime*1000);
+                        routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
+                        var interval = parseInt(new Date().getTime()/1000) - mapData.onlineTime;
+                        if(interval < 24*3600){
+                            $('#on-off-online').text('在线中');
+                            $('#on-off-online').css({color:"green"})
                         }else{
-                            console.log('---------b-------')
-                            console.log(mapData.onlineTime)
-                            var routeTime = new Date(mapData.onlineTime*1000);
-                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
-                            var interval = parseInt(new Date().getTime()/1000) - mapData.onlineTime;
-                            if(interval < 24*3600){
-                                $('#on-off-online').text('在线中');
-                                $('#on-off-online').css({color:"green"})
-                            }else{
-                                var day = parseInt(interval/24/3600);
-                                $('#on-off-online').text('离线'+day+'天');
-                                $('#on-off-online').css({color:"gray"})
-                            }
+                            var day = parseInt(interval/24/3600);
+                            $('#on-off-online').text('离线'+day+'天');
+                            $('#on-off-online').css({color:"gray"})
                         }
-
+                    }else{
+                        $('#on-off-online').text('未在线过');
+                        $('#on-off-online').css({color:"gray"})
+                        var routeTime = new Date(0);
+                        routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
                     }
-                    console.log('---------c-------')
-                    console.log(mapData.onlineTime)
+
 
                     var fence = mapData.fenceShapeInfo;
                     if(fence){
@@ -367,7 +358,6 @@
                 AMapUI.loadUI(['overlay/SimpleInfoWindow'], function(SimpleInfoWindow) {
                     
                     lnglat = vehicleMarker.getPosition();
-                    console.log(lnglat)
                     var address = '坐标未解析成功';
 
 

pages/amap/route/route.js

@@ -259,8 +259,8 @@
                 });
 
 
-
-
+                console.log('ddddddddddddddddddddddddd')
+                console.log(userinfo.baseinfo.gpsNumber);
             
                 //启动页面
                 // initPage(PathSimplifier);
@@ -276,7 +276,6 @@
                     }
                     var data = null;
                     if(res.data){
-                        console.log(res.data);
                         data = [{name:'test1',points:[]}];
                         JSON.parse(res.data).forEach(v => {
                            data[0].points.push({speed:v.speed, lngLat:[v.lng, v.lat], time:v.deviceTime});

pages/baojingindex/baojingindex.html

@@ -3,14 +3,17 @@
 	<h3 style='color:white;text-align:center'>公安110</h3>
 	<h4 style='color:white;text-align:center'>车辆被盗,请点击下方报警按钮</h4>
 </div>
+ 
 <div style="padding:120px 10px 10px 10px;">
-    <button type="button" class="lr-btn-danger lr-btn-block call-baojing">
+    <button type="button" id="phone-call-110" class="lr-btn-danger lr-btn-block call-baojing">
+            
         电话报警
     </button>
     <button type="button" class="lr-btn-primary lr-btn-block auto-baojing">
         自助报警
     </button>
 </div>
+
 <!--<div class="lr-grid" style="margin-top:10px;">
     <div class="lr-grid-item">
         <div><i class="iconfont icon-home"></i></div>

pages/baojingindex/baojingindex.js

@@ -10,7 +10,12 @@
 			});
 			$page.find('.auto-baojing').on('tap', function () {
 				learun.nav.go({ path: 'baojing', title: '自助报警', type: 'right' });
-			});
+            });
+            
+
+            $page.find('#phone-call-110').on('tap', function () {
+                window.location.href = "tel:110";
+            });
         }
 		
     };

pages/tongji/tongji.html

@@ -1,14 +1,14 @@
 <div class="lr-desktop-msg" id="lr_desktop_msg">
 	<div id="lr_desktop_msg_content" style="padding-top:10px;">
-	 <div class="lr-black-panel">
+	 <div style="margin-bottom:0" class="lr-black-panel">
 		<div class="lr-title">统计数据</div>
 		<div class="lr-content lr-chart-content">
 			<div class="lr-chart-container" id="chart-bingtu"></div>
 			</div>
 		</div>
 	</div>
-	<div class="lr-black-panel">
-		<div class="lr-title">行驶数据</div>
+	<div style="margin-bottom:0" class="lr-black-panel">
+		<div class="lr-title">近5日行驶数据</div>
 		<div class="lr-content lr-flex-content" id='driving-data'>
 		</div>
 	</div>

pages/tongji/tongji.js

@@ -18,44 +18,106 @@
 			});
 			console.log(data2);
 			console.log(legendData);
-			var option = {};
-			option.tooltip = {
-				trigger: 'item',
-				formatter: "{a} <br/>{b}: {c} ({d}%)"
-			};
-			option.legend = {
-				orient: 'vertical',
-				left: 'right',
-				data: legendData
-			};
-			option.series = [{
-				name: '占比',
-				type: 'pie',
-				radius : '55%',
-				center: ['40%', '60%'],
-				itemStyle: {
-					emphasis: {
-						shadowBlur: 10,
-						shadowOffsetX: 0,
-						shadowColor: 'rgba(0, 0, 0, 0.5)'
+			var xData = [];
+			for(let i = 0;i < 5; ++i){
+				var time = new Date(new Date() - 24*60*60*1000*i);
+				var date = time.Format("yyyy-MM-dd");
+				xData.push(date);
+			}
+			// var option = {};
+			// option.tooltip = {
+			// 	trigger: 'item',
+			// 	formatter: "{a} <br/>{b}: {c} ({d}%)"
+			// };
+			// option.legend = {
+			// 	orient: 'vertical',
+			// 	left: 'right',
+			// 	data: legendData
+			// };
+			// option.series = [{
+			// 	name: '占比',
+			// 	type: 'pie',
+			// 	radius : '55%',
+			// 	center: ['40%', '60%'],
+			// 	itemStyle: {
+			// 		emphasis: {
+			// 			shadowBlur: 10,
+			// 			shadowOffsetX: 0,
+			// 			shadowColor: 'rgba(0, 0, 0, 0.5)'
+			// 		}
+			// 	},
+			// 	data: data2
+			// }];
+
+			var option1 = {
+				title:{
+					text: '近期行驶里程',
+					x:'center',
+				},
+				color: ['#3398DB'],
+				tooltip : {
+					trigger: 'axis',
+					axisPointer : {            // 坐标轴指示器，坐标轴触发有效
+						type : 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
 					}
 				},
-				data: data2
-			}];
+				grid: {
+					left: '3%',
+					right: '4%',
+					bottom: '3%',
+					containLabel: true
+				},
+				xAxis : [
+					{
+						type : 'category',
+						data : xData,
+						axisTick: {
+							alignWithLabel: true
+						},
+						axisLabel : {//坐标轴刻度标签的相关设置。
+							interval:0,
+							rotate:"45"
+						}
+					}
+				],
+				yAxis : [
+					{
+						name: '里程/公里',
+						type : 'value'
+					}
+				],
+				series : [
+					{
+						name:'直接访问',
+						type:'bar',
+						barWidth: '50%',
+						data:[10, 52, 50, 34, 40, 30, 20]
+					}
+				]
+			};
+			
 			//option.color = ['#df4d4b', '#304552', '#52bbc8', 'rgb(224,134,105)', '#8dd5b4', '#5eb57d', '#d78d2f'];
-			chartMap['chart-bingtu'].setOption(option);
+			chartMap['chart-bingtu'].setOption(option1);
 			
 			//列表数据
 			//learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'Target', id: _item.F_Id }, function(data){});
-			var drivingdata = '[{"name":"测试1","value":"29"},{"name":"测试2","value":"20"}]';
+			var drivingdata = '[{"name":"里程总计","value":"236.00km"},{"name":"累计时长","value":"0天24时00分"},{"name":"平均速度", "value":"9.83km/h"}]';
 			data = JSON.parse(drivingdata);
 			var _itemHtml = ''
 			$.each(data, function (_index, _item) {
-				_itemHtml += '\
-					<div class="targetItem">\
-						<div class="name">'+ _item.name + '</div>\
-						<div class="number">'+ _item.value +'</div>\
+				if(_index == 2){
+					_itemHtml += '\
+					<div style="flex: 0 0 100%;height:120px;padding-top: 40px;" class="targetItem">\
+						<div class="number">'+ _item.value + '</div>\
+						<div class="name">'+  _item.name +'</div>\
 					</div>';
+				}else{
+					_itemHtml += '\
+						<div style="flex: 0 0 50%;height:120px;padding-top: 40px;" class="targetItem">\
+							<div class="number">'+ _item.value + '</div>\
+							<div class="name">'+  _item.name +'</div>\
+						</div>';
+				}
 				$page.find('#driving-data').html(_itemHtml);
 			}); 
         }