From b8d497fd98941629387717c6d6aaf6185d643797 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 14:09:23 +0800
Subject: [PATCH] #修改站点数据--todo（未完成）
---
src/main/webapp/views/pipeline.html | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 384f97d..c4271de 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" type="text/css" href="../static/css/pipeline.css">
<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>
<style>
</style>
@@ -61,9 +62,8 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>闇�姹傚叆</th>
- <th>闇�姹傚嚭</th>
- <th>楂樹綆搴�</th>
+ <th>闇�姹�1</th>
+ <th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
</tr>
</thead>
@@ -75,6 +75,10 @@
<footer>
<textarea id="output"></textarea>
</footer>
+
+<div id="site-detl" style="display: none">
+ hello world
+</div>
</body>
<script>
// 鍒濆鍖�
@@ -100,6 +104,18 @@
getSiteOutput();
},500);
+ $(document).on('click','#site-table tr', function () {
+ layer.open({
+ type: 1,
+ title: false,
+ content: $("#site-detl"),
+ success: function(layero, index){
+
+ }
+ })
+ console.log($(this).children("td").eq(0).html());
+ });
+
// plc寮傚父淇℃伅琛ㄨ幏鍙�
function getPlcError() {
@@ -119,7 +135,7 @@
tr.children("td").eq(2).html(table[i-1].error);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -147,26 +163,14 @@
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].canining);
- setVal(tr.children("td").eq(5), table[i-1].canouting);
- setVal(tr.children("td").eq(6), table[i-1].inreqIn);
- setVal(tr.children("td").eq(7), table[i-1].inreqOut);
- setVal(tr.children("td").eq(8), table[i-1].highLow);
+ 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].inreq1);
+ setVal(tr.children("td").eq(7), table[i-1].emptyMk);
setVal(tr.children("td").eq(9), table[i-1].staNo);
-
- // tr.children("td").eq(0).html(table[i-1].devNo);
- // tr.children("td").eq(1).html(table[i-1].workNo);
- // tr.children("td").eq(2).html(table[i-1].autoing);
- // tr.children("td").eq(3).html(table[i-1].loading);
- // tr.children("td").eq(4).html(table[i-1].canining);
- // tr.children("td").eq(5).html(table[i-1].canouting);
- // tr.children("td").eq(6).html(table[i-1].inreqIn);
- // tr.children("td").eq(7).html(table[i-1].inreqOut);
- // tr.children("td").eq(8).html(table[i-1].highLow);
- // tr.children("td").eq(9).html(table[i-1].staNo);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -184,7 +188,7 @@
if (res.code === 200) {
output(res.data);
} else if (res.code === 403) {
- top.location.href = baseUrl + "/login";
+ window.location.href = baseUrl + "/login";
} else {
alert(res.msg);
}
@@ -240,7 +244,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1