gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实时报表 -出入口字典查询及字典entrance添加

Browse Source
This commit is contained in:
leijun
2018-12-04 10:17:10 +08:00
parent 1272529eb6
commit 3566e0663e
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql Normal file
View File

@@ -0,0 +1,8 @@
#日志查询-串联设备链路号字典添加
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('147', '串联设备链路号', 'LINK', '串联设备链路号', 'user:管理员,2018-12-03 18:39:24edit', '2018-12-03 16:13:24', '2018-12-03 18:39:24', '1');
#日志查询-出入口字典添加
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改！|用户管理员,在2018-06-15 11:53:01修改！|用户管理员,在2018-06-15 11:52:16修改！|用户管理员,在2018-06-15 11:35:15修改！', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');

8
src/main/webapp/WEB-INF/views/report/entranceId.jsp
View File

@@ -20,7 +20,13 @@ $(function(){
<c:forEach items="${datas}" var="data">
trContent += "<tr>";
<c:forEach items="${data.key}" var="entranceId" varStatus="status">
trContent += "<td>${entranceId}</td>";
trContent += "<td>";
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
<c:if test="${dic.itemCode eq entranceId}">
trContent += "<spring:message code="${dic.itemValue}"/>";
</c:if>
</c:forEach>
trContent += "</td>";
</c:forEach>
<c:forEach items="${data.value}" var="cloumn" varStatus="status">
trContent += "<td>${cloumn}</td>";