From a9d4000e3b8ad44ffbea3064d2d6cf0d1350c30d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:14:12 +0800
Subject: [PATCH] 控制台和提升机页面修改
---
src/main/webapp/views/pipeline.html | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 8361771..cd67a6d 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -15,7 +15,7 @@
<style>
.io-mode-box {
float: left;
- width: 25%;
+ /*width: 25%;*/
text-align: center;
}
.io-mode-box label {
@@ -23,7 +23,7 @@
}
.ioModeBtn {
vertical-align: middle;
- width: 50%;
+ width: 25%;
height: 30px;
left: 0;
top: 0;
@@ -63,23 +63,14 @@
<label>1#</label>
<button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
</div>
- <div class="io-mode-box">
- <label>2#</label>
- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>3#</label>
- <button id="io-mode-3" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
</fieldset>
- </div>
-
- <div>
- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
</div>
<!-- 涓讳綋 -->
<div class="plc-log-body">
+ <div>
+ <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
+ </div>
<table id="plc-error-table">
<thead>
<tr>
@@ -215,20 +206,23 @@
if (ioModeData != null && ioModeData.length > 1) {
ioModeData.forEach(function(e) {
if (e.floor === Number(floor)) {
- if (e.modeVal === 3 || e.modeVal === 4) {
- layer.confirm('纭畾鍒囨崲涓哄叆搴撴ā寮忓悧锛�',function () {
+ if (e.modeVal) {
+ layer.confirm('纭畾鏂紑鍏呯數骞跺浣嶅悧锛�',function () {
$.ajax({
url: baseUrl+ "/site/io/mode/action/site",
headers: {'token': localStorage.getItem('token')},
- data: {floor: e.floor},
+ data: {
+ floor: e.floor,
+ charge: !e.modeVal
+ },
method: 'POST',
success: function (res) {
if (res.code === 200){
- layer.msg("鏆傛椂涓嶈兘鍒囨崲锛�", {icon: 1})
+ layer.msg(res.msg, {icon: 1})
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- console.log(res.msg);
+ layer.msg(res.msg, {icon: 2})
}
}
});
--
Gitblit v1.9.1