2021-6-5 设备管理气象站数据详情修改

.project

@@ -39,5 +39,68 @@
 				</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1622774335657</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622774335659</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622777486855</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622778221341</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622800304833</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622873551731</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1622879917758</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

equipManage/equipManage_qxz_detail.html

@@ -65,7 +65,8 @@
 				position: relative;
 				float: left;
 				width: 41%;
-				height: 180px;
+				/*height: 180px;*/
+				height: 90px;
 				background: rgba(255, 255, 255, 0.3);
 				border-radius: 10px;
 				margin-left: 6%;
@@ -76,10 +77,12 @@
 				background: rgba(255, 255, 255, 0.35);
 				border-radius: 50%;
 				position: absolute;
-				width: 2.5em;
-				height: 2.5em;
-				top: 10px;
-				left: 10px;
+				/*width: 2.5em;
+				height: 2.5em;*/
+				width: 3.5em;
+				height: 3.5em;
+				top: 15px;
+				left: 25px;
 				line-height: 3.8em;
 				text-align: center;
 				vertical-align: middle;
@@ -87,6 +90,7 @@
 			
 			.sensorIcon>img {
 				width: 74%;
+				margin: 7px 0 0 0;
 			}
 			
 			.sensorAisle {
@@ -101,17 +105,22 @@
 			.sensorResult {
 				color: #ffffff;
 				font-size: 16px;
-				line-height: 200px;
+				/*line-height: 200px;*/
+				line-height: 60px;
 				text-align: center;
+				margin: 0 0 0 30px;
 			}
 			
 			.sensorUnit {
-				position: absolute;
-				bottom: 10px;
-				right: 10px;
+				/*position: absolute;
+				bottom: 20px;
+				right: 70px;*/
 				color: rgba(255, 255, 255, 0.76);
 				font-size: 12px;
 				letter-spacing: 1px;
+				text-align: center;
+				width: 41%;
+				margin: -15px 0 0 80px;
 			}
 			/*24小时数据*/
 			
@@ -170,7 +179,6 @@
 			</div>
 			<div class="seeMore">
 				<button type="button" onclick="setTimingFun()" class="">定时控制</button>
-				　
 				<button type="button" onclick="manualCtrl()" class="">手动控制</button>
 			</div>
 			<div class="seeMore">
@@ -184,8 +192,7 @@
 		<script src="../js/mui.picker.min.js" type="text/javascript" charset="utf-8"></script>
 		<script src="../js/common.js"></script>
 		<script type="text/javascript">
-			
-			var equipId,equipName,qxz_switch,switch_name,timing_list,auto_list,conf,qxzDat;
+			var equipId, equipName, qxz_switch, switch_name, timing_list, auto_list, conf, qxzDat;
 			mui.init();
 			mui.plusReady(function() {
 				var self = plus.webview.currentWebview();
@@ -209,24 +216,24 @@
 					dataType: 'json',
 					success: function(data) {
 						console.log(JSON.stringify(data))
-						if(data.qxz_switch.length>2){
-							qxz_switch = eval('('+data.qxz_switch+')');
-						}else{
+						if(data.qxz_switch.length > 2) {
+							qxz_switch = eval('(' + data.qxz_switch + ')');
+						} else {
 							qxz_switch = {}
 						}
-						if(data.switch_name.length>2){
-							switch_name = eval('('+data.switch_name+')');
-						}else{
+						if(data.switch_name.length > 2) {
+							switch_name = eval('(' + data.switch_name + ')');
+						} else {
 							switch_name = {}
 						}
-						if(data.timing_list.length>2){
-							timing_list = eval('('+data.timing_list+')');
-						}else{
+						if(data.timing_list.length > 2) {
+							timing_list = eval('(' + data.timing_list + ')');
+						} else {
 							timing_list = {}
 						}
-						if(data.auto_list.length>2){
-							auto_list = eval('('+data.auto_list+')');
-						}else{
+						if(data.auto_list.length > 2) {
+							auto_list = eval('(' + data.auto_list + ')');
+						} else {
 							auto_list = {}
 						}
 						conf = data.conf;
@@ -238,26 +245,30 @@
 						var dat = data.dat;
 						var datlen = Object.keys(dat).length;
 						var html = '';
-						for(var i = 1;i<=datlen;i++){
-							var key = 'e'+ i;
-							if(dat[key]){
-								if(dat[key].split('#')[0] == -99.99){
+						for(var i = 1; i <= datlen; i++) {
+							var key = 'e' + i;
+							if(dat[key]) {
+								if(dat[key].split('#')[0] == -99.99) {
 									var val = 'N/A';
-								}else{
+								} else {
 									var val = dat[key].split('#')[0];
 								}
 								var eNum = dat[key].split('#')[1];
 								var unitTxt = data.conf[key].split('#')[0];
 								var unit = data.conf[key].split('#')[1];
 								html += '<div class="sensor"><div class="sensorIcon"><img src="../images/dev/icon_' + eNum + '.png"/>' +
-									'</div><div class="sensorAisle">通道' + i + '</div>' +
+									'</div>' +
 									'<div class="sensorResult">' + val + unit + '</div><div class="sensorUnit">' + unitTxt + '</div></div>'
+									
+
+								//								html += '<div class="sensor">' +
+								//									'<div class="sensorResult">' + val + unit + '</div><div class="sensorUnit">' + unitTxt + '</div></div>'
 							}
-							if(i == datlen){
-								if(!html){
+							if(i == datlen) {
+								if(!html) {
 									html = '<div class="sensor" style="width: 88%;"><div class="sensorResult">暂无数据</div></div>';
 								}
-									$('#newResultDat').html(html);
+								$('#newResultDat').html(html);
 							}
 						}
 					},
@@ -307,9 +318,9 @@
 							'equipName': equipName,
 							'qxz_switch': qxz_switch,
 							'switch_name': switch_name,
-							'auto_list':auto_list,
-							'conf':conf,
-							'qxzDat':qxzDat
+							'auto_list': auto_list,
+							'conf': conf,
+							'qxzDat': qxzDat
 						},
 					})
 				} else {
@@ -327,9 +338,9 @@
 							'equipName': equipName,
 							'qxz_switch': qxz_switch,
 							'switch_name': switch_name,
-							'timing_list':timing_list,
-							'conf':conf,
-							'qxzDat':qxzDat
+							'timing_list': timing_list,
+							'conf': conf,
+							'qxzDat': qxzDat
 						},
 					})
 				} else {

home/homePage.html

@@ -323,6 +323,17 @@
 							</div>
 						</div>
 					</div>
+					<div class="item" src='#'>
+						<div class="equipImg">
+							<img src="../images/qxz_equip.png" />
+						</div>
+						<div class="itemInfo">
+							<h1>自动气象监测站</h1>
+							<div class="itemTxt">
+								自动气象监测站由气象传感器，气象数据记录仪，气象环境监测软件三部分组成。广泛应用于农、林行业的植保推广、科研和教学单位病虫研究和病虫测报领域。
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 			<!--产品介绍结束-->
@@ -452,6 +463,7 @@
 						3:['../images/cbd_equip.png','物联网虫情测报灯','物联网虫情测报灯集害虫诱捕和拍照、环境信息采集、数据传输、数据分析于一体，实现了害虫的诱集、分类统计、实时报传、远程检测、虫害预警和防治指导的自动化、智能化。'],
 						7:['../images/bzy_equip.png','拍照式孢子捕捉仪','拍照式孢子捕捉仪内含高倍显微拍照装置，采用了气流定量、定时采集、自动加热、自动培养、自动拍照、无线传输等功能，全天候实时采集分析病原菌孢子图像，分析其数量的变化，预测病害发生的时间、程度和传播路线。'],
 						5:['../images/qxz_equip.png','自动气象监测站','自动气象监测站由气象传感器，气象数据记录仪，气象环境监测软件三部分组成。广泛应用于农、林行业的植保推广、科研和教学单位病虫研究和病虫测报领域。'],
+						4:['../images/xyq.png','自动性诱监测设备','自动性诱监测设备整体采用热镀锌喷塑材质，总体高度3米，标靶害虫通过性诱剂诱集，害虫种类可控。本产品具有害虫自动识别功能，可以自动识别害虫种类和数量，以此来实现计数功能。'],
 					}
 					var html = '';
 					for(var i = 0;i<data.length;i++){