From 8d78203c9a377d299a0af64efc535a86b5d98c39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 25 七月 2020 09:44:54 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 3 +++
src/main/webapp/views/report/viewLocMap.html | 23 ++++++++++++++---------
src/main/webapp/static/js/report/locMap.js | 23 +++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 5 +++++
4 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index d77ba97..836f31e 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -78,6 +78,11 @@
}
//-----------------搴撳瓨MAP鍥�--------------------------------------
+ @RequestMapping("/viewLocMapList/rows.action")
+ public R queryViewLocMapRows(){
+ return R.ok().add(reportQueryMapper.getViewLocRowTotal());
+ }
+
@RequestMapping("/viewLocMapList.action")
public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
// 鑾峰彇鎺掔骇鏁版嵁
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 578ea15..cff29c5 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,6 +24,9 @@
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
// // 搴撲綅Map
+ @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ List<Integer> getViewLocRowTotal();
+
@Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
public List<String> getViewLocLevCount(@Param("row1") int row1);
//
diff --git a/src/main/webapp/static/js/report/locMap.js b/src/main/webapp/static/js/report/locMap.js
index 3831df2..5475a00 100644
--- a/src/main/webapp/static/js/report/locMap.js
+++ b/src/main/webapp/static/js/report/locMap.js
@@ -3,8 +3,31 @@
var layer = layui.layer;
var form = layui.form;
+ getLocMapRows();
getLocTable(1);
+ function getLocMapRows() {
+ $.ajax({
+ url: baseUrl+"/report/viewLocMapList/rows.action",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ var tpl = $("#locMastRowTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#rowSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ }
+
function getLocTable(row){
$.ajax({
url: baseUrl+"/report/viewLocMapList.action",
diff --git a/src/main/webapp/views/report/viewLocMap.html b/src/main/webapp/views/report/viewLocMap.html
index 472f21b..b2a54a0 100644
--- a/src/main/webapp/views/report/viewLocMap.html
+++ b/src/main/webapp/views/report/viewLocMap.html
@@ -57,15 +57,15 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline" style="margin-left: 10px">
<div class="layui-input-inline">
- <select name="row" lay-filter="row">
- <option value="1">绗�1鎺�</option>
- <option value="2">绗�2鎺�</option>
- <option value="3">绗�3鎺�</option>
- <option value="4">绗�4鎺�</option>
- <option value="5">绗�5鎺�</option>
- <option value="6">绗�6鎺�</option>
- <option value="7">绗�7鎺�</option>
- <option value="8">绗�8鎺�</option>
+ <select id="rowSelect" name="row" lay-filter="row">
+<!-- <option value="1">绗�1鎺�</option>-->
+<!-- <option value="2">绗�2鎺�</option>-->
+<!-- <option value="3">绗�3鎺�</option>-->
+<!-- <option value="4">绗�4鎺�</option>-->
+<!-- <option value="5">绗�5鎺�</option>-->
+<!-- <option value="6">绗�6鎺�</option>-->
+<!-- <option value="7">绗�7鎺�</option>-->
+<!-- <option value="8">绗�8鎺�</option>-->
</select>
</div>
</div>
@@ -102,5 +102,10 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/report/locMap.js" charset="utf-8"></script>
</body>
+<script type="text/template" id="locMastRowTemplate">
+ {{#each data}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
</html>
--
Gitblit v1.9.1