wuhongshuang 5 éve
szülő
commit
855062d992

+ 267 - 191
app-backend-web/src/main/webapp/WEB-INF/template/admin/common/index.ftl

@@ -12,237 +12,313 @@
 <script type="text/javascript" src="/resources/index/js/jquery.shCircleLoader-min.js"></script>
 </head>
 <body>
-	<div id="loader"></div>
-	<script type="text/javascript">
-		$('#loader').shCircleLoader({color: "#00deff"});
-	</script>
-	<!--Top Start!-->
-	<div class="scanboardWp animsition">
-		<div id="top">
-			<div class="wp clearfix">
-				<div class="left topBar">
-					<div class="topTime">时间加载中...</div>
-				</div>
+<div id="loader"></div>
+<script type="text/javascript">
+	$('#loader').shCircleLoader({color: "#00deff"});
+</script>
+<!--Top Start!-->
+<div class="scanboardWp animsition">
+	<div id="top">
+		<div class="wp clearfix">
+			<div class="left topBar">
+				<div class="topTime">时间加载中...</div>
+			</div>
+
+			<div class="center topLogo">
+				<div class="title">智能洗手间物联系统</div>
+				<!--					<a href="#"><img src="images/logo.png"></a>-->
+			</div>
+			<div class="right pageTit">
+				<a class="summaryBtn" href="javascript:;">进入后台</a>
+				<div class="shebei">设备编号:33333444</div>
+			</div>
+		</div>
+	</div>
+	<!--Top End!-->
 
-				<div class="center topLogo">
-					<div class="title">智能洗手间物联系统</div>
-<!--					<a href="#"><img src="images/logo.png"></a>-->
+	<!--Main Start!-->
+	<div id="main" class="wp clearfix">
+		<div class="left">
+			<!-- 今日人流量、在线机台数量 -->
+			<div class="item total left1">
+				<div class="itemTit">
+					<span class="border-yellow">今日人流量、在线机台数量</span>
 				</div>
-				<div class="right pageTit">
-					<#--<a class="summaryBtn" href="javascript:;">进入后台</a>-->
-					<a class="summaryBtn" href="/asl-admin/common/main.htm">进入后台</a>
-					<div class="shebei"></div>
-					<#--<div class="shebei">设备编号:33333444</div>-->
+				<div class="tag1 itembg">
+					<ul>
+						<li style="font-size: 30px;color: aqua;">7677W</li><li style="font-size: 30px;color: aqua;">12/<span style="font-size: 30px;color: #ffd220;">76</span></li>
+					</ul>
+					<ul>
+						<li style="font-size: 16px;color: #fff;">人流量</li><li style="font-size: 16px;color: #fff;">在线设备</li>
+					</ul>
 				</div>
 			</div>
-		</div>
-		<!--Top End!-->
-		
-		<!--Main Start!-->
-		<div id="main" class="wp clearfix">
-			<div class="left">
-				<!-- 今日人流量、在线机台数量 -->
-				<div class="item total left1">
-					<div class="itemTit">
-						<span class="border-yellow">今日人流量、在线机台数量</span>
-					</div>
-					<div class="tag1 itembg">
-						<ul>
-							<li style="font-size: 30px;color: aqua;">666</li><li style="font-size: 30px;color: aqua;">12/<span style="font-size: 30px;color: #ffd220;">76</span></li>
-						</ul>
-						<ul>
-							<li style="font-size: 16px;color: #fff;">人流量</li><li style="font-size: 16px;color: #fff;">在线设备</li>
-						</ul>
+			<!--设备清洗排行-->
+			<div class="left2 item billState2">
+				<div class="itemTit" style="position: relative">
+					<span class="border-blue">设备清洗排行</span>
+					<div class="dateDropdown fr">
+						<h3>2020-01-01</h3>
+						<div class="dropdown">
+							<a href="#">2020-01-01</a>
+							<a href="#">2020-02-01</a>
+							<a href="#">2020-02-01</a>
+						</div>
 					</div>
 				</div>
-				<!--能耗-->
-				<div class="item left2">
-					<div class="itemTit">
-						<span class="border-green">使用统计</span>
+				<div class="itemCon">
+					<div class="StateBox">
+						<div class="StateTit">
+							<span>排名</span>
+							<span>设备名称</span>
+							<span>次数</span>
+						</div>
+						<div id="FontScroll2">
+							<ul>
+								<li>
+									<div class="fontInner clearfix">
+										<span>1</span>
+										<span>机器人1</span>
+										<span>1</span>
+									</div>
+								</li>
+								<li>
+									<div class="fontInner clearfix">
+										<span>2</span>
+										<span>机器人2</span>
+										<span>2</span>
+									</div>
+								</li>
+								<li>
+									<div class="fontInner clearfix">
+										<span>3</span>
+										<span>机器人3</span>
+										<span>3</span>
+									</div>
+								</li>
+								<li>
+									<div class="fontInner clearfix">
+										<span>4</span>
+										<span>机器人4</span>
+										<span>4</span>
+									</div>
+								</li>
+								<li>
+									<div class="fontInner clearfix">
+										<span>5</span>
+										<span>机器人5</span>
+										<span>5</span>
+									</div>
+								</li>
+							</ul>
+						</div>
 					</div>
-					<div id="myChart1"></div>
-
 				</div>
+			</div>
 
-				<!--问题占比-->
-				<div class="item left3">
-					<div class="itemTit">
-						<span class="border-blue">问题占比</span>
+			<!--问题占比-->
+			<div class="item left3">
+				<div class="itemTit" style="position: relative">
+					<span class="border-blue" >问题占比</span>
+					<div class="dateDropdown fr">
+						<h3>2020-01-01</h3>
+						<div class="dropdown">
+							<a href="#">2020-01-01</a>
+							<a href="#">2020-02-01</a>
+							<a href="#">2020-02-01</a>
+						</div>
 					</div>
-					<div id="myChart2"></div>
 				</div>
+				<div id="myChart2"></div>
 			</div>
+		</div>
 
-			<div class="center">
-				<div class="centerWp">
-					<!--中间大地图-->
-					<div class="center1 item total itembg">
-						<div class="itemCon tag2">
-							<ul>
-								<li>598次</li>
-								<li class="totalNum"><strong id="totalNum" total="666">0</strong><span>次</span></li>
-								<li>68次</li>
-							</ul>
-							<ul>
-								<li>今日随机清洗次数</li>
-								<li>今日总清洗次数</li>
-								<li>今日定时清洗次数</li>
-							</ul>
+		<div class="center">
+			<div class="centerWp">
+				<!--中间大地图-->
+				<div class="center1 item total itembg">
+					<div class="itemCon tag2" style="min-height: 125px;">
+						<ul>
+							<li>767次</li>
+							<li class="totalNum"><strong id="totalNum" total="8082">0</strong><span>次</span></li>
+							<li>88次</li>
+						</ul>
+						<ul>
+							<li>今日随机清洗次数</li>
+							<li>今日总清洗次数</li>
+							<li>今日定时清洗次数</li>
+						</ul>
+					</div>
+				</div>
+				<div class="center2">
+					<div class="itemTit" style="position: relative">
+						<span class="border-yellow">环境检测</span>
+						<div class="dateDropdown fr">
+							<h3>申泽机器人1号</h3>
+							<div class="dropdown">
+								<a href="#">申泽机器人1号</a>
+								<a href="#">申泽机器人2号</a>
+								<a href="#">申泽机器人3号</a>
+							</div>
 						</div>
 					</div>
-					<div class="center2">
-						<div class="itemTit">
-							<span class="border-yellow">环境检测</span>
+					<div class="itemCon itembg">
+						<div class="infoPie2" style="min-height: 125px;">
+							<ul class="clearfix">
+								<li class="color-zi">
+									<span class="border-zi">99%</span>
+									<p>气味浓度</p>
+								</li>
+								<li class="color-blue">
+									<span class="border-blue">23℃</span>
+									<p>温度</p>
+								</li>
+								<li class="color-yellow">
+									<span class="border-yellow">36°</span>
+									<p>湿度</p>
+								</li>
+								<li class="color-green">
+									<span class="border-green">89%</span>
+									<p>环境舒适度</p>
+								</li>
+							</ul>
 						</div>
-						<div class="itemCon itembg">
-							<div class="infoPie2">
-								<ul class="clearfix">
-									<li class="color-zi">
-										<span class="border-zi">36%</span>
-										<p>气味浓度</p>
-									</li>
-									<li class="color-blue">
-										<span class="border-blue">23℃</span>
-										<p>温度</p>
+					</div>
+				</div>
+				<!--故障处理-->
+				<div class="center3 item billState">
+					<div class="itemTit">
+						<span class="border-blue">故障处理</span>
+					</div>
+					<div class="itemCon">
+						<div class="StateBox">
+							<div class="StateTit">
+								<span>设备唯一码</span>
+								<span>设备名称</span>
+								<span>报警内容</span>
+								<span>报警时间</span>
+								<span>区域</span>
+								<span>全部状态</span>
+							</div>
+							<div id="FontScroll">
+								<ul>
+									<li>
+										<div class="fontInner clearfix">
+											<span>ZC1712120023</span>
+											<span>机器人1</span>
+											<span>尾部喷水异常</span>
+											<span>2小时15分</span>
+											<span>申泽1层</span>
+											<span>待处理</span>
+										</div>
 									</li>
-									<li class="color-yellow">
-										<span class="border-yellow">36%</span>
-										<p>湿度</p>
+									<li>
+										<div class="fontInner clearfix">
+											<span>ZC1712120023</span>
+											<span>机器人1</span>
+											<span>尾部喷水异常</span>
+											<span>2小时15分</span>
+											<span>申泽1层</span>
+											<span>待处理</span>
+										</div>
 									</li>
-									<li class="color-green">
-										<span class="border-green">89%</span>
-										<p>环境舒适度</p>
+									<li>
+										<div class="fontInner clearfix">
+											<span>ZC1712120023</span>
+											<span>机器人1</span>
+											<span>尾部喷水异常</span>
+											<span>2小时15分</span>
+											<span>申泽1层</span>
+											<span>待处理</span>
+										</div>
 									</li>
 								</ul>
 							</div>
 						</div>
 					</div>
-					<!--故障处理-->
-					<div class="center3 item billState">
-						<div class="itemTit">
-							<span class="border-blue">故障处理</span>
-						</div>
-						<div class="itemCon">
-							<div class="StateBox">
-								<div class="StateTit">
-									<span>设备唯一码</span>
-									<span>设备名称</span>
-									<span>报警内容</span>
-									<span>报警时间</span>
-									<span>区域</span>
-									<span>全部状态</span>
-								</div>
-								<div id="FontScroll">
-									<ul>
-										<li>
-											<div class="fontInner clearfix">
-												<span>ZC1712120023</span>
-												<span>机器人1</span>
-												<span>尾部喷水异常</span>
-												<span>2小时15分</span>
-												<span>申泽1层</span>
-												<span>已处理</span>
-											</div>
-										</li>
-										<li>
-											<div class="fontInner clearfix">
-												<span>ZC1712120024</span>
-												<span>机器人1</span>
-												<span>尾部喷水异常</span>
-												<span>2小时15分</span>
-												<span>申泽1层</span>
-												<span>待处理</span>
-											</div>
-										</li>
-										<li>
-											<div class="fontInner clearfix">
-												<span>ZC1712120025</span>
-												<span>机器人1</span>
-												<span>尾部喷水异常</span>
-												<span>2小时15分</span>
-												<span>申泽1层</span>
-												<span>待处理</span>
-											</div>
-										</li>
-									</ul>
-								</div>
-							</div>
-						</div>
-					</div>
 				</div>
 			</div>
+		</div>
 
-			<div class="right">
-				<!--剩余物料-->
-				<div class="right1 item waybill">
-					<div class="itemTit">
-						<span class="border-yellow">剩余物料</span>
+		<div class="right">
+			<!--剩余物料-->
+			<div class="right1 item waybill">
+				<div class="itemTit" style="position: relative">
+					<span class="border-yellow">剩余物料</span>
+					<div class="dateDropdown fr">
+						<h3>2020-01-01</h3>
+						<div class="dropdown">
+							<a href="#">2020-01-01</a>
+							<a href="#">2020-02-01</a>
+							<a href="#">2020-02-01</a>
+						</div>
 					</div>
-					<div class="itemCon">
-						<div class="progress" progress="100%">
-							<h3 class="clearfix"><span>清洁剂</span><i>100%</i></h3>
-							<div class="progressBar">
-								<span></span>
-							</div>
+				</div>
+				<div class="itemCon">
+					<div class="progress" progress="100%">
+						<h3 class="clearfix"><span>清洁剂</span><i>100%</i></h3>
+						<div class="progressBar">
+							<span></span>
 						</div>
-						<div class="progress" progress="80%">
-							<h3 class="clearfix"><span>消毒水</span><i>80%</i></h3>
-							<div class="progressBar">
-								<span></span>
-							</div>
+					</div>
+					<div class="progress" progress="40%">
+						<h3 class="clearfix"><span>消毒水</span><i>40%</i></h3>
+						<div class="progressBar">
+							<span></span>
 						</div>
-						<div class="progress" progress="60%">
-							<h3 class="clearfix"><span>清新剂</span><i>60%</i></h3>
-							<div class="progressBar">
-								<span></span>
-							</div>
+					</div>
+					<div class="progress" progress="60%">
+						<h3 class="clearfix"><span>清新剂</span><i>60%</i></h3>
+						<div class="progressBar">
+							<span></span>
 						</div>
 					</div>
 				</div>
+			</div>
 
-				<!--使用统计-->
-				<div class="right2 item basicInfo">
-					<div class="itemTit">
-						<span class="border-green">能耗</span>
-					</div>
-					<div class="itemCon itembg">
-						<div class="infoPie">
-							<ul class="clearfix">
-								<li class="color-yellow">
-									<span class="border-yellow">32</span>
-									<p>水耗(吨)</p>
-								</li>
-								<li class="color-green">
-									<span class="border-green">66</span>
-									<p>电耗(度)</p>
-								</li>
-								<li class="color-blue">
-									<p>水费:66元</p>
-									<p>电费:66元</p>
-								</li>
-							</ul>
-						</div>
+			<!--使用统计-->
+			<div class="right2 item basicInfo">
+				<div class="itemTit">
+					<span class="border-green">能耗</span>
+				</div>
+				<div class="itemCon itembg">
+					<div class="infoPie">
+						<ul class="clearfix">
+							<li class="color-yellow">
+								<span class="border-yellow">32</span>
+								<p>水耗(吨)</p>
+							</li>
+							<li class="color-green">
+								<span class="border-green">65</span>
+								<p>电耗(度)</p>
+							</li>
+							<li class="color-blue">
+								<p>水费:66元</p>
+								<p>电费:66元</p>
+							</li>
+						</ul>
 					</div>
 				</div>
+			</div>
 
-				<!--使用统计-->
-				<div class="right3 item billState">
-					<div class="itemTit">
-						<span class="border-green">使用统计</span>
-					</div>
-					<div id="myChart3"></div>
+			<!--使用统计-->
+			<div class="right3 item billState">
+				<div class="itemTit">
+					<span class="border-green">使用统计</span>
 				</div>
+				<div id="myChart3"></div>
 			</div>
 		</div>
-		<!--Main End!-->
 	</div>
+	<!--Main End!-->
+</div>
 
-	<canvas id="canvas" style="position: absolute;top: 0;left: 0;"></canvas>
+<canvas id="canvas" style="position: absolute;top: 0;left: 0;"></canvas>
 </body>
-<script type="text/javascript" src="/resources/index/js/bg.js"></script>
-<script type="text/javascript" src="/resources/index/js/scanboard.js"></script>
-<script type="text/javascript" src="/resources/index/js/fontscroll.js"></script>
-<script type="text/javascript" src="/resources/index/js/jquery.animsition.js"></script>
-<script type="text/javascript" src="/resources/index/js/jquery.nicescroll.js"></script>
-<script type="text/javascript" src="/resources/index/js/echarts.min.js"></script>
+<script type="text/javascript" src="js/bg.js"></script>
+<script type="text/javascript" src="js/scanboard.js"></script>
+<script type="text/javascript" src="js/fontscroll.js"></script>
+<script type="text/javascript" src="js/jquery.animsition.js"></script>
+<script type="text/javascript" src="js/jquery.nicescroll.js"></script>
+<script type="text/javascript" src="js/echarts.min.js"></script>
 </html>

+ 216 - 34
app-backend-web/src/main/webapp/resources/index/css/scanboard.css

@@ -174,10 +174,12 @@ body{
 	color: #fff;
 	text-align: left;
 }
-#top .topBar .company{
-	position: relative;
+.dateDropdown{
+	position: absolute;
+	top: 0px;
+	right: 0px;
 }
-#top .topBar .company h3{
+.dateDropdown h3{
 	text-align: right;
 	color: #02b6d4;
 	height: 28px;
@@ -187,7 +189,7 @@ body{
 	cursor: pointer;
 	position: relative;
 }
-#top .topBar .company h3:before{
+.dateDropdown h3:before{
 	display: block;
 	content: "";
 	width: 20px;
@@ -198,7 +200,7 @@ body{
 	left: 0;
 	top: 3px;
 }
-#top .topBar .company h3:after{
+.dateDropdown h3:after{
 	display: block;
 	content: "";
 	width: 7px;
@@ -208,7 +210,7 @@ body{
 	right: 0;
 	top: 10px;
 }
-#top .topBar .company .dropdown{
+.dateDropdown .dropdown{
 	position: absolute;
 	top: 28px;
 	right: -10px;
@@ -218,10 +220,10 @@ body{
 	min-width: 100px;
 	display: none;
 }
-#top .topBar .company:hover .dropdown{
+.dateDropdown:hover .dropdown{
 	display: block;
 }
-#top .topBar .company .dropdown a{
+.dateDropdown .dropdown a{
 	display: block;
 	text-align: center;
 	line-height: 24px;
@@ -485,11 +487,50 @@ body{
 .billState .progress h3 i{
 	font-style: normal;
 }
+.billState2 .StateTit{
+	height: 37px;
+}
+.billState2 .StateBox span{
+	text-align: center;
+	float: left;
+	width: 33%;
+	height: 37px;
+	line-height: 37px;
+	color: #fff;
+	overflow: hidden;
+	text-overflow:ellipsis
+}
+.billState2 .StateBox span:nth-child(1){
+	width: 33%;
+}
+.billState2 .StateBox span:nth-child(2){
+	width: 33%;
+}
+.billState2 .StateBox span:nth-child(3){
+	width: 33%;
+}
+.billState2 .StateBox .fontInner{
+	border-bottom: 1px dashed #404040;
+}
+.billState2 .progress{
+	margin-top: 15px;
+}
+.billState2 .progress h3{
+	height: 20px;
+	line-height: 20px;
+	top: -7px;
+}
+#FontScroll2{
+	height: 128px;
+}
 #FontScroll{
 	height: 228px;
 	overflow: hidden;
 }
-
+#FontScroll2{
+	height: 128px;
+	overflow: hidden;
+}
 
 .filterbg{
 	width: 100%;
@@ -590,12 +631,12 @@ body{
 	#top .topBar .topTime{
 		padding-top: 16px;
 	}
-	#top .topBar .company h3{
+	.dateDropdown h3{
 		height: 26px;
 		line-height: 26px;
 		font-size: 16px;
 	}
-	#top .topBar .company .dropdown{
+	.dateDropdown .dropdown{
 		top: 26px;
 	}
 
@@ -730,11 +771,49 @@ body{
 		line-height: 20px;
 		top: -7px;
 	}
+
+
+	.billState2 .StateTit{
+		height: 37px;
+	}
+	.billState2 .StateBox span{
+		text-align: center;
+		float: left;
+		width: 33%;
+		height: 37px;
+		line-height: 37px;
+		color: #fff;
+		overflow: hidden;
+		text-overflow:ellipsis
+	}
+	.billState2 .StateBox span:nth-child(1){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(2){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(3){
+		width: 33%;
+	}
+
+	.billState2 .progress{
+		margin-top: 15px;
+	}
+	.billState2 .progress h3{
+		height: 20px;
+		line-height: 20px;
+		top: -7px;
+	}
+	#FontScroll2{
+		height: 128px;
+	}
+
 	#FontScroll{
 		height: 228px;
 	}
 
 
+
 	.popup .popupClose{
 		width: 40px;
 		height: 40px;
@@ -755,17 +834,17 @@ body{
 	#top .topBar .topTime{
 		padding-top: 10px;
 	}
-	#top .topBar .company h3{
+	.dateDropdown h3{
 		height: 24px;
 		line-height: 24px;
 		font-size: 15px;
 	}
-	#top .topBar .company h3:before{
+	.dateDropdown h3:before{
 		width: 18px;
 		height: 18px;
 		top: 2px;
 	}
-	#top .topBar .company .dropdown{
+	.dateDropdown .dropdown{
 		top: 24px;
 	}
 
@@ -901,6 +980,41 @@ body{
 		line-height: 20px;
 		top: -7px;
 	}
+
+	.billState2 .StateTit{
+		height: 37px;
+	}
+	.billState2 .StateBox span{
+		text-align: center;
+		float: left;
+		width: 33%;
+		height: 37px;
+		line-height: 37px;
+		color: #fff;
+		overflow: hidden;
+		text-overflow:ellipsis
+	}
+	.billState2 .StateBox span:nth-child(1){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(2){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(3){
+		width: 33%;
+	}
+
+	.billState2 .progress{
+		margin-top: 15px;
+	}
+	.billState2 .progress h3{
+		height: 20px;
+		line-height: 20px;
+		top: -7px;
+	}
+	#FontScroll2{
+		height: 128px;
+	}
 	#FontScroll{
 		height: 190px;
 	}
@@ -927,17 +1041,17 @@ body{
 		padding-top: 4px;
 		font-size: 12px;
 	}
-	#top .topBar .company h3{
+	.dateDropdown h3{
 		height: 22px;
 		line-height: 22px;
 		font-size: 14px;
 	}
-	#top .topBar .company h3:before{
+	.dateDropdown h3:before{
 		width: 18px;
 		height: 18px;
 		top: 2px;
 	}
-	#top .topBar .company .dropdown{
+	.dateDropdown .dropdown{
 		top: 22px;
 	}
 
@@ -1072,6 +1186,40 @@ body{
 		line-height: 20px;
 		top: -7px;
 	}
+	.billState2 .StateTit{
+		height: 37px;
+	}
+	.billState2 .StateBox span{
+		text-align: center;
+		float: left;
+		width: 33%;
+		height: 37px;
+		line-height: 37px;
+		color: #fff;
+		overflow: hidden;
+		text-overflow:ellipsis
+	}
+	.billState2 .StateBox span:nth-child(1){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(2){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(3){
+		width: 33%;
+	}
+
+	.billState2 .progress{
+		margin-top: 15px;
+	}
+	.billState2 .progress h3{
+		height: 20px;
+		line-height: 20px;
+		top: -7px;
+	}
+	#FontScroll2{
+		height: 128px;
+	}
 	#FontScroll{
 		height: 128px;
 	}
@@ -1107,17 +1255,17 @@ body{
 		padding-top: 4px;
 		font-size: 12px;
 	}
-	#top .topBar .company h3{
+	.dateDropdown h3{
 		height: 22px;
 		line-height: 22px;
 		font-size: 14px;
 	}
-	#top .topBar .company h3:before{
+	.dateDropdown h3:before{
 		width: 18px;
 		height: 18px;
 		top: 2px;
 	}
-	#top .topBar .company .dropdown{
+	.dateDropdown .dropdown{
 		top: 22px;
 	}
 
@@ -1250,6 +1398,40 @@ body{
 		line-height: 20px;
 		top: -7px;
 	}
+	.billState2 .StateTit{
+		height: 37px;
+	}
+	.billState2 .StateBox span{
+		text-align: center;
+		float: left;
+		width: 33%;
+		height: 37px;
+		line-height: 37px;
+		color: #fff;
+		overflow: hidden;
+		text-overflow:ellipsis
+	}
+	.billState2 .StateBox span:nth-child(1){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(2){
+		width: 33%;
+	}
+	.billState2 .StateBox span:nth-child(3){
+		width: 33%;
+	}
+
+	.billState2 .progress{
+		margin-top: 15px;
+	}
+	.billState2 .progress h3{
+		height: 20px;
+		line-height: 20px;
+		top: -7px;
+	}
+	#FontScroll2{
+		height: 128px;
+	}
 	#FontScroll{
 		height: 128px;
 	}
@@ -1322,7 +1504,7 @@ body{
 	-moz-transition: 0.4s ease-in-out;
 	-ms-transition: 0.4s ease-in-out;
 	-o-transition: 0.4s ease-in-out;
-	transition: 0.4s ease-in-out; 
+	transition: 0.4s ease-in-out;
 }
 .btnLayer .search .open{
 	width: 240px;
@@ -1364,19 +1546,19 @@ body{
 	color: #fff;
 }
 .btnLayer .search form input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #fff; opacity:1; 
+	color: #fff; opacity:1;
 }
 
 .btnLayer .search form input::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #fff;opacity:1;
+	color: #fff;opacity:1;
 }
 
 .btnLayer .search form input:-ms-input-placeholder{
-    color: #fff;opacity:1;
+	color: #fff;opacity:1;
 }
 
 .btnLayer .search form input::-webkit-input-placeholder{
-    color: #fff;opacity:1;
+	color: #fff;opacity:1;
 }
 .btnLayer a.infoBtn{
 	background: rgba(0,222,255,0.2);
@@ -1489,19 +1671,19 @@ body{
 	color: #00ddfe;
 }
 .infoBox .infoLeft .topSearch input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-    color: #00ddfe; opacity:1; 
+	color: #00ddfe; opacity:1;
 }
 
 .infoBox .infoLeft .topSearch input::-moz-placeholder { /* Mozilla Firefox 19+ */
-    color: #00ddfe;opacity:1;
+	color: #00ddfe;opacity:1;
 }
 
 .infoBox .infoLeft .topSearch input:-ms-input-placeholder{
-    color: #00ddfe;opacity:1;
+	color: #00ddfe;opacity:1;
 }
 
 .infoBox .infoLeft .topSearch input::-webkit-input-placeholder{
-    color: #00ddfe;opacity:1;
+	color: #00ddfe;opacity:1;
 }
 
 .infoBox .infoLeft .carState{
@@ -1579,7 +1761,7 @@ body{
 .infoBox .infoRight .carIntro{
 	height: 30%;
 	box-sizing: border-box;
-	border-bottom: 1px solid #13284d; 
+	border-bottom: 1px solid #13284d;
 }
 .infoBox .infoRight .introBox{
 	width: 72%;
@@ -1654,7 +1836,7 @@ body{
 	box-sizing: border-box;
 	padding-top:40px;
 	border-top: 1px solid #030303;
-	position: relative; 
+	position: relative;
 }
 .infoBox .infoRight .timetable .topTool{
 	height: 28px;
@@ -1662,7 +1844,7 @@ body{
 	position: absolute;
 	width: 100%;
 	left: 0;
-	top: 0; 
+	top: 0;
 }
 .infoBox .infoRight .timetable .tableExplain{
 	height: 14px;
@@ -1731,7 +1913,7 @@ body{
 }
 .infoBox .timetable .timeBox{
 	height: 100%;
-	position: relative; 
+	position: relative;
 }
 .infoBox .timetable .timeBox .dataContainer{
 	height: 100%;
@@ -1831,7 +2013,7 @@ body{
 	width: 20%;
 	position: absolute;
 	top: 0;
-	right:0; 
+	right:0;
 	padding-top: 30px;
 }
 .infoBox .timetable .totalTable .totalTit{

+ 3 - 73
app-backend-web/src/main/webapp/resources/index/js/scanboard.js

@@ -76,79 +76,9 @@ $(function(){
 
 
 
-    var myChart1 = echarts.init(document.getElementById('myChart1'));
     var myChart2 = echarts.init(document.getElementById('myChart2'));
     var myChart3 = echarts.init(document.getElementById('myChart3'));
 
-	var option1 = {
-		tooltip: {
-			trigger: 'item',
-            formatter: function(params) {
-                var res = params.name+'使用次数:'+params.data;
-                return res;
-            }
-		},
-		grid: {
-			top: '5%',
-			left: '0%',
-	        width: '100%',
-	        height: '95%',
-	        containLabel: true
-	    },
-		xAxis: {
-			data: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
-			axisLabel: {
-                show: true,
-                textStyle: {
-                    fontSize: '12px',
-                    color: '#fff',
-                }
-           	},
-           	axisLine:{
-                lineStyle:{
-                    color:'#fff',
-                    width:1,
-                }
-            }
-		},
-
-		yAxis: {
-			axisLabel: {
-                show: true,
-                textStyle: {
-                    fontSize: '12px',
-                    color: '#fff',
-                }
-           	},
-           	axisLine:{
-                lineStyle:{
-                    color:'#fff',
-                    width:1,
-                }
-            },
-            splitLine:{
-	            show:false,
-    		}
-		},
-
-		series :{
-			type: 'line',
-			data: ['5','14','3','6','8','18','11','4','8','7','16','13'],
-			itemStyle: {
-                normal: {
-                	barBorderRadius:[5, 5, 5, 5],
-                    color: new echarts.graphic.LinearGradient(
-                        0, 0, 0, 1,
-                        [
-                            {offset: 0, color: '#3876cd'},
-                            {offset: 0.5, color: '#45b4e7'},
-                            {offset: 1, color: '#54ffff'}
-                        ]
-                    ),
-                },
-            },
-		},
-	}
 	var option2 = {
 		legend: {
 			type: 'scroll',
@@ -271,7 +201,9 @@ $(function(){
 		},
 	}
 	//列表文字滚动
+
 	$('#FontScroll').FontScroll({time: 3000,num: 1});
+	$('#FontScroll2').FontScroll({time: 5000,num: 1});
 
 	setTimeout(function(){
 
@@ -307,16 +239,14 @@ $(function(){
 		});
 
 		//总计清洗次数
-		totalNum($('#totalNum'),1000);
+		totalNum($('#totalNum'),10);
 
-		myChart1.setOption(option1);
 		myChart2.setOption(option2);
 		myChart3.setOption(option3);
 
 	},500);
 
 	$(window).resize(function(){
-		myChart1.resize();
 		myChart2.resize();
 		myChart3.resize();
 	});