优化手机扫码页面
diff --git a/src/main/resources/templates/system/start/start.html b/src/main/resources/templates/system/start/start.html
index 79888d7..753655f 100644
--- a/src/main/resources/templates/system/start/start.html
+++ b/src/main/resources/templates/system/start/start.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
+<html xmlns:th="http://www.thymeleaf.org"
+ xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity4">
<head>
<meta charset="utf-8">
<title>扫码成功</title>
@@ -10,22 +11,31 @@
<link rel="stylesheet" th:href="@{/static/libs/layui/css/layui.css}" media="all"/>
<link rel="stylesheet" th:href="@{/static/custom/css/admin.css}" media="all"/>
</head>
-<body>
+<style type="text/css">
+ html, body {
+ height: 100%;
+ width: 100%
+ }
+</style>
+<body style="background-color:#03a9f5;height: 100%">
<div class="layui-fluid">
- <h2 style="margin-top: 10px">
+ <h2 style="margin-top: 10px;color: white">
设备区域:<span class="layui-anim layui-anim-loop layui-anim-">[[${areaname}]]</span>
</h2>
- <h2 style="margin-top: 10px">
+ <h2 style="margin-top: 10px;color: white">
设备名称:<span class="layui-anim layui-anim-loop layui-anim-">[[${devicename}]]</span>
</h2>
- <h2 id="qrcode-success" style="margin-top: 70px;text-align: center">
- 扫码成功!
- </h2>
+ <div style="margin-top: 70px;text-align: center">
+ <h2 id="qrcode-success" style="color:white;">
+ 扫码成功!
+ </h2>
+ </div>
<div style="margin-top:25px;text-align:center">
- <button id="button-start-water" class="layui-btn icon-btn" style="width: 120px;height: 45px">
+ <button id="button-start-water" class="layui-btn icon-btn"
+ style="background-color:#04cb64;width: 120px;height: 45px">
<div style="font-size: 20px">开始出水</div>
</button>
- <span><h2 id="msg-area"></h2></span>
+ <span><h2 id="msg-area" style="color: white"></h2></span>
</div>
</div>
</body>
@@ -50,8 +60,11 @@
data: JSON.stringify(allData),
success: function (data) {
if (data.retcode == 0) {
- $("#button-start-water").hide()
- $("#msg-area").html("正在控制设备出水，请稍后!")
+ $("#button-start-water").hide();
+ $("#qrcode-success").css("display", "none");
+ $("#msg-area").html("<div style='margin-bottom: 10px'>正在出水中，具体情况请参考水控器界面</div>" +
+ "<div style='margin-bottom: 10px'>停止出水请按设备<span style='font-weight: bold;color: red'>取消</span>键</div>" +
+ "<div style='margin-bottom: 10px'>返回主菜单请点击右上角</div>")
} else {
$("#qrcode-success").html(" ")
$("#button-start-water").hide()