From c9a3592c20b7913dd9949383721ae26c32563eb7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 02 十一月 2024 10:25:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pipeline.html | 129 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 487bad6..740d057 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -13,7 +13,33 @@
<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;
+ margin-top: 10px;
+ }
+ .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>
@@ -27,24 +53,15 @@
<!-- 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-body">
<div>
<span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
- </div>
- <!-- 涓讳綋 -->
- <div class="plc-log-body">
<table id="plc-error-table">
<thead>
<tr>
- <th style="width: 200px">搴忓彿</th>
+ <th style="width: 200px">绔欑偣</th>
<th style="width: 400px">PLC閿欒鎻忚堪</th>
<th style="width: 400px">寮傚父</th>
</tr>
@@ -59,9 +76,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 +90,9 @@
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
+ <th>楂樹綆搴撲綅</th>
+ <th>鑷姩鍑�</th>
+ <th>鑷姩鍏�</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -118,12 +139,11 @@
</div>
</div>
-
-
</body>
<script>
// 鍒濆鍖�
// 绌虹櫧琛屾暟
+ var stop = false
var plcErrorTableBlankRows = 0;
var siteTableBlankRows = 0;
// 瀹為檯琛屾暟
@@ -131,6 +151,7 @@
var siteTableFullRows = 0;
var outputDom = document.getElementById("output");
$(document).ready(function() {
+ getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -139,11 +160,74 @@
// 瀹炴椂璁块棶
setInterval(function () {
getPlcError();
- getSite();
+ starGetSite();
+ getIoModeInfo();
}, 1000);
setInterval(function () {
getSiteOutput();
},500);
+ function starGetSite() {
+ if (stop) {
+ return
+ } else {
+ 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() {
@@ -196,6 +280,9 @@
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);
+ setVal(tr.children("td").eq(10), table[i-1].autoOut);
+ setVal(tr.children("td").eq(11), table[i-1].autoIn);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -281,6 +368,9 @@
" <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);
@@ -289,6 +379,7 @@
// 璇︽儏鎿嶄綔 -------------------------------------------------------------------------
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({
@@ -314,9 +405,11 @@
$('#workNo').val("");
$('#staNo').val("");
$('#pakMk').val("");
+ stop = false
}
})
}
+
});
$(document).on('click ','#save', function () {
--
Gitblit v1.9.1