From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 132 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 89333f8..c316cbd 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -13,7 +13,32 @@
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
<style>
-
+ .io-mode-box {
+ float: left;
+ width: 16%;
+ text-align: center;
+ }
+ .io-mode-box label {
+ font-weight: bolder;
+ }
+ .ioModeBtn {
+ vertical-align: middle;
+ width: 50%;
+ height: 30px;
+ left: 0;
+ top: 0;
+ text-shadow: inherit;
+ font-size: 15px;
+ margin-left: 5px;
+ margin-right: 5px;
+ display: inline-block;
+ background-color: #FF5722;
+ border: none;
+ color: #FFF;
+ box-shadow: 1px 1px 5px #B6B6B6;
+ border-radius: 3px;
+ cursor: pointer;
+ }
</style>
</head>
<body>
@@ -28,19 +53,36 @@
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
- <div class="plc-log-header">
- <!-- <div style="height: 40%">-->
- <!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div style="height: 40%">-->
- <!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
+<!-- <div class="plc-log-header">-->
+<!-- <!– 璁惧浠诲姟鎿嶄綔 –>-->
+<!-- <div class="io-mode-oper">-->
+<!-- <fieldset>-->
+<!-- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F2</label>-->
+<!-- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F4</label>-->
+<!-- <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- </fieldset>-->
+<!-- </div>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>涓滀晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>瑗夸晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div>–>-->
+<!-- <!– <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>–>-->
+<!-- <!– </div>–>-->
+<!-- </div>-->
+ <!-- 涓讳綋 -->
+ <div class="plc-log-body">
<div>
<span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
- </div>
- <!-- 涓讳綋 -->
- <div class="plc-log-body">
<table id="plc-error-table">
<thead>
<tr>
@@ -59,9 +101,10 @@
<!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
<div id="site-monitor" class="main-board">
<!-- 琛ㄦ牸 -->
- <table id="site-table">
+ <!--鍥哄畾琛ㄥご table 鍔爐able-layout: fixed; th 鍔� position:sticky;top: 0;-->
+ <table id="site-table" style="table-layout: fixed;">
<!-- 琛ㄥご -->
- <thead>
+ <thead style="position:sticky;top: 0;">
<tr>
<th>绔欏彿</th>
<th>宸ヤ綔鍙�</th>
@@ -72,6 +115,7 @@
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>楂樹綆搴撲綅</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -118,8 +162,6 @@
</div>
</div>
-
-
</body>
<script>
// 鍒濆鍖�
@@ -132,6 +174,7 @@
var siteTableFullRows = 0;
var outputDom = document.getElementById("output");
$(document).ready(function() {
+ getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -141,6 +184,7 @@
setInterval(function () {
getPlcError();
starGetSite();
+ getIoModeInfo();
}, 1000);
setInterval(function () {
getSiteOutput();
@@ -152,6 +196,62 @@
getSite();
}
}
+
+ 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');
@@ -203,6 +303,7 @@
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);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -288,6 +389,7 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
--
Gitblit v1.9.1