Quellcode durchsuchen

去掉非变量的力软标识

git vor 6 Jahren
Ursprung
Commit
edc643ffb3

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 10
css/lrmui.min.css


+ 4 - 5
index.html

@@ -15,7 +15,7 @@
         <!-- <link rel="stylesheet" type="text/css" href="css/mui.min.css"> -->
         <link rel="stylesheet" type="text/css" href="font/iconfont.css">
         
-        <link rel="stylesheet" type="text/css" href="css/lrmui.min.css">
+        <link rel="stylesheet" type="text/css" href="css/rlmui.min.css">
         <link rel="stylesheet" type="text/css" href="css/index.css">
 
         <title>行车卫士</title>
@@ -25,12 +25,11 @@
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="data/city.js"></script>
         <script type="text/javascript" src="scripts/echarts.js"></script>
-        <!-- <script type="text/javascript" src="scripts/lrmui.min.js"></script> -->
-        <script type="text/javascript" src="scripts/lrmuidebug.js"></script>
-        <script type="text/javascript" src="scripts/lrmuiex.js"></script>
+        <script type="text/javascript" src="scripts/rlmui.js"></script>
+        <script type="text/javascript" src="scripts/rlmuiex.js"></script>
         <script type="text/javascript" src="scripts/platformOverrides.js"></script>
         <script type="text/javascript" src="config/config.js"></script>
-        <script type="text/javascript" src="scripts/learun-custmerform.js"></script>
+        <script type="text/javascript" src="scripts/renlian-custmerform.js"></script>
         <script type="text/javascript" src="scripts/index.js"></script>
         <script type="text/javascript" src="scripts/fence-slider.js"></script>
         <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.12&key=78735d0efd243f8085837edf355526cb&plugin=AMap.Riding,AMap.Geocoder"></script>

+ 6 - 0
pages/amap/amap.js

@@ -272,7 +272,11 @@
                             $('#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)
                         }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;
@@ -287,6 +291,8 @@
                         }
 
                     }
+                    console.log('---------c-------')
+                    console.log(mapData.onlineTime)
 
                     var fence = mapData.fenceShapeInfo;
                     if(fence){

+ 6 - 5
pages/amap/route/route.js

@@ -97,17 +97,17 @@
                         speedSign.removeClass('icon-beisu1');
                         speedSign.addClass('icon-beisu2');
                         $page.find('.speed-level').html('中速');
-                        navg0.setSpeed(2*10000);
+                        navg0.setSpeed(2*1000);
                     }else if(speedSign.hasClass('icon-beisu2')){
                         speedSign.removeClass('icon-beisu2');
                         speedSign.addClass('icon-beisu4');
                         $page.find('.speed-level').html('快速');
-                        navg0.setSpeed(4*10000);
+                        navg0.setSpeed(4*1000);
                     }else if(speedSign.hasClass('icon-beisu4')){
                         speedSign.removeClass('icon-beisu4');
                         speedSign.addClass('icon-beisu1');
                         $page.find('.speed-level').html('慢速');
-                        navg0.setSpeed(10000);
+                        navg0.setSpeed(1000);
                     }
                 });
 
@@ -235,7 +235,7 @@
                         "gpsNumber": userinfo.baseinfo.gpsNumber
                     }
                     var geocoder = null;
-                    learun.httppost(config.webapi+'?s=api/get_gps_route',post_data,function(res){
+                    learun.httppost(config.webapi+'?s=api/get_gps_route_table',post_data,function(res){
                         if(!geocoder){
                             geocoder = new AMap.Geocoder({
                                 radius: 500 //范围,默认:500
@@ -270,12 +270,13 @@
                     "date": nowDate,
                     "gpsNumber": userinfo.baseinfo.gpsNumber
                 }
-                learun.httppost(config.webapi+'?s=api/get_gps_route',post_data,function(res){
+                learun.httppost(config.webapi+'?s=api/get_gps_route_table',post_data,function(res){
                     if(!res.success){
                         learun.layer.toast(res.message);
                     }
                     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});

+ 44 - 110
pages/baojinginfo/baojinginfo.js

@@ -1,23 +1,4 @@
 (function () {
-	/*function list(data, $page) {
-		$.each(data, function (_index, _item) {
-			learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function(data) {
-				if (data) {
-					var html = '';
-					$.each(data.value, function (_j, _jitem) {	
-						html += '\
-							<div class="lr-list-item lr-dtlist-item">\
-								<div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-								<div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-							</div>';
-					});
-					console.log(html);
-				}
-				 $page.find('#lr_desktop_msg_content').append(html);
-			});
-		});
-	}*/
-	
 	var page = {
         isScroll: false,
         init: function ($page,param) {
@@ -63,7 +44,49 @@
 							});
 						
 						//msg_html += '';
-						
+						//刷新
+							var pageobj = $('.gaojinginfo').lrpagination({
+								lclass: "lr-list",
+								rows: 10,                            // 每页行数
+								getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+								// param:   page: 当前页,rows:行数
+									setTimeout(function () {
+										var data = [];
+										learun.httpget(config.webapi + "/?s=api/get_baojing_info&plate="+userinfo.baseinfo.plate, {}, function(res) {
+											if(res.success == true){
+												$.each(res.data, function (_index, _item) {
+													data.push({ AddTime: _item.AddTime,LicensePlate: _item.LicensePlate,DeviceNumber:_item.DeviceNumber})
+												})
+											}
+										})
+										callback(data, 20);
+									}, 1000);
+								},
+								renderData: function (_index, _item) {// 渲染数据模板
+									console.log(_index);
+									var _msg_html_list = '';
+									_msg_html_list+= '\
+												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
+													<h4 id="time">'+ _item.AddTime +'</h4>\
+													<p class="lr-ellipsis">'+ _item.LicensePlate +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.DeviceNumber +'</span></p>\
+													<a class="lr-nav-right gaojingdetail">告警<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+												</div>';
+									return _msg_html_list;
+								},
+								down: {
+									contentinit: '下拉可以刷新',
+									contentdown: '下拉可以刷新',
+									contentover: '释放立即刷新',
+									contentrefresh: '正在刷新...'
+								},
+								up: {
+									contentinit: '上拉显示更多',
+									contentdown: '上拉显示更多',
+									contentrefresh: '正在加载...',
+									contentnomore: '没有更多数据了'
+								}
+							});
+						//刷新结束
                         break;
                     case 1:
                         var msg_html = '';
@@ -109,96 +132,7 @@
                 $this = null;
             });
         }
-		/*reload: function ($page, pageinfo) {
-			if (learun.isOutLogin) {// 如果是重新登录的情况刷新下桌面数据
-                learun.isOutLogin = false;
-			$page.find('#toptab').toptab(['告警', '公告']).each(function (index) {
-                var $this = $(this);
-                switch (index) {
-                    case 0:
-						var msg_html = '';
-						msg_html += '\
-									<div class="f-page-body f-scroll-wrapper">\
-										<div class="f-scroll" id="gaojinginfo" style="transform: translate3d(0px, 0px, 0px) translateZ(0px);">';
-						learun.http.get("http://czapp.rltest.cn/?s=api/get_baojing_info", {}, function(res) {
-							if(res){
-								$.each(res.data, function (_index, _item) {
-									msg_html += '\
-										<div class="lr-list">\
-												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
-													<h4>'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.DeviceNumber +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.AddTime +'</span></p>\
-													<a class="lr-nav-right">'+ _item.Comment +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>\
-											</div>';
-								});
-								
-							}else{
-								msg_html += '<h4>暂无消息</h4>';	
-							}
-							$page.find('#gaojinginfo').html(msg_html);
-							});
-						
-						msg_html += '\
-										</div>\
-										<div class="f-scrollbar f-scrollbar-vertical">\
-											<div class="f-scrollbar-indicator" style="transition-duration: 0ms; display: none; height: 830px; transform: translate3d(0px, 0px, 0px) translateZ(0px);">\
-											</div>\
-										</div>\
-									</div>';
-						$this.html(msg_html);
-                        break;
-                    case 1:
-                        var msg_html = '';
-						msg_html += '\
-									<div class="f-page-body f-scroll-wrapper">\
-										<div class="f-scroll" id="gonggaoinfo" style="transform: translate3d(0px, 0px, 0px) translateZ(0px);">';						
-						learun.http.get("http://czapp.rltest.cn/?s=api/get_baojing_info", {}, function(res) {
-							if(res){
-								$.each(res.data, function (_index, _item) {
-									msg_html += '\
-										<div class="lr-list">\
-												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
-													<h4>'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.DeviceNumber +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.AddTime +'</span></p>\
-													<a class="lr-nav-right">'+ _item.Comment +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>\
-											</div>';
-								});
-								
-							}else{
-								msg_html += '<h4>暂无消息</h4>';	
-							}
-							$page.find('#gonggaoinfo').html(msg_html);
-						});
-						msg_html += '\
-									</div>\
-									<div class="f-scrollbar f-scrollbar-vertical">\
-										<div class="f-scrollbar-indicator" style="transition-duration: 0ms; display: none; height: 830px; transform: translate3d(0px, 0px, 0px) translateZ(0px);">\
-										</div>\
-									</div>\
-								</div>';
-						$this.html(msg_html);
-                        break;
-                }
-                $this = null;
-            });
-			}
-		}*/
+		
     };
     return page;
-	
-    /*var page = {
-        isScroll: false,
-        init: function ($page) {
-			learun.clientdata.get('desktop', {
-				callback: function (data) {
-					console.log(data);
-					list(data.list || [], $page);
-				}
-			});
-			
-        }
-    };
-    return page;*/
 })();

scripts/learun-custmerform.js → scripts/renlian-custmerform.js


Datei-Diff unterdrückt, da er zu groß ist
+ 76 - 76
scripts/lrmui.js


scripts/lrmuidebug.js → scripts/rlmuidebug.js


scripts/lrmuiex.js → scripts/rlmuiex.js