From 4ffa10559b032cb1baae41f14e7ca86c04659f9a Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 21 二月 2022 08:51:19 +0800
Subject: [PATCH] #css 修改176

---
 src/main/webapp/views/console.html |  408 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 251 insertions(+), 157 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2491020..671a9bf 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -5,8 +5,8 @@
 		<title>WCS鎺у埗涓績</title>
 <!--<link rel="stylesheet" type="text/css" href="../static/css/common.css">-->
 		<link rel="stylesheet" href="../static/css/console.css">
-		<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
-
+<!--		<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">-->
+		<link rel="stylesheet" href="../static/css/animate.min.css">
 
 		
 		<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -22,59 +22,60 @@
 			</div>
 			<!--绗�1鍒楋紙瀹藉害 70px锛� -->
 			<div class="site-row site-row-1">
-				<div id="site-173" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">173</div>
+				<div id="site-173" class="site" style="height: 18px;line-height: 18px;margin-bottom: 85px">173</div>
 			</div>
 			<!--绗�2鍒楋紙瀹藉害 70px锛�-->
 			<div class="site-row site-row-2">
-				<div id="site-175" class="site" style="height: 20px;line-height: 20px;">175</div>
-				<div id="site-174" class="site" style="height: 21px;line-height: 21px;">174</div>
-				<div id="site-172" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px">172</div>
-				<div id="site-182" class="site" style="height: 20px;line-height: 20px;">182</div>
+				<div id="site-175" class="site" style="height: 18px;line-height: 18px;">175</div>
+				<div id="site-174" class="site" style="height: 19px;line-height: 19px;">174</div>
+				<div id="site-172" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px">172</div>
+				<div id="site-182" class="site" style="height: 18px;line-height: 18px;">182</div>
 			</div>
 			<!-- 绗�3鍒楋紙瀹藉害 70px锛� -->
 			<div class="site-row site-row-3">
-				<div id="site-171" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px; ">171</div>
-				<div id="site-181" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px; ">181</div>
+				<div id="site-176" class="site" style="height: 18px;line-height: 18px;width:142px;margin-bottom: 21px">176</div>
+				<div id="site-171" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px; ">171</div>
+				<div id="site-181" class="site" style="height: 18px;line-height: 18px;margin-bottom: 44px; ">181</div>
 			</div>
 			<!-- 绗�4鍒楋紙瀹藉害 70px 140px锛� -->
 			<div class="site-row site-row-4">
-				<div id="site-176" class="site" style="height: 20px;line-height: 20px;width:140px;margin-bottom: 21px">176</div>
-				<div id="site-170" class="site" style="height: 20px;line-height: 20px;width:70px;margin-bottom: 245px;position: relative;float: right">170</div>
-				<div id="site-180" class="site" style="height: 20px;line-height: 20px;width:70px;position: relative;clear:right;float: right">180</div>
+
+				<div id="site-170" class="site" style="height: 18px;line-height: 18px;width:70px;margin-bottom: 248px;position: relative;float: right">170</div>
+				<div id="site-180" class="site" style="height: 18px;line-height: 18px;width:70px;position: relative;clear:right;float: right">180</div>
 			</div>
 			<!--&lt;!&ndash; 绗�5鍒楋紙瀹藉害 70px锛� &ndash;&gt;-->
 			<div class="site-row site-row-5">
-				<div id="site-163" class="site" style="height: 31px;line-height: 31px">163</div>
-				<div id="site-162" class="site" style="height: 31px;line-height: 31px">162</div>
+				<div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
+				<div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
 				<div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
-				<div id="site-160" class="site" style="height: 31px;line-height: 31px">160</div>
-				<div id="site-159" class="site" style="height: 31px;line-height: 31px">159</div>
-				<div id="site-158" class="site" style="height: 70px;line-height: 70px">158</div>
-				<div id="site-157" class="site" style="height: 31px;line-height: 31px">157</div>
-				<div id="site-156" class="site" style="height: 31px;line-height: 31px">156</div>
-				<div id="site-155" class="site" style="height: 70px;line-height: 70px">155</div>
-				<div id="site-154" class="site" style="height: 31px;line-height: 31px">154</div>
-				<div id="site-153" class="site" style="height: 31px;line-height: 31px">153</div>
-				<div id="site-152" class="site" style="height: 70px;line-height: 70px">152</div>
-				<div id="site-151" class="site" style="height: 31px;line-height: 31px">151</div>
-				<div id="site-150" class="site" style="height: 31px;line-height: 31px">150</div>
+				<div id="site-160" class="site" style="height: 28.5px;line-height: 28.5px">160</div>
+				<div id="site-159" class="site" style="height: 28.5px;line-height: 28.5px">159</div>
+				<div id="site-158" class="site" style="height: 71px;line-height: 71px">158</div>
+				<div id="site-157" class="site" style="height: 28.5px;line-height: 28.5px">157</div>
+				<div id="site-156" class="site" style="height: 28.5px;line-height: 28.5px">156</div>
+				<div id="site-155" class="site" style="height: 71px;line-height: 71px">155</div>
+				<div id="site-154" class="site" style="height: 28.5px;line-height: 28.5px">154</div>
+				<div id="site-153" class="site" style="height: 28.5px;line-height: 28.5px">153</div>
+				<div id="site-152" class="site" style="height: 71px;line-height: 71px">152</div>
+				<div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
+				<div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
 			</div>
 			<!--&lt;!&ndash; 绗�6鍒楋紙瀹藉害 70px锛� &ndash;&gt;-->
 			<div class="site-row site-row-6">
-				<div id="site-120" class="site" style="height: 31px;line-height: 31px">120(8888)</div>
-				<div id="site-121" class="site" style="height: 31px;line-height: 31px">121(8888)</div>
+				<div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
+				<div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
 				<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
-				<div id="site-123" class="site" style="height: 31px;line-height: 31px">123</div>
-				<div id="site-124" class="site" style="height: 31px;line-height: 31px">124</div>
-				<div id="site-125" class="site" style="height: 70px;line-height: 70px">125</div>
-				<div id="site-126" class="site" style="height: 31px;line-height: 31px">126</div>
-				<div id="site-127" class="site" style="height: 31px;line-height: 31px">127</div>
-				<div id="site-128" class="site" style="height: 70px;line-height: 70px">128</div>
-				<div id="site-129" class="site" style="height: 31px;line-height: 31px">129</div>
-				<div id="site-130" class="site" style="height: 31px;line-height: 31px">130</div>
-				<div id="site-131" class="site" style="height: 70px;line-height: 71px">131</div>
-				<div id="site-132" class="site" style="height: 31px;line-height: 31px">132</div>
-				<div id="site-133" class="site" style="height: 31px;line-height: 31px">133</div>
+				<div id="site-123" class="site" style="height: 28.5px;line-height: 28.5px">123</div>
+				<div id="site-124" class="site" style="height: 28.5px;line-height: 28.5px">124</div>
+				<div id="site-125" class="site" style="height: 71px;line-height: 71px">125</div>
+				<div id="site-126" class="site" style="height: 28.5px;line-height: 28.5px">126</div>
+				<div id="site-127" class="site" style="height: 28.5px;line-height: 28.5px">127</div>
+				<div id="site-128" class="site" style="height: 71px;line-height: 71px">128</div>
+				<div id="site-129" class="site" style="height: 28.5px;line-height: 28.5px">129</div>
+				<div id="site-130" class="site" style="height: 28.5px;line-height: 28.5px">130</div>
+				<div id="site-131" class="site" style="height: 71px;line-height: 71px">131</div>
+				<div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
+				<div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
 			</div>
 			
 			<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -83,8 +84,7 @@
 				<div class="lane">
 					<!-- 璐ф灦 -->
 					<div class="stock-group">
-						<div class="site" style="background-color: rgb(108,167,168)	"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -206,8 +206,7 @@
 						<span class="row-no">3#</span>
 					</div>
 					<div class="stock-group">
-						<div class="site" style="background-color: rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -417,8 +416,7 @@
 					<span class="row-no"></span>
 					<!-- 璐ф灦 -->
 					<div class="stock-group">
-						<div class="site" style="background-color: rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -540,8 +538,7 @@
 						<span class="row-no">11#</span>
 					</div>
 					<div class="stock-group">
-						<div class="site" style="background-color:rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -584,8 +581,7 @@
 					<span class="row-no"></span>
 					<!-- 璐ф灦 -->
 					<div class="stock-group">
-						<div class="site" style="background-color:rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -707,8 +703,7 @@
 						<span class="row-no">15#</span>
 					</div>
 					<div class="stock-group">
-						<div class="site" style="background-color:rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -751,8 +746,7 @@
 					<span class="row-no"></span>
 					<!-- 璐ф灦 -->
 					<div class="stock-group">
-						<div class="site" style="background-color:rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -874,8 +868,7 @@
 						<span class="row-no">19#</span>
 					</div>
 					<div class="stock-group">
-						<div class="site" style="background-color:rgb(108,167,168)"></div>
-						<button class="item">2</button>
+						<button class="item" style="margin-left: 82px">2</button>
 						<button class="item">4</button>
 						<button class="item">6</button>
 						<button class="item">8</button>
@@ -914,6 +907,7 @@
 					</div>
 				</div>
 			</div>
+			<!--搴曢儴-->
 			<div id="body">
 				<!-- 鎬诲紑鍏� -->
 				<div class="system-state">
@@ -931,11 +925,11 @@
 					<div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
 					<div class="state">
 						<span>鍫嗗灈鏈� 1</span>
-						<span>鑷姩</span>
+						<span class="state-ss machine-put-flag	">鍏ュ簱</span>
 					</div>
 					<div class="state">	
 						<span>鍫嗗灈鏈� 2</span>
-						<span>鑷姩</span>
+						<span class="state-ss machine-auto-flag	">鑷姩</span>
 						
 					</div>
 					<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
@@ -954,7 +948,7 @@
 					<div class="body-head">杈撻�佺嚎鐘舵��</div>
 					<div class="state states">
 						<span>杩愯緭绾挎�绘暟</span>
-						<span>45</span>
+						<span class="line-ss">45</span>
 					</div>
 					<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
 						<div class="button item-group">
@@ -967,10 +961,46 @@
 				</div>
 				<div class="bar-code">
 					<div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
+					<div class="tablebox">
+						<div class="table-head">
+							<li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+						</div>
+						<div class="table-body">
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+						</div>
+					</div>
+					<div class="tablebox">
+						<div class="table-head">
+							<li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+						</div>
+						<div class="table-body">
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+						</div>
+					</div>
+					<div class="tablebox">
+						<div class="table-head">
+							<li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+						</div>
+						<div class="table-body">
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+							<li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+						</div>
+					</div>
 				</div>
 			</div>
 			<!-- 鍫嗗灈鏈哄脊绐� -->
-			<div id="crnWindow" style="display: none;">
+			<div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
 				<div id="crnWindow-head">
 					<div class='detailed'></div>
 					<button></button>
@@ -982,7 +1012,7 @@
 							<span>鍫嗗灈鏈哄彿锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="crnNo">
+							<input type="text" name="crnNo" value="">
 						</div>
 					</div>
 					<!-- 宸ヤ綔鍙� -->
@@ -991,7 +1021,7 @@
 							<span>宸ヤ綔鍙凤細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="workNo">
+							<input type="text" name="workNo" value="">
 						</div>
 					</div>
 					<!-- 绔欐簮 -->
@@ -1000,7 +1030,7 @@
 							<span>绔欐簮锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="sourceStaNo">
+							<input type="text" name="sourceStaNo" value="">
 						</div>
 					</div>
 					<!-- 鐩爣绔� -->
@@ -1009,7 +1039,7 @@
 							<span>鐩爣绔欙細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="staNo">
+							<input type="text" name="staNo" value="">
 						</div>
 					</div>
 					<!-- 宸ヤ綔鐘舵�� -->
@@ -1018,7 +1048,7 @@
 							<span>宸ヤ綔鐘舵�侊細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="wrkSts">
+							<input type="text" name="wrkSts" value="">
 						</div>
 					</div>
 					<!-- 鍑哄叆绫诲瀷 -->
@@ -1027,7 +1057,7 @@
 							<span>鍑哄叆绫诲瀷锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="ioType">
+							<input type="text" name="ioType" value="">
 						</div>
 					</div>
 					<!-- 婧愬簱浣� -->
@@ -1036,7 +1066,7 @@
 							<span>婧愬簱浣嶏細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="sourceLocNo">
+							<input type="text" name="sourceLocNo" value="">
 						</div>
 					</div>
 					<!-- 鐩爣搴撲綅 -->
@@ -1045,7 +1075,7 @@
 							<span>鐩爣搴撲綅锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="locNo">
+							<input type="text" name="locNo" value="">
 						</div>
 					</div>
 					<!-- 鍫嗗灈鏈虹姸鎬� -->
@@ -1054,7 +1084,7 @@
 							<span>鍫嗗灈鏈虹姸鎬侊細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="crnStatus">
+							<input type="text" name="crnStatus" value="">
 						</div>
 					</div>
 					<!-- 寮傚父 -->
@@ -1063,13 +1093,13 @@
 							<span>寮傚父锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="error">
+							<input type="text" name="error" value="">
 						</div>
 					</div>
 				</form>
 			</div>
 			<!-- 杈撻�佽澶囧脊绐� -->
-			<div id="siteWindow" style="display: none;">
+			<div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
 				<!-- 琛ㄥご -->
 				<div id="siteWindow-head">
 					<div class='detailed'></div>
@@ -1082,7 +1112,7 @@
 							<span>璁惧鍙凤細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="siteId">
+							<input type="text" name="siteId" value="">
 						</div>
 					</div>
 					<!-- 宸ヤ綔鍙� -->
@@ -1091,7 +1121,7 @@
 							<span>宸ヤ綔鍙凤細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="workNo">
+							<input type="text" name="workNo" value="">
 						</div>
 					</div>
 					<!-- 宸ヤ綔鐘舵�� -->
@@ -1100,7 +1130,7 @@
 							<span>宸ヤ綔鐘舵�侊細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="wrkSts">
+							<input type="text" name="wrkSts" value="">
 						</div>
 					</div>
 					<!-- 鑷姩 -->
@@ -1145,7 +1175,7 @@
 							<span>鍑哄叆绫诲瀷锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="ioType">
+							<input type="text" name="ioType" value="">
 						</div>
 					</div>
 					<!-- 婧愮珯 -->
@@ -1154,7 +1184,7 @@
 							<span>婧愮珯锛�</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="sourceStaNo">
+							<input type="text" name="sourceStaNo" value="">
 						</div>
 					</div>
 					<!-- 鐩爣绔� -->
@@ -1163,7 +1193,7 @@
 							<span>鐩爣绔欙細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="staNo">
+							<input type="text" name="staNo" value="">
 						</div>
 					</div>
 					<!-- 婧愬簱浣� -->
@@ -1172,7 +1202,7 @@
 							<span>婧愬簱浣嶏細</span>
 						</div>
 						<div class="form-item-input">
-							<input type="text" name="sourceLocNo">
+							<input type="text" name="sourceLocNo" value="">
 						</div>
 					</div>
 					<!-- 鐩爣搴撲綅 -->
@@ -1181,7 +1211,7 @@
 						<span>鐩爣搴撲綅锛�</span>
 					</div>
 					<div class="form-item-input">
-						<input type="text" name="locNo">
+						<input type="text" name="locNo" value="">
 					</div>
 				</div>
 				
@@ -1194,27 +1224,79 @@
 	</body>
 </html>
 <script type="text/javascript">
-	// // 寮圭獥绔欑偣淇℃伅
-	// $('.site').on('click',function(){
-	// 	var id = this.id.split("-")[1];
-	// 	 $("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
-	// 	 $(".detailed").empty();
-	// 	 $('.detailed').append(id+'绔欑偣璇︾粏淇℃伅');
-	// });
-	// // 鍫嗗灈鏈轰俊鎭�
-	// $('.machine').on('click',function(){
-	// 	var id = this.id.split("-")[1];
-	// 	$("#crnWindow").attr('style','display:block;');
-	// 	$('.detailed').empty();
-	// 	$('.detailed').append(id+'鍙峰爢鍨涙満');
-	// })
-	// // 寮圭獥鍏抽棴
-	// $('button').on('click',function(){
-	// 	$('#siteWindow').attr('style','display:none')
-	// 	$('#crnWindow').attr('style','display:none')
-	// })
+	// 寮圭獥绔欑偣淇℃伅
+	$('.site').on('click',function(){
+		var id = this.id.split("-")[1];
+		 $("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
+		 $(".detailed").empty();
+		 $('.detailed').append(id+'绔欑偣璇︾粏淇℃伅');
+
+
+
+
+		 var res = {
+		 	 code: 500,
+			 msg: '鏈嶅姟鍣ㄥ紓甯�',
+			 data: {
+				 siteId:id,
+				 workNo:100,
+				 wrkSts:'杩愯涓�',
+				 autoing:'Y',
+				 loading:'',
+				 canining:'',
+				 canouting:'',
+				 ioType:'鍑哄簱',
+				 sourceStaNo:'绔欑偣2',
+				 staNo:'绔欑偣1',
+				 sourceLocNo:2,
+				 locNo:2,
+			 }
+		 }
+		http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
+
+		})
+		// res.data
+		for (var val in data) {
+			var find = $("#siteWindow").find(":input[name='" + val + "']");
+			if (find[0].type==='text') {
+				find.val(data[val]);
+			} else if (find[0].type === 'checkbox') {
+				find.attr("checked", data[val] === 'Y');
+			}
+		}
+
+	});
+	// 鍫嗗灈鏈轰俊鎭�
+	$('.machine').on('click',function(){
+		var id = this.id.split("-")[1];
+		$("#crnWindow").attr('style','display:block;');
+		$('.detailed').empty();
+		$('.detailed').append(id+'鍙峰爢鍨涙満');
+		$.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
+			for (var val in res.data) {
+				var find = $("#crnWindow").find(":input[name='" + val + "']");
+				if (find[0].type==='text') {
+					find.val(res.data[val]);
+				} else if (find[0].type === 'checkbox') {
+					find.attr("checked", res.data[val] === 'Y');
+				}
+			}
+		})
+	})
+	// 寮圭獥鍏抽棴
+	$('button').on('click',function(){
+		$('#siteWindow').attr('style','display:none')
+		$('#crnWindow').attr('style','display:none')
+	})
+
+
+
 	var crn1Position = 0;
 	var crn2Position = 0;
+	var crn3Position = 0;
+	var crn4Position = 0;
+	var crn5Position = 0;
+
 	// 鍒濆鍖�
 	getSitesInfo();
 	getCrnInfo();
@@ -1418,6 +1500,18 @@
 				$("#crn-2").animate({left: leftVal+'px'}, 1000);
 				crn2Position = leftVal;
 				break;
+			case 3:
+				$("#crn-3").animate({left: leftVal+'px'}, 1000);
+				crn3Position = leftVal;
+				break;
+			case 4:
+				$("#crn-4").animate({left: leftVal+'px'}, 1000);
+				crn4Position = leftVal;
+				break;
+			case 5:
+				$("#crn-5").animate({left: leftVal+'px'}, 1000);
+				crn5Position = leftVal;
+				break;
 			default:
 				break
 		}
@@ -1426,69 +1520,69 @@
 	// 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
 
 	// 杈撻�佽澶囩偣鍑讳簨浠�
-	$('.site').on('click', function () {
-		var id = this.id.split("-")[1];
-		if (id === undefined) {
-			return;
-		}
-		layer.open({
-			title: id + " 绔欑偣淇℃伅璇︽儏",
-			closeBtn: 0,
-			skin: 'layui-layer-lan',
-			offset: '180px',
-			type: 1,
-			shadeClose: true,
-			content: $('#siteWindow'),
-			area: ['35rem', '18rem'],
-			btn: ['纭畾', '鍏抽棴'],
-			success: function(layero, index){
-				http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
-					for (var val in res.data) {
-						var find = $("#siteWindow").find(":input[name='" + val + "']");
-						if (find[0].type==='text') {
-							find.val(res.data[val]);
-						} else if (find[0].type === 'checkbox') {
-							find.attr("checked", res.data[val] === 'Y');
-						}
-					}
-				})
-			},
-			end: function () {
-				$(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
-			}
-		});
-	});
+	// $('.site').on('click', function () {
+	// 	var id = this.id.split("-")[1];
+	// 	if (id === undefined) {
+	// 		return;
+	// 	}
+	// 	layer.open({
+	// 		title: id + " 绔欑偣淇℃伅璇︽儏",
+	// 		closeBtn: 0,
+	// 		skin: 'layui-layer-lan',
+	// 		offset: '180px',
+	// 		type: 1,
+	// 		shadeClose: true,
+	// 		content: $('#siteWindow'),
+	// 		area: ['35rem', '18rem'],
+	// 		btn: ['纭畾', '鍏抽棴'],
+	// 		success: function(layero, index){
+	// 			http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
+	// 				for (var val in res.data) {
+	// 					var find = $("#siteWindow").find(":input[name='" + val + "']");
+	// 					if (find[0].type==='text') {
+	// 						find.val(res.data[val]);
+	// 					} else if (find[0].type === 'checkbox') {
+	// 						find.attr("checked", res.data[val] === 'Y');
+	// 					}
+	// 				}
+	// 			})
+	// 		},
+	// 		end: function () {
+	// 			$(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
+	// 		}
+	// 	});
+	// });
 
 	// 鍫嗗灈鏈虹偣鍑讳簨浠�
-	$('.machine').on('click', function () {
-		var id = this.id.split("-")[1];
-		layer.open({
-			title: id+"鍙峰爢鍨涙満",
-			skin: 'layui-layer-lan',
-			closeBtn: 0,
-			type: 1,
-			offset: '150px',
-			shadeClose: true,
-			content: $("#crnWindow"),
-			area: ['40rem', '20rem'],
-			btn: ['纭畾', '鍏抽棴'],
-			success: function(layero, index){
-				http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
-					for (var val in res.data) {
-						var find = $("#crnWindow").find(":input[name='" + val + "']");
-						if (find[0].type==='text') {
-							find.val(res.data[val]);
-						} else if (find[0].type === 'checkbox') {
-							find.attr("checked", res.data[val] === 'Y');
-						}
-					}
-				})
-			},
-			end: function () {
-				$(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
-			}
-		});
-	});
+	// $('.machine').on('click', function () {
+	// 	var id = this.id.split("-")[1];
+	// 	layer.open({
+	// 		title: id+"鍙峰爢鍨涙満",
+	// 		skin: 'layui-layer-lan',
+	// 		closeBtn: 0,
+	// 		type: 1,
+	// 		offset: '150px',
+	// 		shadeClose: true,
+	// 		content: $("#crnWindow"),
+	// 		area: ['40rem', '20rem'],
+	// 		btn: ['纭畾', '鍏抽棴'],
+	// 		success: function(layero, index){
+	// 			http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
+	// 				for (var val in res.data) {
+	// 					var find = $("#crnWindow").find(":input[name='" + val + "']");
+	// 					if (find[0].type==='text') {
+	// 						find.val(res.data[val]);
+	// 					} else if (find[0].type === 'checkbox') {
+	// 						find.attr("checked", res.data[val] === 'Y');
+	// 					}
+	// 				}
+	// 			})
+	// 		},
+	// 		end: function () {
+	// 			$(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
+	// 		}
+	// 	});
+	// });
 
 
 	// 灏忚溅鍋忕Щ鍔ㄧ敾

--
Gitblit v1.9.1