From fff93401e35bda6bd7a545217ef60b3920d7d874 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期三, 03 六月 2020 11:10:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 200 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 32d51a6..9487862 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -15,9 +15,9 @@
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
<style>
/* layer 娣辫摑鑹叉寜閽慨鏀� */
- .layui-layer-lan .layui-layer-btn {
- border-top: none;
- }
+ /*.layui-layer-lan .layui-layer-btn {*/
+ /*border-top: none;*/
+ /*}*/
.layui-layer-lan .layui-layer-btn a {
background: #4476A7;
border-color: #4476A7;
@@ -418,32 +418,203 @@
<!-- 杈撻�佽澶囧脊绐� -->
<div id="siteWindow" style="display: none">
<form>
- <label>璁惧鍙�<input type="text" name="devpNo" value="12" disabled="disabled"></label>
- <label>宸ヤ綔鍙�<input type="text" name="workNo" value="9998" disabled="disabled"></label>
- <label>宸ヤ綔鐘舵��<input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled"></label>
- <label>鑷姩<input type="checkbox" name="auto" disabled="disabled" checked></label>
- <label>鏈夌墿<input type="checkbox" name="loading" disabled="disabled" checked></label>
- <label>鑳藉叆<input type="checkbox" name="canining" disabled="disabled" checked></label>
- <label>鑳藉嚭<input type="checkbox" name="canouting" disabled="disabled" checked></label>
- <label>鍑哄叆绫诲瀷<input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled"></label>
- <label>婧愮珯<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
- <label>鐩爣绔�<input type="text" name="staNo" value="2410" disabled="disabled"></label>
- <label>婧愬簱浣�<input type="text" name="sourceStock" value="" disabled="disabled"></label>
- <label>鐩爣搴撲綅<input type="text" name="stock" value="" disabled="disabled"></label>
+ <!-- 绗竴琛� -->
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>璁惧鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="devpNo" value="12" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵��</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗簩琛� -->
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑷姩</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="auto" disabled="disabled" style="width: 1rem" checked>
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鏈夌墿</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem" checked>
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑳藉叆</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem" checked>
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑳藉嚭</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem" checked>
+ </div>
+ </div>
+
+ <!-- 绗笁琛� -->
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 8rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>婧愮珯</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>鐩爣绔�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+
+ <!-- 绗洓琛� -->
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>婧愬簱浣�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="stock" value="" style="width: 8rem">
+ </div>
+ </div>
</form>
</div>
+
<!-- 鍫嗗灈鏈哄脊绐� -->
<div id="crnWindow" style="display: none">
- <label>鍫嗗灈鏈哄彿<input type="text" name="crnNo" value="12" disabled="disabled"></label>
- <label>宸ヤ綔鍙�<input type="text" name="workNo" value="9998" disabled="disabled"></label>
- <label>婧愮珯<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
- <label>鐩爣绔�<input type="text" name="staNo" value="2410" disabled="disabled"></label>
- <label>宸ヤ綔鐘舵��<input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled"></label>
- <label>鍑哄叆绫诲瀷<input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled"></label>
- <label>婧愬簱浣�<input type="text" name="sourceStock" value="" disabled="disabled"></label>
- <label>鐩爣搴撲綅<input type="text" name="stock" value="" disabled="disabled"></label>
- <label>鍫嗗灈鏈虹姸鎬�<input type="text" name="crnStatus" disabled="disabled"></label>
- <label>寮傚父<input type="text" name="error" disabled="disabled" checked></label>
+ <form>
+ <!-- 绗竴琛� -->
+ <div class="form-item" style="width: 23%">
+ <div class="form-item-label" style="width: 87px">
+ <span>鍫嗗灈鏈哄彿</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnNo" value="12" disabled="disabled" style="width: 3rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 5rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 23%">
+ <div class="form-item-label">
+ <span>婧愮珯</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>鐩爣绔�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+
+ <!-- 绗簩琛� -->
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label" style="width: 87px">
+ <span>宸ヤ綔鐘舵��</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗笁琛� -->
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label" style="width: 87px">
+ <span>婧愬簱浣�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗洓琛� -->
+ <div class="form-item" style="width: 95%">
+ <div class="form-item-label">
+ <span>鍫嗗灈鏈虹姸鎬�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnStatus" disabled="disabled" style="width: 25rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 95%">
+ <div class="form-item-label" style="width: 87px">
+ <span>寮傚父</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="error" disabled="disabled" style="width: 25rem">
+ </div>
+ </div>
+ </form>
</div>
</body>
@@ -465,7 +636,7 @@
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
if (systemRunning){
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1}, function(pass, idx){
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
if ("123"!==pass){
alert("鍙ｄ护閿欒");
@@ -597,7 +768,7 @@
type: 1,
shadeClose: true,
content: $('#siteWindow'),
- area: ['30rem', '18rem'],
+ area: ['35rem', '18rem'],
btn: ['纭畾', '鍏抽棴']
});
});
@@ -609,10 +780,10 @@
skin: 'layui-layer-lan',
closeBtn: 0,
type: 1,
- offset: '180px',
+ offset: '150px',
shadeClose: true,
content: $("#crnWindow"),
- area: ['30rem', '18rem'],
+ area: ['40rem', '20rem'],
btn: ['纭畾', '鍏抽棴']
});
});
--
Gitblit v1.9.1