From 5b25d65a9e86fd45861f89104e6996dc2c387e1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 06 五月 2025 16:07:46 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/devops.html | 69 +++-------------------------------
1 files changed, 6 insertions(+), 63 deletions(-)
diff --git a/src/main/webapp/views/devops.html b/src/main/webapp/views/devops.html
index c28428d..4f35f2d 100644
--- a/src/main/webapp/views/devops.html
+++ b/src/main/webapp/views/devops.html
@@ -92,8 +92,8 @@
<th>鍙叆</th>
<th>鍙嚭</th>
<th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>淇℃伅</th>
<th>楂樹綆搴撲綅</th>
</tr>
</thead>
@@ -156,7 +156,6 @@
var siteTableFullRows = 0;
var outputDom = document.getElementById("output");
$(document).ready(function () {
- getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -166,7 +165,6 @@
setInterval(function () {
getPlcError();
starGetSite();
- getIoModeInfo();
}, 1000);
setInterval(function () {
getSiteOutput();
@@ -180,68 +178,13 @@
}
}
- var ioModeData;
-
- function getIoModeInfo() {
- $.ajax({
- url: baseUrl + "/site/io/mode/info/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- ioModeData = res.data;
- ioModeData.forEach(function (e) {
- $("#io-mode-" + e.floor).html(e.modeDesc);
- })
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- /**
- * 寮哄埗鍒囨崲鍏ュ嚭搴撴ā寮�
- */
- function ioModeSwitch(el) {
- var floor = el.split("-")[2];
- 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 () {
- $.ajax({
- url: baseUrl + "/site/io/mode/action/site",
- headers: {'token': localStorage.getItem('token')},
- data: {floor: e.floor},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- layer.msg("鏆傛椂涓嶈兘鍒囨崲锛�", {icon: 1})
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- layer.closeAll();
- })
- }
- }
- });
- }
-
- }
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
var tableEl = $('#plc-error-table');
tableEl.children("tr").children("td").html("");
$.ajax({
- url: baseUrl + "/site/table/plc/errors",
+ url: baseUrl + "/devops/wrkMast/list",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -266,7 +209,7 @@
function getSite() {
var tableEl = $('#site-table');
$.ajax({
- url: baseUrl + "/site/table/site",
+ url: baseUrl + "/devops/site/list",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
@@ -285,8 +228,8 @@
setVal(tr.children("td").eq(4), table[i - 1].inEnable);
setVal(tr.children("td").eq(5), table[i - 1].outEnable);
setVal(tr.children("td").eq(6), table[i - 1].pakMk);
- setVal(tr.children("td").eq(7), table[i - 1].emptyMk);
- setVal(tr.children("td").eq(8), table[i - 1].staNo);
+ setVal(tr.children("td").eq(7), table[i - 1].staNo);
+ setVal(tr.children("td").eq(8), table[i - 1].emptyMk);
setVal(tr.children("td").eq(9), table[i - 1].locType1);
}
} else if (res.code === 403) {
@@ -416,7 +359,7 @@
});
$(document).on('click ', '#save', function () {
- http.post(baseUrl + "/site//detl/update", {
+ http.post(baseUrl + "/site/detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
staNo: $('#staNo').val(),
--
Gitblit v1.9.1