From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/pakStore/pakStore.html | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 86ac606..820bbee 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -7,6 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
@@ -14,6 +15,7 @@
height: 100%;
padding: 10px;
background-color: #f1f1f1;
+ box-sizing: border-box;
}
body {
background-color: #fff;
@@ -26,7 +28,7 @@
}
.function-btn {
font-size: 16px;
- padding: 1px 1px 1px 1px;
+ padding: 1px 2px;
width: 100px;
height: 50px;
border-color: #2b425b;
@@ -36,7 +38,7 @@
border-style: solid;
transition: 0.4s;
cursor: pointer;
- letter-spacing: 3px;
+ letter-spacing: 1.5px;
}
.function-btn:hover {
background-color: #2b425b;
@@ -47,23 +49,62 @@
position: relative;
overflow: visible !important;
}
+
+ #mat-query {
+ display: none;
+ }
+
+ #staNoSpan {
+ text-align: center;
+ display: inline-block;
+ width: 100px;
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-form-select {
+ display: inline-block;
+ width: 150px;
+ height: 30px;
+ }
+ .layui-btn-container .layui-form-select.layui-form-selected {
+ display: inline-block;
+ width: 150px;
+ }
+ .layui-btn-container .layui-select-title input {
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-anim.layui-anim-upbit dd {
+ font-size: 13px;
+ }
+
+ #btn-comb {
+ margin-left: 60px;
+ display: none;
+ }
</style>
</head>
<body>
<!-- 鍔熻兘鍖� -->
<div class="function-area">
- <button id="mat-query" class="function-btn" onclick="getMat()">鏂板</button>
+ <button id="mat-query" class="function-btn">鎻愬彇鍟嗗搧</button>
</div>
<hr>
<!-- 琛ㄦ牸 -->
-<div style="padding-bottom: 5px">
+<div style="padding-bottom: 5px; margin-bottom: 45px">
<!-- 澶撮儴 -->
<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-comb" lay-event="comb" style="">鍏ュ簱</button>
+ <div class="layui-form">
+ <div class="layui-btn-container">
+ <!-- 1.閫夋嫨鍏ュ簱鍙� -->
+ <span id="staNoSpan">鍏ュ簱鍙ｏ細</span>
+ <select id="putSiteSelect" lay-verify="required">
+ <option value="">璇烽�夋嫨绔欑偣</option>
+ </select>
+ <!-- 2.鍚姩鍑哄簱 -->
+ <button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
+ </div>
</div>
</script>
@@ -82,48 +123,10 @@
<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>
-<div id="combDiv" style="display: none; padding: 20px">
- <div class="layui-form">
- <div class="layui-form-item">
- <label class="layui-form-label" style="padding: 9px 0">鍏ュ簱绔欑偣锛�</label>
- <div class="layui-input-block" style="margin-left: 90px;">
- <select id="putSiteSelect" lay-verify="required" lay-search="">
- <option value="">璇烽�夋嫨绔欑偣</option>
- </select>
- </div>
- </div>
-
- <div style="text-align: center; margin-top: 20px">
- <button class="layui-btn layui-btn-radius layui-btn-normal" id="combDo" lay-submit lay-filter="combDo">鍚姩鍏ュ簱</button>
- </div>
- </div>
-</div>
-
<script type="text/template" id="putSiteSelectTemplate">
{{#each data}}
<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