From 0347b8c45a632564b4fac11abab8db25032aef11 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 六月 2020 16:58:05 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 63 ++++++++++++++++++++
src/main/webapp/views/pakStore/pakStore.html | 21 -------
src/main/webapp/views/pakStore/emptyIn.html | 2
src/main/webapp/static/js/locMast/locMast.js | 43 +++++++++-----
src/main/webapp/views/pakStore/emptyOut.html | 1
src/main/webapp/static/js/pakStore/pakStore.js | 20 ++++++
src/main/webapp/views/pakStore/matQuery.html | 1
7 files changed, 107 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index bb0a43d..e6d6d32 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -202,24 +202,35 @@
});
break;
case "init":
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
- if (pass === "123456") {
- layer.open({
- type: 1,
- title: '鍒濆鍖栧簱浣�',
- maxmin: true,
- shadeClose: true,
- content: $("#resetLocDiv"),
- success: function (layero, index) {
+ layer.open({
+ type: 1,
+ title: '鍒濆鍖栧簱浣�',
+ maxmin: true,
+ area: ["400px"],
+ shadeClose: true,
+ content: $("#resetLocDiv"),
+ success: function (layero, index) {
- }
- })
- } else {
- layer.msg("鍙ｄ护閿欒");
}
- layer.close(idx);
- doSwitch(0, pass); // 鍋滄wcs绯荤粺
- });
+ })
+ // layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
+ // if (pass === "123456") {
+ // layer.open({
+ // type: 1,
+ // title: '鍒濆鍖栧簱浣�',
+ // maxmin: true,
+ // shadeClose: true,
+ // content: $("#resetLocDiv"),
+ // success: function (layero, index) {
+ //
+ // }
+ // })
+ // } else {
+ // layer.msg("鍙ｄ护閿欒");
+ // }
+ // layer.close(idx);
+ // doSwitch(0, pass); // 鍋滄wcs绯荤粺
+ // });
break;
}
});
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index a5b3b4f..45931f3 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -9,7 +9,25 @@
var layDate = layui.laydate;
var form = layui.form;
-
+ // 鑾峰彇鍙敤鍏ュ簱绔欑偣
+ $.ajax({
+ url: baseUrl+"/available/put/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#putSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#putSiteSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
tableIns = table.render({
elem: '#chooseData',
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index c632b9c..ed4156d 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -13,6 +13,10 @@
#btn-init {
display: none;
}
+ .layui-layer-page .layui-layer-content {
+ position: relative;
+ overflow: visible !important;
+ }
</style>
</head>
<body>
@@ -84,8 +88,63 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<!-- 閲嶇疆搴撲綅寮圭獥 -->
-<div id="resetLocDiv">
- <h1>Hello </h1>
+<div id="resetLocDiv" style="margin: 20px 0 20px 30px">
+ <div class="layui-form layui-form-pane">
+ <!-- 鎺� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋鎺�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startRow" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+ </div>
+ <!-- 鍒� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋鍒�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endbay" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+ </div>
+ <!-- 灞� -->
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧锋灞�</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ <div class="layui-form-mid">-</div>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+ </div>
+ <!-- 搴撲綅绫诲瀷 -->
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="locType">
+ <option selected="" style="color: #1E9FFF">璇烽�夋嫨绫诲瀷锛堥�夊～锛�</option>
+ <option value="1">浣庡簱浣�</option>
+ <option value="2">楂樺簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <!-- 鎸夐挳 -->
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
+ </div>
+ </div>
</div>
</body>
</html>
diff --git a/src/main/webapp/views/pakStore/emptyIn.html b/src/main/webapp/views/pakStore/emptyIn.html
index 4ad8c3a..933bee4 100644
--- a/src/main/webapp/views/pakStore/emptyIn.html
+++ b/src/main/webapp/views/pakStore/emptyIn.html
@@ -17,13 +17,11 @@
-
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index e61a9ba..8c609ab 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -19,7 +19,6 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
</body>
</html>
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 0004d2b..5af04f7 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -55,7 +55,6 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
</body>
<script>
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 84fd3c8..3e617d1 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -111,27 +111,6 @@
<option value="{{this}}">{{this}}</option>
{{/each}}
</script>
-<script>
- $(function(){
- $.ajax({
- url: baseUrl+"/available/put/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var tpl = $("#putSiteSelectTemplate").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#putSiteSelect').append(html);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- })
-</script>
</body>
</html>
--
Gitblit v1.9.1