From a56259ffabbdd3dba89d60e4da2c06a1b88e6220 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 10 五月 2025 14:57:20 +0800
Subject: [PATCH] 123
---
src/main/webapp/views/devops.html | 230 +++++----------------------------------------------------
1 files changed, 22 insertions(+), 208 deletions(-)
diff --git a/src/main/webapp/views/devops.html b/src/main/webapp/views/devops.html
index 7aa8ca5..53e1d06 100644
--- a/src/main/webapp/views/devops.html
+++ b/src/main/webapp/views/devops.html
@@ -9,7 +9,7 @@
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
- <link rel="stylesheet" type="text/css" href="../static/css/pipeline.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/devops.css?v=3">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
@@ -57,7 +57,7 @@
<div id="plc-error" class="main-board" style="padding-left: 10px">
<div class="plc-log-body">
<div>
- <span style="color: #1E9FFF">鍑哄簱宸ヤ綔妗�:</span>
+ <span style="color: #1E9FFF">宸ヤ綔妗�:</span>
</div>
<table id="plc-error-table">
<thead>
@@ -77,24 +77,18 @@
<!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
<div id="site-monitor" class="main-board">
<div>
- <span style="color: #1E9FFF">鏃犳硶鍏ュ簱鍘熷洜鍒ゆ柇:</span>
+ <span style="color: #1E9FFF">鏃犳硶鍑哄叆搴撳師鍥犲垽鏂�:</span>
</div>
<!-- 琛ㄦ牸 -->
<!--鍥哄畾琛ㄥご table 鍔爐able-layout: fixed; th 鍔� position:sticky;top: 0;-->
- <table id="site-table" style="table-layout: fixed;">
+ <table id="site-table" >
<!-- 琛ㄥご -->
<thead style="position:sticky;top: 0;">
<tr>
- <th>绔欏彿</th>
- <th>宸ヤ綔鍙�</th>
- <th>鑷姩</th>
- <th>鏈夌墿</th>
- <th>鍙叆</th>
- <th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
- <th>鐩爣绔�</th>
- <th>楂樹綆搴撲綅</th>
+ <th style="width: 180px">绫诲瀷</th>
+ <th style="width: 150px">绔欏彿</th>
+ <th style="width: 400px">涓嶇鍚堢殑鏉′欢</th>
+ <th style="width: 300px">瑙ｅ喅</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -102,45 +96,9 @@
</table>
</div>
</main>
- <footer>
- <textarea id="output"></textarea>
- </footer>
- <div id="site-detl" style="display: none">
- <form>
- <div class="form-item">
- <label class="form-label">绔欏彿:</label>
- <div class="form-input">
- <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number"
- autocomplete="off" disabled="disabled">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">宸ヤ綔鍙�:</label>
- <div class="form-input">
- <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number"
- autocomplete="off">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鐩爣绔�:</label>
- <div class="form-input">
- <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number"
- autocomplete="off">
- </div>
- </div>
- <div class="form-item">
- <label class="form-label">鍏ュ簱鏍囪:</label>
- <div class="form-input">
- <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
- </div>
- </div>
- <div class="form-item form-button-container">
- <button class="form-button" id="save">淇濆瓨</button>
- <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
- </div>
- </form>
- </div>
+
+
</div>
</div>
@@ -154,9 +112,8 @@
// 瀹為檯琛屾暟
var plcErrorTableFullRows = 0;
var siteTableFullRows = 0;
- var outputDom = document.getElementById("output");
+ //var outputDom = document.getElementById("output");
$(document).ready(function () {
- getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -166,10 +123,9 @@
setInterval(function () {
getPlcError();
starGetSite();
- getIoModeInfo();
}, 1000);
setInterval(function () {
- getSiteOutput();
+ //getSiteOutput();
}, 500);
function starGetSite() {
@@ -180,68 +136,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) {
@@ -249,9 +150,9 @@
var table = res.data;
for (var i = 1; i <= table.length; i++) {
var tr = tableEl.find("tr").eq(i);
- tr.children("td").eq(0).html(table[i - 1].no);
- tr.children("td").eq(1).html(table[i - 1].plcDesc);
- tr.children("td").eq(2).html(table[i - 1].error);
+ tr.children("td").eq(0).html(table[i - 1].wrkNo);
+ tr.children("td").eq(1).html(table[i - 1].error);
+ tr.children("td").eq(2).html(table[i - 1].method);
}
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
@@ -266,7 +167,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) {
@@ -278,16 +179,11 @@
}
for (var i = 1; i <= table.length; i++) {
var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i - 1].devNo);
- setVal(tr.children("td").eq(1), table[i - 1].workNo);
- setVal(tr.children("td").eq(2), table[i - 1].autoing);
- setVal(tr.children("td").eq(3), table[i - 1].loading);
- 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(9), table[i - 1].locType1);
+ tr.children("td").eq(0).html(table[i - 1].type);
+ tr.children("td").eq(1).html(table[i - 1].staNo);
+ tr.children("td").eq(2).html(table[i - 1].error);
+ tr.children("td").eq(3).html(table[i - 1].method);
+
}
} else if (res.code === 403) {
window.location.href = baseUrl + "/login";
@@ -296,30 +192,6 @@
}
}
});
- }
-
- // 杈撻�佽澶囨棩蹇楄緭鍑�
- function getSiteOutput() {
- $.ajax({
- url: baseUrl + "/site/output/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- output(res.data);
- } else if (res.code === 403) {
- window.location.href = baseUrl + "/login";
- } else {
- alert(res.msg);
- }
- }
- })
- }
-
- // 鏃ュ織杈撳嚭妗�
- function output(content) {
- outputDom.value += content;
- outputDom.scrollTop = outputDom.scrollHeight;
}
// ------------------------------------------------------------------------------------------------
@@ -368,70 +240,12 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
}
- // 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
- var layerDetl;
- $(document).on('dblclick ', '#site-table tr', function () {
- stop = true
- var siteId = $(this).children("td").eq(0).html();
- if (siteId !== null && siteId !== "") {
- layerDetl = layer.open({
- type: 1,
- title: false,
- shadeClose: true,
- offset: 'rt',
- anim: 5,
- shade: [0],
- area: ['340px', '255px'],
- closeBtn: 0,
- content: $("#site-detl"),
- success: function (layero, index) {
- http.get(baseUrl + "/site/detl/" + siteId, null, function (res) {
- $('#siteId').val(siteId);
- $('#workNo').val(res.data.workNo);
- $('#staNo').val(res.data.staNo);
- $('#pakMk').val(res.data.pakMk);
- })
- },
- end: function () {
- $('#siteId').val("");
- $('#workNo').val("");
- $('#staNo').val("");
- $('#pakMk').val("");
- stop = false
- }
- })
- }
- });
-
- $(document).on('click ', '#save', function () {
- http.post(baseUrl + "/site//detl/update", {
- siteId: $('#siteId').val(),
- workNo: $('#workNo').val(),
- staNo: $('#staNo').val(),
- pakMk: $('#pakMk').val()
- }, function (res) {
- layer.msg("淇敼鎴愬姛", {icon: 1,});
- })
- })
- $(document).on('click ', '#cancel', function () {
- $('#siteId').val("");
- $('#workNo').val("");
- $('#staNo').val("");
- $('#pakMk').val("");
- layer.close(layerDetl);
- })
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1