From f19e1f429e3405202957b9c3dacbec06f0764a05 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期二, 15 三月 2022 14:51:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pipeline.html |  191 +++++++++++++++++++++++++----------------------
 1 files changed, 101 insertions(+), 90 deletions(-)

diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 1835d67..487bad6 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -17,98 +17,109 @@
     </style>
 </head>
 <body>
-<main>
+<div style="padding: 10px;height: 100%;float: left;width: 6%">
     <div class="button-window"></div>
-    <!-- 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>
-                <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: 400px">PLC閿欒鎻忚堪</th>
-                    <th style="width: 400px">寮傚父</th>
-                </tr>
-                </thead>
-                <tbody>
-
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
-    <div id="site-monitor" class="main-board">
-        <!-- 琛ㄦ牸 -->
-        <table id="site-table">
-            <!-- 琛ㄥご -->
-            <thead>
-            <tr>
-                <th>绔欏彿</th>
-                <th>宸ヤ綔鍙�</th>
-                <th>鑷姩</th>
-                <th>鏈夌墿</th>
-                <th>鍙叆</th>
-                <th>鍙嚭</th>
-                <th>鍏ュ簱鏍囪</th>
-                <th>绌烘澘淇″彿</th>
-                <th>鐩爣绔�</th>
-            </tr>
-            </thead>
-            <!-- 琛ㄦ牸鍐呭 -->
-            <tbody></tbody>
-        </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 style="height: 100%;padding-left: 6%">
+    <div style="padding: 10px;height: 100%">
+        <main>
+
+            <!-- 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>
+                        <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: 400px">PLC閿欒鎻忚堪</th>
+                            <th style="width: 400px">寮傚父</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <!-- 绔欑偣鐘舵�佹暟鎹洃鎺х増 -->
+            <div id="site-monitor" class="main-board">
+                <!-- 琛ㄦ牸 -->
+                <table id="site-table">
+                    <!-- 琛ㄥご -->
+                    <thead>
+                    <tr>
+                        <th>绔欏彿</th>
+                        <th>宸ヤ綔鍙�</th>
+                        <th>鑷姩</th>
+                        <th>鏈夌墿</th>
+                        <th>鍙叆</th>
+                        <th>鍙嚭</th>
+                        <th>鍏ュ簱鏍囪</th>
+                        <th>绌烘澘淇″彿</th>
+                        <th>鐩爣绔�</th>
+                    </tr>
+                    </thead>
+                    <!-- 琛ㄦ牸鍐呭 -->
+                    <tbody></tbody>
+                </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>
+
+
 </body>
 <script>
     // 鍒濆鍖�

--
Gitblit v1.9.1