From db27a71b53fb58fca5b6e809625b0aff82c902b4 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期六, 30 五月 2020 17:01:47 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/pipeline.css | 4 +-
src/main/webapp/views/pipeline.html | 91 +++++++++++----------------------------------
2 files changed, 25 insertions(+), 70 deletions(-)
diff --git a/src/main/webapp/static/css/pipeline.css b/src/main/webapp/static/css/pipeline.css
index 87346ad..17e126e 100644
--- a/src/main/webapp/static/css/pipeline.css
+++ b/src/main/webapp/static/css/pipeline.css
@@ -27,9 +27,9 @@
box-shadow: 0 0 3px rgba(0,0,0,.3);
}
#output {
+ border: 1px solid #b9b9b9;
width: 100%;
height: 100%;
overflow: auto;
- onpropertychange: "this.scrollTop = this.scrollHeight";
- 慰nf慰cus: "this.scrollTop = this.scrollHeight "
+ resize:none;
}
\ No newline at end of file
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 7a3fd2f..5353db0 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -78,16 +78,18 @@
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
<div class="plc-log-header">
- <div style="height: 50%">
+ <div style="height: 40%">
<span>涓滀晶PLC鎵ц鎸囦护</span>
</div>
- <div style="height: 50%">
+ <div style="height: 40%">
<span>瑗夸晶PLC鎵ц鎸囦护</span>
+ </div>
+ <div>
+ <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
</div>
</div>
<!-- 涓讳綋 -->
<div class="plc-log-body">
- <span>PLC寮傚父淇℃伅</span>
<table id="plc-error-table">
<thead>
<tr>
@@ -97,71 +99,6 @@
</tr>
</thead>
<tbody>
- <tr>
- <td>23532</td>
- <td>PLC閿欒鎻忚堪PLC閿欒鎻忚堪1</td>
- <td>寮傚父寮傚父寮傚父寮傚父寮傚父寮傚父寮傚父</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
</tbody>
</table>
</div>
@@ -533,6 +470,24 @@
</footer>
</body>
<script>
+ // 绌虹櫧琛ㄦ牸娓叉煋
+ $(document).ready(function() {
+ var one = $('#plc-error-table thead').height();
+ var total = $('.plc-log-body').height();
+ var count = total / one;
+ count = parseInt(count);
+ var html = "";
+ for (var i = 0; i < count-1; i ++){
+ html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#plc-error-table tbody').after(html);
+ });
+
+ // 鏃ュ織杈撳嚭妗�
var outputDom = document.getElementById("output");
function output(content){
outputDom.value += content;
--
Gitblit v1.9.1