From 608d1a59592e140552014654eb0f113891e5e2c9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 25 八月 2022 15:28:07 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/ste.css | 84 ++++++++++++++------
src/main/webapp/views/ste.html | 133 ++++++++++++++++++--------------
2 files changed, 133 insertions(+), 84 deletions(-)
diff --git a/src/main/webapp/static/css/ste.css b/src/main/webapp/static/css/ste.css
index c21a5d5..d672224 100644
--- a/src/main/webapp/static/css/ste.css
+++ b/src/main/webapp/static/css/ste.css
@@ -38,10 +38,11 @@
}
.demoBtn {
vertical-align: middle;
- width: 100%;
+ /*width: 30%;*/
height: 30px;
left: 0;
top: 0;
+ padding: 5px 15px;
text-shadow: inherit;
font-size: 15px;
margin-left: 5px;
@@ -60,29 +61,6 @@
.demoBtn:focus {
outline: 0;
}
-/*鈻间笅鎷夎彍鍗曗柤*/
-.form-item {
- width: 220px;
- display: inline-block;
- color: white;
- font-size: 16px;
- font-weight: bold;
- padding: 3px;margin:3px
-}
-.form-item input {
- display: inline-block;
- width: 100px;
- float: right;
-}
-/*鈻蹭笅鎷夎彍鍗曗柌*/
-/*.ste-command-item span {*/
-/* display: inline-block;*/
-/* width: 20px;*/
-/* height: 20px;*/
-/* background-color: #2e9926;*/
-/* border-radius: 5px;*/
-/* vertical-align: middle;*/
-/*}*/
/* 鍙� */
.ste-state {
@@ -295,4 +273,60 @@
overflow: auto;
resize:none;
color: #666;
-}
\ No newline at end of file
+}
+
+
+/* 璇︽儏寮瑰嚭灞� */
+#ste-detl {
+ padding: 30px 10px 0 25px;
+ overflow: hidden;
+}
+#ste-detl form {
+ overflow: hidden;
+}
+.form-item {
+ margin-bottom: 10px;
+}
+.form-label {
+ display: inline-block;
+ width: 70px;
+ text-align: right;
+}
+.form-input {
+ display: inline-block;
+ padding-left: 15px;
+}
+.form-input input {
+ outline-style: none ;
+ border: 1px solid #ccc;
+ border-radius: 3px;
+ padding: 5px 8px;
+ width: 150px;
+ font-size: 14px;
+ font-weight: bolder;
+}
+.form-input input:focus{
+ border-color: #66afe9;
+ outline: 0;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)
+}
+.form-button-container {
+ text-align: center;
+}
+.form-button {
+ margin: 10px 10px;
+ width: 50px;
+ height: 30px;
+ color:white;
+ background-color:cornflowerblue;
+ border-radius: 3px;
+ border-width: 0;
+ outline: none;
+ font-size: 15px;
+ text-align: center;
+ cursor: pointer;
+}
+.form-button:hover {
+ opacity: 0.7;
+}
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 85a8c0b..aa423f6 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -21,65 +21,20 @@
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<div class="command-log">
- <div class="ste-command-item" style="margin-top: 30px">
+ <div data-steNo="1" class="ste-command-item" style="margin-top: 30px">
<label>1#</label>
- <div class="dropdown-menu">
- <button id="steBtn-1" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
+ <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
+ <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
</div>
- <div class="ste-command-item" style="margin-top: 30px">
+ <div data-steNo="2" class="ste-command-item" style="margin-top: 30px">
<label>2#</label>
- <div class="dropdown-menu">
- <button id="steBtn-2" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
+ <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
+ <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
</div>
- <div class="ste-command-item" style="margin-top: 30px">
+ <div data-steNo="3" class="ste-command-item" style="margin-top: 30px">
<label>3#</label>
- <div class="dropdown-menu">
- <button id="steBtn-3" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
- <ul class="dropdown-menu-nav dark" >
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>褰撳墠绌挎鏈猴細</span><input type="text"></div>
- <div class="form-item"><span>鎺掞細</span><input type="text"></div>
- <div class="form-item"><span>鍒楋細</span><input type="text"></div>
- <div class="form-item"><span>灞傦細</span><input type="text"></div>
- </ul>
- </div>
- <div class="dropdown-menu">
- <button class="demoBtn" onclick="">鎵�灞炲爢鍨涙満</button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <div class="form-item"><span>鍫嗗灈鏈哄彿锛�</span><input type="text"></div>
- </ul>
- </div>
+ <button class="demoBtn pos-btn">淇敼浣嶇疆</button>
+ <button class="demoBtn crn-btn">鍏宠仈鍫嗗灈鏈�</button>
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -179,6 +134,39 @@
</div>
</div>
</div>
+
+ <div id="ste-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>
</body>
</html>
<script>
@@ -229,10 +217,39 @@
}
}
- // 淇敼绌挎杞︿綅缃�
- function changePosition(id) {
+ $(document).on('click ','.pos-btn', function () {
+ let steNo = Number($(this).parent().attr("data-steNo"));
+ layerDetl = layer.open({
+ type: 1,
+ title: false,
+ shadeClose: true,
+ offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
+ anim: 5,
+ shade: [0],
+ area: ['340px', '255px'],
+ closeBtn: 0,
+ content: $("#ste-detl"),
+ success: function(layero, index){
+ // http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
+ // $('#siteId').val(siteId);
+ // $('#workNo').val(res.data.workNo);
+ // $('#staNo').val(res.data.staNo);
+ // $('#pakMk').val(res.data.pakMk);
+ // })
+ },
+ end: function () {
+ $('#siteId').val("");
+ $('#workNo').val("");
+ $('#staNo').val("");
+ $('#pakMk').val("");
+ }
+ })
+ })
- }
+ $(document).on('click ','.crn-btn', function () {
+ let steNo = Number($(this).parent().attr("data-steNo"));
+ console.log(steNo)
+ })
// 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getSteStateInfo() {
@@ -415,7 +432,5 @@
steOutputDom.value += content;
steOutputDom.scrollTop = steOutputDom.scrollHeight;
}
-
-
</script>
--
Gitblit v1.9.1