From b3e9a47f4c17c0d708398698432a109420e7d9e1 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 04 十二月 2023 10:12:52 +0800
Subject: [PATCH] 优化
---
guns-vip-main/src/main/webapp/pages/modular/kb/formula/formulaView.html | 46 +++++++++++++++++++++++++++-------------------
guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js | 6 ++----
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js b/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
index ab0d4c3..16abfa2 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/kb/formula/formulaView.js
@@ -140,13 +140,13 @@
$.ajax({
type: "POST",
contentType: "application/json;charset=UTF-8",
- url: Feng.ctxPath + '/locationInfo/list?productionLineCode='+data.value,
+ url: Feng.ctxPath + '/opInfo/list?lineCode='+data.value,
success: function (result) {
$('#locationCode').empty();
$('#locationCode').append(new Option("璇烽�夋嫨宸ヤ綅", ""));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
$.each(result.data, function (index, value) {
- $('#locationCode').append(new Option(value.locationCode));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
+ $('#locationCode').append(new Option(value.opCode));// 涓嬫媺鑿滃崟閲屾坊鍔犲厓绱�
});
layui.form.render("select");//閲嶆柊娓叉煋 鍥哄畾鍐欐硶
},
@@ -154,8 +154,6 @@
}
break;
case 'locationCode':
- console.log($('#locationCode').val());
- console.log($('#lineCode').val());
var getIp = new $ax(Feng.ctxPath + "/kanbanConf/ipSetting?lineCode="+$('#lineCode').val()+"&locationCode="+$('#locationCode').val());
var result = getIp.start();
Feng.info("鏇存柊瀹屾垚!")
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 3e67fa9..d4d2dd8 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
@@ -85,11 +85,11 @@
</div>
</div>
</div>
- <div class="layui-col-sm6 layui-col-md6 layui-col-lg6">
+ <div class="layui-col-sm9 layui-col-md6 layui-col-lg9">
<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-header" style="font-weight: bold">-->
+<!-- <i class="layui-icon layui-icon-rate-solid"></i>鎿嶄綔鏍�-->
+<!-- </div>-->
<div class="layui-card-body">
<div class="layui-tab" lay-filter="test">
<ul class="layui-tab-title">
@@ -98,8 +98,14 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <table class="layui-table" id="formulaChildInfoTable" lay-filter="formulaChildInfoTable"></table>
- <input id="scanCode" name="scanCode" placeholder="璇锋壂鎻忕墿鏂欐潯鐮�" type="text" class="layui-input"/>
+ <div class="layui-col-xs5">
+ <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-col-xs7">
+ <img id="imgs" class="img-thumbnail">
+ </div>
+
</div>
<div class="layui-tab-item">
<table class="layui-table" id="productBomChildInfoTable" lay-filter="productBomChildInfoTable"></table>
@@ -109,19 +115,19 @@
</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">-->
- <img id="imgs" class="img-thumbnail">
- <button type="button" class="layui-btn layui-btn-primary" id="clear">鍏ョ珯</button>
- </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">–>-->
+<!-- <img id="imgs" class="img-thumbnail">-->
+<!-- <button type="button" class="layui-btn layui-btn-primary" id="clear">鍏ョ珯</button>-->
+<!-- </div>-->
+<!-- </div>-->
- </div>
+<!-- </div>-->
</div>
<style>
@@ -133,7 +139,9 @@
align-items: center; /* 灏嗗瓙鍏冪礌鍨傜洿灞呬腑瀵归綈 */
}
.img-thumbnail {
- width: 320px;
+ margin-top: 15px;
+ margin-left: 5px;
+ width: 600px;
height: auto;
transition: all 0.3s ease;
}
--
Gitblit v1.9.3