From 487b2f2a353b89ab46cd9b784226b600b7b915b8 Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期二, 17 十月 2023 15:33:05 +0800
Subject: [PATCH] 新增OPCUA模块

---
 guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html b/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
index 302bbf5..71b78c5 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html
@@ -54,6 +54,10 @@
                         <span class="mySpan" style="float: right" id="productName"></span>
                     </div>
                     <div class="orderInfo">
+                        <span>宸ヨ壓閰嶆柟</span>
+                        <span class="mySpan" style="float: right" id="recipeCode"></span>
+                    </div>
+                    <div class="orderInfo">
                         <span>璁″垝鏁伴噺</span>
                         <span class="mySpan" style="float: right" id="planQty"></span>
                     </div>
@@ -66,7 +70,6 @@
                         <span class="mySpan" style="float: right" id="planEndTime"></span>
                     </div>
                     <hr class="layui-border-orange">
-<!--                    <span>PLC浜や簰鐐�</span>-->
                     <div class="container">
                         <input type="radio" id="sex1" name="sex1" value="nan1" title="鐢�">
                         <span>绯荤粺灏辩华</span>
@@ -98,8 +101,8 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-sm9 layui-col-md9 layui-col-lg9">
-            <div class="layui-card" style="height: 577px">
+        <div class="layui-col-sm6 layui-col-md6 layui-col-lg6">
+            <div class="layui-card" style="height: 605px">
                 <div class="layui-card-header" style="font-weight: bold">
                     <i class="layui-icon layui-icon-rate-solid"></i>鎿嶄綔鏍�
                 </div>
@@ -114,9 +117,11 @@
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
-                                鐐瑰嚮璇ab鐨勪换涓�鏍囬锛岃瀵熷湴鍧�鏍忓彉鍖栵紝鍐嶅埛鏂伴〉闈€�傞�夐」鍗″皢浼氳嚜鍔ㄥ畾浣嶅埌涓婁竴娆″垏鎹㈢殑椤�
+                                <table class="layui-table" id="formulaChildInfoTable" lay-filter="formulaChildInfoTable"></table>
                             </div>
-                            <div class="layui-tab-item">鍐呭2</div>
+                            <div class="layui-tab-item">
+                                鍐呭3
+                            </div>
                             <div class="layui-tab-item">鍐呭3</div>
                             <div class="layui-tab-item">鍐呭4</div>
                             <div class="layui-tab-item">鍐呭5</div>
@@ -125,9 +130,20 @@
                 </div>
             </div>
         </div>
-    </div>
+        <div class="layui-col-sm3 layui-col-md3 layui-col-lg3">
+            <div class="layui-card" style="height: 605px">
+                <div class="layui-card-header" style="font-weight: bold">
+                    <i class="layui-icon layui-icon-rate-solid"></i>鍥剧墖
+                </div>
+                <div class="layui-card-body">
+                    <img id="imgs" width="320px" height="270px">
+                </div>
+            </div>
+
+        </div>
 </div>
-<style>
+<!--    <img id="imgs" width="400px" height="380px">-->
+    <style>
     .orderInfo {
         margin-bottom: 5px;  /* 璁剧疆鎹㈣鍚庣殑涓嬭竟璺� */
     }

--
Gitblit v1.9.3