bug处理

equipManage/equipManage_bzy_detail.html

@@ -170,44 +170,6 @@
 							</a>
 						</li>
 					</ul>
-					<ul class="mui-table-view detialBox">
-						<li class="mui-table-view-cell">
-							<h1 class="areaTitle">配置设备操作</h1>
-						</li>
-						<!--<li class="mui-table-view-cell" id="equipSW">
-							<a class="mui-navigate-right">
-								<i class="fa fa-calendar" aria-hidden="true"></i> 设备开关
-								<span class="controlVal" data-time='' id="equipSWValue"></span>
-							</a>
-						</li>-->
-						<li class="mui-table-view-cell" id="glass">
-							<a class="mui-navigate-right">
-								<i class="fa fa-calendar" aria-hidden="true"></i> 载玻片更换时间
-								<span class="controlVal" data-time='' id="glassValue"></span>
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="liquid">
-							<a class="mui-navigate-right">
-								<i class="fa fa-tint" aria-hidden="true"></i> 培养液更换时间
-								<span class="controlVal" data-time='' id="liquidValue"></span>
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="configBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-cog" aria-hidden="true"></i> 设备详细配置
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="simCodeSearch">
-							<a class="mui-navigate-right">
-								<i class="fa fa-search" aria-hidden="true"></i> SIM卡查询
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="refreshBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-refresh" aria-hidden="true"></i> 查询最新状态
-							</a>
-						</li>
-					</ul>
 					
 					<div class="mui-row" id="detial">
 						<div class="mui-col-sm-6">
@@ -525,7 +487,11 @@
 							var point = new BMap.Point(stat.lng, stat.lat);
 							geoc.getLocation(point, function (rs) {
 							    var addComp = rs.addressComponents;
-								$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								if(addComp.province || addComp.city || addComp.district){
+									$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								}else{
+									$('#lat_lng').html('暂无位置信息')
+								}
 							});
 							if(stat.on_off == 1) {
 								$('#ds').html('开');

equipManage/equipManage_cbd_detail.html

@@ -135,26 +135,6 @@
 							</a>
 						</li>
 					</ul>
-					<ul class="mui-table-view detialBox">
-						<li class="mui-table-view-cell">
-							<h1 class="areaTitle">配置设备操作</h1>
-						</li>
-						<li class="mui-table-view-cell" id="configuration">
-							<a class="mui-navigate-right">
-								<i class="fa fa-cog" aria-hidden="true"></i> 设备配置
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="simCodeSearch">
-							<a class="mui-navigate-right">
-								<i class="fa fa-search" aria-hidden="true"></i> SIM卡查询
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="downInquire">
-							<a class="mui-navigate-right">
-								<i class="fa fa-refresh" aria-hidden="true"></i> 查询最近状态
-							</a>
-						</li>
-					</ul>
 					<div class="mui-row" id="detial">
 						<div class="mui-col-sm-6">
 							<div class="mui-pull-left">
@@ -309,7 +289,11 @@
 							var point = new BMap.Point(stat.lng, stat.lat);
 							geoc.getLocation(point, function (rs) {
 							    var addComp = rs.addressComponents;
-								$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								if(addComp.province || addComp.city || addComp.district){
+									$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								}else{
+									$('#lat_lng').html('暂无位置信息')
+								}
 							});
 							var ts = stat.ts == 0 ? '光控' : '时控';
 							$('#ts').html(ts);

equipManage/equipManage_scd_detail.html

@@ -215,56 +215,6 @@
 							</a>
 						</li>
 					</ul>
-					<ul class="mui-table-view detialBox">
-						<li class="mui-table-view-cell">
-							<h1 class="areaTitle">配置设备操作</h1>
-						</li>
-						<li class="mui-table-view-cell" id="clock">
-							<a class="mui-navigate-right">
-								<i class="fa fa-clock-o" aria-hidden="true"></i> 定时模式
-								<span class="controlVal">光控</span>
-							</a>
-						</li>
-						<!--<li class="mui-table-view-cell" id="timingBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-clock-o" aria-hidden="true"></i> 定时时长
-								<span class="controlVal">4</span>
-							</a>
-						</li>-->
-						<li class="mui-table-view-cell" id="switchBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-power-off" aria-hidden="true"></i> 设备开关
-								<span class="controlVal">开</span>
-							</a>
-						</li>
-						<!--<li class="mui-table-view-cell" id="startBar">
-							<a class="mui-navigate-right">
-								<i class="fa fa-power-off" aria-hidden="true"></i> 起始时间
-								<span class="controlVal">3</span>
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="stopBar">
-							<a class="mui-navigate-right">
-								<i class="fa fa-power-off" aria-hidden="true"></i> 结束时间
-								<span class="controlVal">2</span>
-							</a>
-						</li>--> 
-						<li class="mui-table-view-cell" id="simCodeSearch">
-							<a class="mui-navigate-right">
-								<i class="fa fa-search" aria-hidden="true"></i> SIM卡查询
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="debugBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-wrench" aria-hidden="true"></i> 调试
-							</a>
-						</li>
-						<li class="mui-table-view-cell" id="refreshBtn">
-							<a class="mui-navigate-right">
-								<i class="fa fa-refresh" aria-hidden="true"></i> 查询最新状态
-							</a>
-						</li>
-					</ul>
 					<div class="mui-row" id="detial">
 						<div class="mui-col-sm-6">
 							<div class="mui-pull-left">
@@ -567,7 +517,11 @@
 							var point = new BMap.Point(stat.lng, stat.lat);
 							geoc.getLocation(point, function (rs) {
 							    var addComp = rs.addressComponents;
-								$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								if(addComp.province || addComp.city || addComp.district){
+									$('#lat_lng').html('位置：'  + addComp.province + ", " + addComp.city + ", " + addComp.district);
+								}else{
+									$('#lat_lng').html('暂无位置信息')
+								}
 							});
 							equiccID = stat.iccid
 							var ds = stat.ds == 0 ? '关' : '开';

home/login.html

@@ -186,7 +186,7 @@
 					</div>
 				</div>
 				<div id="addUser">
-					<a href="javascript:;" id="registerBtn">创建新账户+</a>
+					<!-- <a href="javascript:;" id="registerBtn">创建新账户+</a> -->
 				</div>
 			</div>
 		</div>

manifest.json

@@ -3,7 +3,7 @@
     "id" : "H507F9311", /*应用的标识，创建应用时自动生成，勿手动修改*/
     "name" : "云飞物联网", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "3.0.0", /*应用版本名称*/
+        "name" : "3.0.2", /*应用版本名称*/
         "code" : ""
     },
     "description" : "", /*应用描述信息*/

reportManage/bzy_detail_echart.html

@@ -146,9 +146,12 @@
 							var time = '';
 							for(var g in params) {
 								time = params[g].axisValue;
-								if(params[g].seriesIndex == 0 || params[g].seriesIndex == 1) {
+								if(params[g].seriesIndex == 0 ) {
 									returnData += params[g].seriesName + ':' + params[g].value + '°C<br/>';
 								}
+								if( params[g].seriesIndex == 1) {
+									returnData += params[g].seriesName + ':' + params[g].value + '%<br/>';
+								}
 								if(params[g].seriesIndex == 2 || params[g].seriesIndex == 3) {
 									returnData += params[g].seriesName + ':' + params[g].value + 'V<br/>';
 								}
@@ -253,7 +256,7 @@
 						var time = '';
 						for(var g in params) {
 							time = params[g].axisValue;
-							returnData += params[g].seriesName + ':' + params[g].value + '只';
+							returnData += params[g].seriesName + ':' + params[g].value + '°C';
 						}
 						return time + '<br/>' + returnData;
 					}

reportManage/bzy_image_detail.html

@@ -79,7 +79,11 @@
 			var self = plus.webview.currentWebview();
 			equipId = self.equipId;
 			addr = self.addr;
-			$('#bzyImg').attr('src','http://120.27.222.26/bzy/'+addr);
+			if(self.addr.substring(0,4) == 'http'){
+				$('#bzyImg').attr('src', addr);
+			}else{
+				$('#bzyImg').attr('src','http://120.27.222.26/bzy/'+addr);
+			}
 //			$('#bzyImg').attr('src','http://120.27.222.26/bzy/pyftp/ftp_file/bzy_photo/866262040450529/20190513/20190513211133.jpg');
 			
 			mui.ajax('http://120.27.222.26/bzy_describe_img', {

reportManage/bzy_lookImage.html

@@ -322,13 +322,13 @@
 //				var dat = data.img;
 			for(var i = 0; i<dat.length; i++){
 				if(dat[i].addr.substring(0,4) == 'http'){
-					html += '<li class="item" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
+					html += '<li class="item" data-path="'+dat[i].addr+'" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
 					'<img class="mui-media-object" src="'+dat[i].addr+'" data-preview-src="" data-preview-group="1">' +
 					'</div><div class="mui-table-view-cell mui-col-xs-6 operateRight"><p class="delBtn"><i class="iconfont" >&#xe65c;</i>删除' +
 					'</p><p class="lookDetial"><i class="iconfont" >&#xe62d;</i>查看描述</p>' +
 					'<p class="itemTime">'+dat[i].upl_time+'</p></div></li>';
 				}else{
-					html += '<li class="item" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
+					html += '<li class="item" data-path="http://120.27.222.26/bzy/'+dat[i].addr+'" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
 					'<img class="mui-media-object" src="http://120.27.222.26/bzy/'+dat[i].addr+'" data-preview-src="" data-preview-group="1">' +
 					'</div><div class="mui-table-view-cell mui-col-xs-6 operateRight"><p class="delBtn"><i class="iconfont" >&#xe65c;</i>删除' +
 					'</p><p class="lookDetial"><i class="iconfont" >&#xe62d;</i>查看描述</p>' +

reportManage/cbd_detail_echart.html

@@ -105,7 +105,11 @@
 							var time = '';
 							for(var g in params) {
 								time = params[g].axisValue;
-								returnData += params[g].seriesName + ':' + params[g].value + '°C<br/>';
+								if(params[g].seriesIndex == 0){
+									returnData += params[g].seriesName + ':' + params[g].value + '°C<br/>';
+								}else{
+									returnData += params[g].seriesName + ':' + params[g].value + '%<br/>';
+								}
 							}
 							return time + '<br/>' + returnData;
 						}

reportManage/lookImage.html

@@ -318,7 +318,7 @@
 			var dat = curPageData;
 //				var dat = data.img;
 			for(var i = 0; i<dat.length; i++){
-				html += '<li class="item" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
+				html += '<li class="item" data-path="'+dat[i].addr+'" data-id="'+dat[i].id+'"><div class="mui-table-view-cell mui-col-xs-6">' +
 						'<img class="mui-media-object" src="'+dat[i].addr+'" data-preview-src="" data-preview-group="1">' +
 						'</div><div class="mui-table-view-cell mui-col-xs-6 operateRight"><p class="delBtn"><i class="iconfont" >&#xe65c;</i>删除' +
 						'</p><p class="lookDetial"><i class="iconfont" >&#xe723;</i>查看描述</p>';
@@ -399,7 +399,14 @@
 			setTimeout(function(){
 				$(_this).removeClass("activeBj"); //移除p元素中值为"high"的class
 			},30)
-			var path = $(_this).parents('.item').data('path');
+			var addr = $(_this).parents('.item').data('path');
+			if(addr.indexOf('yfzhwlw.com') != -1 ){
+				var path = addr.split('yfzhwlw.com/')[1];
+			}else if(addr.indexOf('120.27.222.26') != -1){
+				var path = addr.split('120.27.222.26/')[1];
+			}else{
+				var path = addr;
+			}
 			mui.openWindow({
 				url: 'cbd_image_discern_resule.html',
 				id: 'cbd_image_discern_resule',

reportManage/reprotManage_cbd_detail.html

@@ -349,7 +349,11 @@
 							var time = '';
 							for(var g in params) {
 								time = params[g].axisValue;
-								returnData += params[g].seriesName + ':' + params[g].value + '°C<br/>';
+								if(params[g].seriesIndex == 0){
+									returnData += params[g].seriesName + ':' + params[g].value + '°C<br/>';
+								}else{
+									returnData += params[g].seriesName + ':' + params[g].value + '%<br/>';
+								}
 							}
 							return time + '<br/>' + returnData;
 						}