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/report/viewLocMap.html | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/report/viewLocMap.html b/src/main/webapp/views/report/viewLocMap.html
index b2e14f5..b2a54a0 100644
--- a/src/main/webapp/views/report/viewLocMap.html
+++ b/src/main/webapp/views/report/viewLocMap.html
@@ -57,11 +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>
+ <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>
@@ -85,7 +89,7 @@
{{#each body}}
<tr>
{{#each loc}}
- <td class="a-loc" title="{{locNo}}" onclick="locDetl(this)" style="background-color:{{bgc}};color:{{color}}">{{locType}}</td>
+ <td class="a-loc" title="{{locNo}}" onclick="locDetl(this)" style="background-color:{{bgc}};color:{{color}}">{{locSts}}</td>
{{/each}}
</tr>
{{/each}}
@@ -98,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