From 3566e0663e46623735738bc17369bdd7766f2c4c Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Tue, 4 Dec 2018 10:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8=20-?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=8F=A3=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=8A=E5=AD=97=E5=85=B8entrance=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20181203/add_sys_data_dictionary_name.sql         | 8 ++++++++
 src/main/webapp/WEB-INF/views/report/entranceId.jsp       | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql

diff --git a/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
new file mode 100644
index 000000000..541194dde
--- /dev/null
+++ b/src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
@@ -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');
diff --git a/src/main/webapp/WEB-INF/views/report/entranceId.jsp b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
index f4298ef1c..05136929b 100644
--- a/src/main/webapp/WEB-INF/views/report/entranceId.jsp
+++ b/src/main/webapp/WEB-INF/views/report/entranceId.jsp
@@ -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>";