From 47eb81eebc9a87af5f64dd765dc1a1267317d9a8 Mon Sep 17 00:00:00 2001
From: yantian yue <306727702@qq.com>
Date: 星期二, 24 十月 2023 16:21:55 +0800
Subject: [PATCH] OPCUA更新
---
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 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..18b2c8a 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
@@ -36,7 +36,7 @@
<div class="layui-card-header" style="font-weight: bold">
<i class="layui-icon layui-icon-rate-solid"></i>宸ュ崟淇℃伅
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body" style="height: 368px">
<div class="orderInfo">
<span>宸ュ崟缂栧彿</span>
<span class="mySpan" style="float: right" id="workOrder"></span>
@@ -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,40 +70,23 @@
<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>
- <input style="margin-left: 150px" type="radio" name="sex" value="nan" title="鐢�">
<span>宸ヤ欢鍒颁綅</span>
- </div>
- <div class="container">
- <input type="radio" name="sex" value="nan" title="鐢�">
- <span>璇诲彇鏉＄爜</span>
<input style="margin-left: 150px" type="radio" name="sex" value="nan" title="鐢�">
- <span>涓嬪彂鏈哄瀷</span>
+ <span>宸ヤ欢鍏ョ珯</span>
</div>
<div class="container">
<input type="radio" name="sex" value="nan" title="鐢�">
- <span>鍏佽鍚姩</span>
- <input style="margin-left: 150px" type="radio" name="sex" value="nan" title="鐢�">
- <span>涓嶅厑璁稿惎鍔�</span>
- </div>
- <div class="container">
- <input type="radio" name="sex" value="nan" title="鐢�">
- <span>鍚堟牸瀹屾垚</span>
- <input style="margin-left: 150px" type="radio" name="sex" value="nan" title="鐢�">
- <span>涓嶅悎鏍煎畬鎴�</span>
- </div>
- <div class="container">
- <input type="radio" name="sex" value="nan" title="鐢�">
- <span>淇濆瓨瀹屾垚</span>
+ <span>宸ヤ欢鍑虹珯</span>
+ <input style="margin-left: 150px" type="radio" name="test" value="test1" title="鐢�">
+ <span>宸ヤ欢瀹屾垚</span>
</div>
</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>
@@ -107,27 +94,36 @@
<div class="layui-tab" lay-filter="test">
<ul class="layui-tab-title">
<li class="layui-this" lay-id="11">棣栭〉</li>
- <li lay-id="22">宸ュ簭鐘舵��</li>
- <li lay-id="33">瑁呴厤閲囬泦娓呭崟</li>
- <li lay-id="44">宸ヨ壓鍙傛暟</li>
- <li lay-id="55">涓嶅悎鏍艰川閲忔暟鎹�</li>
+ <li lay-id="22">BOM娓呭崟</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- 鐐瑰嚮璇ab鐨勪换涓�鏍囬锛岃瀵熷湴鍧�鏍忓彉鍖栵紝鍐嶅埛鏂伴〉闈€�傞�夐」鍗″皢浼氳嚜鍔ㄥ畾浣嶅埌涓婁竴娆″垏鎹㈢殑椤�
+ <table class="layui-table" id="formulaChildInfoTable" lay-filter="formulaChildInfoTable"></table>
+ <input id="scanCode" name="scanCode" placeholder="璇锋壂鎻忕墿鏂欐潯鐮�" type="text" class="layui-input"/>
</div>
- <div class="layui-tab-item">鍐呭2</div>
- <div class="layui-tab-item">鍐呭3</div>
- <div class="layui-tab-item">鍐呭4</div>
- <div class="layui-tab-item">鍐呭5</div>
+ <div class="layui-tab-item">
+ <table class="layui-table" id="productBomChildInfoTable" lay-filter="productBomChildInfoTable"></table>
+ </div>
</div>
</div>
</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">
+ <button type="button" class="layui-btn layui-btn-primary" id="clear">鍏ョ珯</button>
+ </div>
+ </div>
+
+ </div>
</div>
-<style>
+<!-- <img id="imgs" width="400px" height="380px">-->
+ <style>
.orderInfo {
margin-bottom: 5px; /* 璁剧疆鎹㈣鍚庣殑涓嬭竟璺� */
}
--
Gitblit v1.9.3