首页修整

app-backend-web/src/main/java/com/hboxs/control/admin/IndexController.java

@@ -161,6 +161,7 @@ public class IndexController extends BaseController {
      *机器今日的报警记录,故障处理
      */
     @RequestMapping(value = "/alarmRecordList", method = RequestMethod.GET)
+    @ResponseBody
     public List<AlarmRecord> alarmRecordList(ModelMap model , RedirectAttributes redirectAttributes) {
         List<AlarmRecord> alarmRecordList = new ArrayList<>();
         Admin admin = adminService.getCurrent();

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

@@ -48,7 +48,7 @@
 					</div>
 					<div class="tag1 itembg">
 						<ul>
-							<li style="font-size: 30px;color: aqua;">7677</li><li style="font-size: 30px;color: aqua;">12/<span style="font-size: 30px;color: #ffd220;">76</span></li>
+							<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>
@@ -79,9 +79,9 @@
 					<div class="center1 item total itembg">
 						<div class="itemCon tag2">
 							<ul>
-								<li>767次</li>
-								<li class="totalNum"><strong id="totalNum" total="368082">0</strong><span>次</span></li>
-								<li>88次</li>
+								<li>598次</li>
+								<li class="totalNum"><strong id="totalNum" total="666">0</strong><span>次</span></li>
+								<li>68次</li>
 							</ul>
 							<ul>
 								<li>今日随机清洗次数</li>
@@ -98,7 +98,7 @@
 							<div class="infoPie2">
 								<ul class="clearfix">
 									<li class="color-zi">
-										<span class="border-zi">99%</span>
+										<span class="border-zi">36%</span>
 										<p>气味浓度</p>
 									</li>
 									<li class="color-blue">
@@ -141,12 +141,12 @@
 												<span>尾部喷水异常</span>
 												<span>2小时15分</span>
 												<span>申泽1层</span>
-												<span>待处理</span>
+												<span>已处理</span>
 											</div>
 										</li>
 										<li>
 											<div class="fontInner clearfix">
-												<span>ZC1712120023</span>
+												<span>ZC1712120024</span>
 												<span>机器人1</span>
 												<span>尾部喷水异常</span>
 												<span>2小时15分</span>
@@ -156,7 +156,7 @@
 										</li>
 										<li>
 											<div class="fontInner clearfix">
-												<span>ZC1712120023</span>
+												<span>ZC1712120025</span>
 												<span>机器人1</span>
 												<span>尾部喷水异常</span>
 												<span>2小时15分</span>
@@ -185,8 +185,8 @@
 								<span></span>
 							</div>
 						</div>
-						<div class="progress" progress="40%">
-							<h3 class="clearfix"><span>消毒水</span><i>40%</i></h3>
+						<div class="progress" progress="80%">
+							<h3 class="clearfix"><span>消毒水</span><i>80%</i></h3>
 							<div class="progressBar">
 								<span></span>
 							</div>
@@ -213,7 +213,7 @@
 									<p>水耗（吨）</p>
 								</li>
 								<li class="color-green">
-									<span class="border-green">65</span>
+									<span class="border-green">66</span>
 									<p>电耗（度）</p>
 								</li>
 								<li class="color-blue">

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

@@ -203,7 +203,7 @@ $(function(){
 		tooltip: {
 			trigger: 'item',
 			formatter: function(params) {
-				var res = '本月'+params.name+'号运单数：'+params.data;
+				var res = params.name+'使用次数为：'+params.data;
 				return res;
 			}
 		},
@@ -320,5 +320,21 @@ $(function(){
 		myChart2.resize();
 		myChart3.resize();
 	});
+    setInterval(getAlarmRecord,15000);
+    function getAlarmRecord(){
+    	var list = null;
+        $.ajax({
+            url:"/asl-admin/index/alarmRecordList.htm",
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+            	list = data[0].id;
+            }
+        });
+        var da = list;
+        var ta = da;
+		console.log("list:",list);
 
+	};
 });