From 279b87c61ae1bff17d924bc0aa625473c0fc830b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 08 六月 2023 18:04:17 +0800
Subject: [PATCH] 空调开关和温度显示

---
 igds-app/device-temp.html          |   48 +++++++++------
 igds-app/css/admin/device-temp.css |   44 ++++++++++++++
 igds-app/js/admin/device-temp.js   |   31 ++++++----
 3 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/igds-app/css/admin/device-temp.css b/igds-app/css/admin/device-temp.css
index 901ea0c..3d13d5a 100644
--- a/igds-app/css/admin/device-temp.css
+++ b/igds-app/css/admin/device-temp.css
@@ -205,12 +205,29 @@
 	height: 45px;
 	line-height: 45px;
 }
+.m-opts .group1 {
+
+	font-size: 16px;
+	color: #000;
+	padding: 0 10px;
+	height: 45px;
+	line-height: 45px;
+}
 
 .group .oh {
 	float: none;
 	width: auto;
 	height: 45px;
 	overflow: hidden;
+	padding-left: 7px;
+	position: relative;
+}
+
+.group1 .oh {
+	float: none;
+	width: auto;
+	height: 45px;
+	/* overflow: hidden; */
 	padding-left: 7px;
 	position: relative;
 }
@@ -291,12 +308,37 @@
 
 
 .range {
-	position: absolute;
+	/* position: absolute; */
 	top: -2px;
 	left: 7px;
 	right: 10px;
 }
+.range1 {
+	position: absolute;
+	top: 0px;
+	left: 40px;
+	right: 5px;
+}
 
+.range1 .bar {
+	position: absolute;
+	top: 25px;
+	left: 0;
+	width: 90%;
+	height: 3px;
+	background-color: #f5f6f7;
+	border-radius: 3px;
+	overflow: hidden;
+}
+
+.range1 .bar .subbar {
+	position: absolute;
+	left: 0;
+	height: 3px;
+	background-color: #178255;
+	border-radius: 3px;
+	overflow: hidden;
+}
 .range .bar {
 	position: absolute;
 	top: 25px;
diff --git a/igds-app/device-temp.html b/igds-app/device-temp.html
index 67ef9b2..5d15259 100644
--- a/igds-app/device-temp.html
+++ b/igds-app/device-temp.html
@@ -26,7 +26,8 @@
 						<div class="g-tittf1">浠撳簱姝i潰</div>
 						<ul class="ul-listmana1 ullisttf1">
 							<li>
-								<div class="con myfancy" passCode="011" serId="100" targetStatus="OPEN" data-win="#win_kt">
+								<div class="con myfancy" passCode="011" serId="100" targetStatus="OPEN"
+									data-win="#win_kt">
 									<div class="pic pic2">
 										<img src="images/e1.png">
 									</div>
@@ -46,7 +47,7 @@
 								</div>
 							</li>
 							<li>
-								<div class="con myfancy" data-win="#win_kt">
+								<div class="con myfancy" data-win="#win_kt" targetStatus="OPEN">
 									<div class="pic pic2">
 										<img src="images/e1.png">
 									</div>
@@ -61,7 +62,7 @@
 						<div class="g-tittf1">浠撳簱鍙嶉潰</div>
 						<ul class="ul-listmana1 ullisttf1">
 							<li>
-								<div class="con myfancy" data-win="#win_kt">
+								<div class="con myfancy" data-win="#win_kt" targetStatus="CLOSE">
 									<div class="pic pic2">
 										<img src="images/e1.png">
 									</div>
@@ -71,7 +72,7 @@
 								</div>
 							</li>
 							<li>
-								<div class="con myfancy" data-win="#win_kt">
+								<div class="con myfancy" data-win="#win_kt" targetStatus="CLOSE">
 									<div class="pic pic2">
 										<img src="images/e1.png">
 									</div>
@@ -81,7 +82,7 @@
 								</div>
 							</li>
 							<li>
-								<div class="con myfancy" data-win="#win_kt">
+								<div class="con myfancy" data-win="#win_kt" targetStatus="CLOSE">
 									<div class="pic pic2">
 										<img src="images/e1.png">
 									</div>
@@ -103,7 +104,7 @@
 					<div class="name">绌鸿皟</div>
 					<div class="group">
 						<div class="l"><b>寮�鍏�</b></div>
-						<div class="r">
+						<div class="r" id="switch">
 							<div class="mui-switch mui-switch-mini" id="vibrationSwitch">
 								<div class="mui-switch-handle"></div>
 							</div>
@@ -112,15 +113,6 @@
 					<div class="group sel-box">
 						<div class="l"><b>妯″紡:</b></div>
 						<div class="r">
-							<!-- <select class="sel" id="targetModel">
-								<option value="">璇烽�夋嫨</option>
-								<option value="HEATING">鍒剁儹</option>
-								<option value="01-REFRIGERATION">鍒跺喎</option>
-								<option value="02-AERATION">閫氶</option>
-								<option value="DEHU">闄ゆ箍</option>
-							</select>
-							<i class="mui-icon mui-icon-arrowright"></i> -->
-
 							<div class="val" id="targetModel">
 								<div class="placeholder">璇烽�夋嫨</div>
 								<div class="real-val" id="ywlx-val"></div>
@@ -128,16 +120,34 @@
 							<i class="mui-icon mui-icon-arrowright"></i>
 						</div>
 					</div>
-					<div class="group">
+<!-- 					<div class="group">
 						<div class="l"><b>娓╁害</b></div>
 						<div class="r oh">
 							<div class="range">
-								<input class="lcmf-range" value="17" id="range" type="range" min="9" max="25">
-								<div class="bar">
-									<div class="subbar" style="width: 50%;"></div>
+								<div class="mui-input-row mui-input-range">
+
+									<input class="lcmf-range" value="17" id="range" type="range" min="9" max="25">
+									<div class="bar">
+										<div class="subbar" style="width: 50%;"></div>
+									</div>
 								</div>
 							</div>
 						</div>
+					</div> -->
+					
+					<div class="group1">
+						<div class="l"><b>娓╁害</b></div>
+						<div class="r oh">
+							<div class="range1">
+								<div class="mui-input-row mui-input-range">
+									<input class="lcmf-range" value="17" id="range" type="range" min="9" max="25">
+									<div class="bar">
+										<div class="subbar" style="width: 50%;"></div>
+									</div>
+								</div>
+							</div>
+
+						</div>
 					</div>
 					<div class="confirm">纭畾</div>
 				</div>
diff --git a/igds-app/js/admin/device-temp.js b/igds-app/js/admin/device-temp.js
index 2fba7a1..cfc3a37 100644
--- a/igds-app/js/admin/device-temp.js
+++ b/igds-app/js/admin/device-temp.js
@@ -50,18 +50,6 @@
 	// depotName = self.depotName
 }
 
-//鐩戝惉寮�鍏崇姸鎬�
-document.getElementById("vibrationSwitch").addEventListener("toggle", function(event) {
-	if (event.detail.isActive) {
-		targetStatus = 'OPEN';
-		data.data.targetStatus = targetStatus;
-		console.log("浣犲惎鍔ㄤ簡寮�鍏�");
-	} else {
-		targetStatus = 'CLOSE';
-		data.data.targetStatus = targetStatus;
-		console.log("浣犲叧闂簡寮�鍏�");
-	}
-})
 //鑾峰彇璁惧鍒楄〃锛堢┖璋冿級
 function getDeviceList() {
 	mui.ajax(url, {
@@ -226,17 +214,34 @@
 	})
 })
 
+//鐩戝惉寮�鍏崇姸鎬�
+document.getElementById("vibrationSwitch").addEventListener("toggle", function(event) {
+	if (event.detail.isActive) {
+		targetStatus = 'OPEN';
+		data.data.targetStatus = targetStatus;
+		console.log("浣犲惎鍔ㄤ簡寮�鍏�");
+	} else {
+		targetStatus = 'CLOSE';
+		data.data.targetStatus = targetStatus;
+		console.log("浣犲叧闂簡寮�鍏�");
+	}
+})
 //绌鸿皟鎿嶄綔
 mui(".mui-scroll-wrapper").on("tap", ".m-tf ul li .con", function() {
 
 	targetStatus = this.getAttribute("targetStatus")
 	data.data.targetStatus = targetStatus
+	var html = '';
 	if (targetStatus == 'OPEN') {
-		//鏀瑰彉寮�鍏崇殑榛樿鐘舵��
 		document.getElementById("vibrationSwitch").classList.add('mui-active');
+		$('.mui-switch-handle').css("-webkit-transform" , "translate3d(16px, 0, 0)");
+		console.log("寮�")
 	} else if (targetStatus == 'CLOSE') {
 		document.getElementById("vibrationSwitch").classList.remove('mui-active');
+		$('.mui-switch-handle').css("-webkit-transform" , "translate3d(0, 0, 0)");
+		console.log("鍏�")
 	}
+	
 	var passCode = this.getAttribute("passCode");
 	var serId = this.getAttribute("serId");
 	var name = this.getAttribute("name");

--
Gitblit v1.9.3