diff --git a/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp b/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp
index c973282..1da1e0f 100644
--- a/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp
@@ -10,6 +10,14 @@
     <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %>
     <%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp" %>
     <link type="text/css" href="<%=basePath%>/css/oss/iot/alarm_manager.css?<%=v%>" rel="stylesheet"/>
+    <script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
+    <script>
+        tailwind.config = {
+            corePlugins: {
+                preflight: false,
+            }
+        }
+    </script>
 
 </head>
 <body>
diff --git a/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp b/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp
index f926285..7af274b 100644
--- a/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/common/variable_js.jsp
@@ -28,12 +28,4 @@
 	          185, 229, 188, 143, 239, 188, 154, 81, 81, 50, 50, 50, 52, 51, 49, 51, 56, 49, 49];
     var aa = "<%=ProConfig.PROJECT_NAME%>";
 </script>
-<script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
-<script>
-    tailwind.config = {
-        corePlugins: {
-            preflight: false,
-        }
-    }
-</script>
-<title><%=ProConfig.PROJECT_NAME%></title> 
\ No newline at end of file
+<title><%=ProConfig.PROJECT_NAME%></title>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/oss/iot/index.jsp b/src/main/webapp/WEB-INF/oss/iot/index.jsp
index ca875a6..90e44a0 100644
--- a/src/main/webapp/WEB-INF/oss/iot/index.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/index.jsp
@@ -1,393 +1,407 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<%@ page import="com.lp.util.CommonUtil"%>
-<%@ page import="com.lp.authority.WechatAuthorityIntercept"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+         pageEncoding="UTF-8" %>
+<%@ page import="com.lp.util.CommonUtil" %>
+<%@ page import="com.lp.authority.WechatAuthorityIntercept" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%--后台首页--%>
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
-  <%@ include file="/WEB-INF/oss/iot/common/variable.jsp"%>
-  <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp"%>
-  <link rel="shortcut icon" href="<%=sensorImg%>/favicon2.ico" type="image/x-icon">
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="<%=basePath%>/lib/layui/layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="<%=basePath%>/lib/layui/layuiadmin/style/admin.css" media="all">
+    <meta charset="utf-8">
+    <%@ include file="/WEB-INF/oss/iot/common/variable.jsp" %>
+    <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %>
+    <link rel="shortcut icon" href="<%=sensorImg%>/favicon2.ico" type="image/x-icon">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="<%=basePath%>/lib/layui/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="<%=basePath%>/lib/layui/layuiadmin/style/admin.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
+    <script>
+        tailwind.config = {
+            corePlugins: {
+                preflight: false,
+            }
+        }
+    </script>
 
 
 </head>
 <body class="layui-layout-body">
-  
-  <div id="LAY_app">
-    <div class="layui-layout layui-layout-admin">
-      <div class="layui-header">
-        <!-- 头部区域 -->
-        <ul class="layui-nav layui-layout-left">
-          <li class="layui-nav-item layadmin-flexible" lay-unselect>
-            <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
-              <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs" >
-            <a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
-              	大屏展示
-            </a>
-          </li>
-        </ul>
-        <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-          
-          <li class="layui-nav-item" lay-unselect>
-            <a lay-href="<%=basePath%>/service/iot/alarm_manager"  lay-text="消息中心">
-              <i class="layui-icon layui-icon-notice"></i>
-              <span class="layui-badge-dot alarm-message"></span>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs" lay-unselect>
-            <a href="javascript:;" layadmin-event="fullscreen">
-              <i class="layui-icon layui-icon-screen-full"></i>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs"> 
-          	<span class="user-type">${user.data.type }</span>
-          </li>
-          <li class="layui-nav-item" lay-unselect  style="margin-right: 30px;">
-            <a href="javascript:;">
-              <cite>
-              	<c:if test="${user.nick_name !=null}">
-				 	 ${user.nick_name }
-				 </c:if>
-				 <c:if test="${user.nick_name ==null}">
-				 	 ${user.name}
-				 </c:if>
-              </cite>
-            </a>
-            <dl class="layui-nav-child" style="padding: 0;">
-              <dd><a style="text-align: center;" lay-href="<%=basePath%>/service/iot/user_detail">个人信息</a></dd>
-              <dd><a style="text-align: center;" lay-href="<%=basePath%>/service/iot/user_info" >修改密码</a></dd>
-              <hr style="margin: 0;">
-              <dd style="text-align: center;cursor:pointer;"><a onclick="logout()" > 退出账户</a></dd>
-            </dl>
-          </li>
-        </ul>
-      </div>
-      
-      <!-- 侧边菜单 -->
-      <div class="layui-side layui-side-menu">
-        <div class="layui-side-scroll">
-          <div class="layui-logo" lay-href="<%=basePath%>/service/iot/app_map">
-          	<span><img style="width: 30px;margin-top: -2px;margin-right: 3px;display: inherit;" src="<%=sensorImg%>/logo13.png">
-          	</span>
-            <span><%=ProConfig.SYS_INFO_NAME%></span>
-          </div>
-          
-          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
-            <li data-name="home" class="layui-nav-item layui-nav-itemed">
-              <a href="javascript:;" lay-tips="平台概览" lay-direction="2">
-                <i class="layui-icon layui-icon-home"></i>
-                <cite>平台概览</cite>
-              </a>
-              <dl class="layui-nav-child">
-                <dd data-name="console" class="layui-this">
-                  <a lay-href="<%=basePath%>/service/iot/app_map">
-                  	<i class="layui-icon layui-icon-right"></i>项目信息</a>
-                </dd>
-                <dd data-name="console">
-                  <a lay-href="<%=basePath%>/service/iot/device_location">
-                  	<i class="layui-icon layui-icon-right"></i>设备地图</a>
-                </dd>
-                <dd data-name="console">
-                  <a lay-href="<%=basePath%>/service/iot/app_status">
-                  	<i class="layui-icon layui-icon-right"></i>系统统计</a>
-                </dd>
-              </dl>
-            </li>
-            <li data-name="component" class="layui-nav-item">
-              <a href="javascript:;" lay-tips="实时监控" lay-direction="2">
-                <i class="layui-icon layui-icon-component"></i>
-                <cite>监控中心</cite>
-              </a>
-              <dl class="layui-nav-child">
-                <dd data-name="button">
-                  <a lay-href="<%=basePath%>/service/iot/monitor">
-                  	<i class="layui-icon layui-icon-right"></i> 设备监控</a>
-                </dd>
-                <dd data-name="button2">
-                  <a lay-href="<%=basePath%>/service/iot/device_list">
-                  	<i class="layui-icon layui-icon-right"></i> 列表监控</a>
-                </dd>
 
-                  <dd data-name="button2">
-                      <a lay-href="<%=basePath%>/service/iot/visual_list">
-                          <i class="layui-icon layui-icon-right"></i> 组态监控</a>
-                  </dd>
-                <dd data-name="nav">
-                  <a lay-href="<%=basePath%>/page/hkvideo/index.html">
-                  	<i class="layui-icon layui-icon-right"></i>视频监控</a>
-                </dd>
-              </dl>
-            </li>
-            <li data-name="template" class="layui-nav-item">
-              <a href="javascript:;" lay-tips="报警信息" lay-direction="2">
-                <i class="layui-icon layui-icon-template"></i>
-                <cite>报警信息</cite>
-              </a>
-              <dl class="layui-nav-child">
-                <dd><a lay-href="<%=basePath%>/service/iot/alarm_manager">
-                	<i class="layui-icon layui-icon-right"></i>未读报警</a></dd>
-                <dd><a lay-href="<%=basePath%>/service/iot/alarm_all">
-                	<i class="layui-icon layui-icon-right"></i>全部报警</a></dd>
-              </dl>
-            </li>
-            
-            <li data-name="history" class="layui-nav-item">
-              <a href="javascript:;" lay-tips="历史数据" lay-direction="2">
-                <i class="layui-icon layui-icon-chart"></i>
-                <cite>历史数据</cite>
-              </a>
-              <dl class="layui-nav-child">
-                <dd><a lay-href="<%=basePath%>/service/iot/history_sensor_data">
-                	<i class="layui-icon layui-icon-right"></i>设备历史</a></dd>
-                <dd><a lay-href="<%=basePath%>/page/myhtml/index.html">
-                	<i class="layui-icon layui-icon-right"></i>数据分析</a></dd>
-                <dd><a lay-href="<%=basePath%>/service/iot/history_trigger_data">
-                	<i class="layui-icon layui-icon-right"></i>历史触发</a></dd>
-              </dl>
-            </li>
-            
-            <li data-name="app" class="layui-nav-item">
-              <a href="javascript:;" lay-tips="用户管理" lay-direction="2">
-                <i class="layui-icon layui-icon-user"></i>
-                <cite>用户信息</cite>
-              </a>
-              <dl class="layui-nav-child">
-               <c:if test="${user.type == 10 || user.type == 8 }">
-	                <dd>
-	                  <a lay-href="<%=basePath%>/service/iot/user_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>子账户管理</a>
-	                </dd>
-                </c:if>
-                 <dd>
-	                 <a lay-href="<%=basePath%>/service/iot/user_detail">
-	                  	<i class="layui-icon layui-icon-right"></i>个人信息</a>
-                  </dd>
-                  <dd>
-	                  <a lay-href="<%=basePath%>/service/iot/user_info">
-	                  	<i class="layui-icon layui-icon-right"></i>修改密码</a>
-                  </dd>
-              </dl>
-            </li>
-           
-            
-             <c:if test="${user.type == 10 || user.type == 8 }">
-            	<li data-name="appm" class="layui-nav-item">
-	              <a href="javascript:;" lay-href="<%=basePath%>/service/iot/app_manager" lay-tips="项目管理" lay-direction="2">
-	                <i class="layui-icon layui-icon-app"></i>
-	                <cite>项目管理</cite>
-	              </a>
-	            </li>
-            </c:if>
-            
-             <c:if test="${user.type == 10 || user.type == 8 }">
-	            <li data-name="setDE" class="layui-nav-item">
-	              <a href="javascript:;" lay-tips="设备管理" lay-direction="2">
-	                <i class="layui-icon layui-icon-engine"></i>
-	                <cite>设备管理</cite>
-	              </a>
-	              <dl class="layui-nav-child">
-	              	<dd>
-	                  <a lay-href="<%=basePath%>/service/iot/gateway_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>设备信息</a>
-	                </dd>
-	                <%-- <dd>
-	                  <a lay-href="<%=basePath%>/page/devicemanager/index.html">
-	                  	<i class="layui-icon layui-icon-right"></i>子设备信息</a>
-	                </dd> --%>
-	                <dd>
-	                  <a lay-href="<%=basePath%>/service/iot/video_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>视频信息</a>
-	                </dd>
-	              </dl>
-	            </li>
-            </c:if>
-              <c:if test="${ user.type == 10 || user.type == 8  }">
-	            <li data-name="visualMager" class="layui-nav-item">
-	              <a href="javascript:;" lay-tips="组态管理" lay-direction="2">
-	                <i class="layui-icon layui-icon-engine"></i>
-	                <cite>组态管理</cite>
-	              </a>
-	              <dl class="layui-nav-child">
-	              	<dd>
-	                  <a lay-href="<%=basePath%>/service/iot/visual_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>组态列表</a>
-	                </dd>
-	                <c:if test="${ user.type == 10 }">
-	                <dd>
-	                  <a lay-href="<%=basePath%>/page/visual/moudleManagement.html">
-	                  	<i class="layui-icon layui-icon-right"></i>组件管理</a>
-	                </dd>
-	                </c:if>
-	              </dl>
-	            </li>
-            </c:if>
-            
-            
-            <c:if test="${user.type == 10 || user.type == 8 }">
-	            <li data-name="trigger" class="layui-nav-item">
-	              <a href="javascript:;" lay-tips="触发器管理" lay-direction="2">
-	                <i class="layui-icon layui-icon-senior"></i>
-	                <cite>触发器管理</cite>
-	              </a>
-	              <dl class="layui-nav-child">
-	                <dd>
-	                  <a lay-href="<%=basePath%>/service/iot/trigger_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>触发器列表</a>
-	                </dd>
-	                <dd data-name="workorder">
-	                  <a lay-href="<%=basePath%>/service/iot/contact_user_manager">
-	                  	<i class="layui-icon layui-icon-right"></i>报警联系人</a>
-	                </dd>
-	              </dl>
-	            </li>
-            </c:if>
-            <c:if test="${user.type == 10 || user.type == 8 }">
-                <li data-name="logging" class="layui-nav-item">
-                  <a href="javascript:;" lay-tips="日志管理" lay-direction="2">
-                      <i class="layui-icon layui-icon-chart"></i>
-                      <cite>日志管理</cite>
-                  </a>
-                  <dl class="layui-nav-child">
-                      <dd><a lay-href="<%=basePath%>/service/iot/task_record">
-                          <i class="layui-icon layui-icon-right"></i>执行记录</a></dd>
-<%--                      <dd><a lay-href="<%=basePath%>/page/myhtml/index.html">--%>
-<%--                          <i class="layui-icon layui-icon-right"></i>数据分析</a></dd>--%>
-<%--                      <dd><a lay-href="<%=basePath%>/service/iot/history_trigger_data">--%>
-<%--                          <i class="layui-icon layui-icon-right"></i>历史触发</a></dd>--%>
-                  </dl>
+<div id="LAY_app">
+    <div class="layui-layout layui-layout-admin">
+        <div class="layui-header">
+            <!-- 头部区域 -->
+            <ul class="layui-nav layui-layout-left">
+                <li class="layui-nav-item layadmin-flexible" lay-unselect>
+                    <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
+                        <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+                    </a>
                 </li>
-            </c:if>
-            <c:if test="${user.type == 10 }">
-	            <li data-name="system" class="layui-nav-item">
-	            	 <a href="javascript:;" lay-tips="系统设置" lay-direction="2">
-		                <i class="layui-icon layui-icon-set"></i>
-		                <cite>系统管理</cite>
-		              </a>
-		              <dl class="layui-nav-child">
-		              	 <dd>
-		                  <a lay-href="<%=basePath%>/service/base/user">
-		                  	<i class="layui-icon layui-icon-right"></i>用户列表</a>
-		                </dd>
-		                 <dd>
-		                  <a lay-href="<%=basePath%>/service/base/smsStatistic">
-		                  	<i class="layui-icon layui-icon-right"></i>服务统计</a>
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/app">
-		                  	<i class="layui-icon layui-icon-right"></i>项目列表</a>
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/device">
-		                  	<i class="layui-icon layui-icon-right"></i>设备列表</a>
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/device_house">
-		                  	<i class="layui-icon layui-icon-right"></i>设备仓库</a>
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/sensorico">
-		                  	<i class="layui-icon layui-icon-right"></i>图标管理</a>
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/dictionary">
-		                  	<i class="layui-icon layui-icon-right"></i>数据字典</a>
-		                </dd>
-		                  <dd>
-		                  <a lay-href="<%=basePath%>/service/base/lpm">
-		                  	<i class="layui-icon layui-icon-right"></i>LPM管理</a> 
-		                </dd>
-		                <dd>
-		                  <a lay-href="<%=basePath%>/service/base/sys">
-		                  	<i class="layui-icon layui-icon-right"></i>系统参数</a> 
-		                </dd>
-		              </dl>
-	            </li>
-           </c:if>
-          </ul>
+                <li class="layui-nav-item layui-hide-xs">
+                    <a target="_blank" href="<%=basePath%>/page/bigscreen/index.html">
+                        大屏展示
+                    </a>
+                </li>
+            </ul>
+            <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
+
+                <li class="layui-nav-item" lay-unselect>
+                    <a lay-href="<%=basePath%>/service/iot/alarm_manager" lay-text="消息中心">
+                        <i class="layui-icon layui-icon-notice"></i>
+                        <span class="layui-badge-dot alarm-message"></span>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="fullscreen">
+                        <i class="layui-icon layui-icon-screen-full"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs">
+                    <span class="user-type">${user.data.type }</span>
+                </li>
+                <li class="layui-nav-item" lay-unselect style="margin-right: 30px;">
+                    <a href="javascript:;">
+                        <cite>
+                            <c:if test="${user.nick_name !=null}">
+                                ${user.nick_name }
+                            </c:if>
+                            <c:if test="${user.nick_name ==null}">
+                                ${user.name}
+                            </c:if>
+                        </cite>
+                    </a>
+                    <dl class="layui-nav-child" style="padding: 0;">
+                        <dd><a style="text-align: center;" lay-href="<%=basePath%>/service/iot/user_detail">个人信息</a>
+                        </dd>
+                        <dd><a style="text-align: center;" lay-href="<%=basePath%>/service/iot/user_info">修改密码</a>
+                        </dd>
+                        <hr style="margin: 0;">
+                        <dd style="text-align: center;cursor:pointer;"><a onclick="logout()"> 退出账户</a></dd>
+                    </dl>
+                </li>
+            </ul>
         </div>
-      </div>
-      
-      <!-- 主体内容 -->
-      <div class="layui-body" id="LAY_app_body">
-        <div class="layadmin-tabsbody-item layui-show">
-          <iframe src="<%=basePath%>/service/iot/app_map" frameborder="0" class="layadmin-iframe"></iframe>
+
+        <!-- 侧边菜单 -->
+        <div class="layui-side layui-side-menu">
+            <div class="layui-side-scroll">
+                <div class="layui-logo" lay-href="<%=basePath%>/service/iot/app_map">
+          	<span><img style="width: 30px;margin-top: -2px;margin-right: 3px;display: inherit;"
+                       src="<%=sensorImg%>/logo13.png">
+          	</span>
+                    <span><%=ProConfig.SYS_INFO_NAME%></span>
+                </div>
+
+                <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu"
+                    lay-filter="layadmin-system-side-menu">
+                    <li data-name="home" class="layui-nav-item layui-nav-itemed">
+                        <a href="javascript:;" lay-tips="平台概览" lay-direction="2">
+                            <i class="layui-icon layui-icon-home"></i>
+                            <cite>平台概览</cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <dd data-name="console" class="layui-this">
+                                <a lay-href="<%=basePath%>/service/iot/app_map">
+                                    <i class="layui-icon layui-icon-right"></i>项目信息</a>
+                            </dd>
+                            <dd data-name="console">
+                                <a lay-href="<%=basePath%>/service/iot/device_location">
+                                    <i class="layui-icon layui-icon-right"></i>设备地图</a>
+                            </dd>
+                            <dd data-name="console">
+                                <a lay-href="<%=basePath%>/service/iot/app_status">
+                                    <i class="layui-icon layui-icon-right"></i>系统统计</a>
+                            </dd>
+                        </dl>
+                    </li>
+                    <li data-name="component" class="layui-nav-item">
+                        <a href="javascript:;" lay-tips="实时监控" lay-direction="2">
+                            <i class="layui-icon layui-icon-component"></i>
+                            <cite>监控中心</cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <dd data-name="button">
+                                <a lay-href="<%=basePath%>/service/iot/monitor">
+                                    <i class="layui-icon layui-icon-right"></i> 设备监控</a>
+                            </dd>
+                            <dd data-name="button2">
+                                <a lay-href="<%=basePath%>/service/iot/device_list">
+                                    <i class="layui-icon layui-icon-right"></i> 列表监控</a>
+                            </dd>
+
+                            <dd data-name="button2">
+                                <a lay-href="<%=basePath%>/service/iot/visual_list">
+                                    <i class="layui-icon layui-icon-right"></i> 组态监控</a>
+                            </dd>
+                            <dd data-name="nav">
+                                <a lay-href="<%=basePath%>/page/hkvideo/index.html">
+                                    <i class="layui-icon layui-icon-right"></i>视频监控</a>
+                            </dd>
+                        </dl>
+                    </li>
+                    <li data-name="template" class="layui-nav-item">
+                        <a href="javascript:;" lay-tips="报警信息" lay-direction="2">
+                            <i class="layui-icon layui-icon-template"></i>
+                            <cite>报警信息</cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <dd><a lay-href="<%=basePath%>/service/iot/alarm_manager">
+                                <i class="layui-icon layui-icon-right"></i>未读报警</a></dd>
+                            <dd><a lay-href="<%=basePath%>/service/iot/alarm_all">
+                                <i class="layui-icon layui-icon-right"></i>全部报警</a></dd>
+                        </dl>
+                    </li>
+
+                    <li data-name="history" class="layui-nav-item">
+                        <a href="javascript:;" lay-tips="历史数据" lay-direction="2">
+                            <i class="layui-icon layui-icon-chart"></i>
+                            <cite>历史数据</cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <dd><a lay-href="<%=basePath%>/service/iot/history_sensor_data">
+                                <i class="layui-icon layui-icon-right"></i>设备历史</a></dd>
+                            <dd><a lay-href="<%=basePath%>/page/myhtml/index.html">
+                                <i class="layui-icon layui-icon-right"></i>数据分析</a></dd>
+                            <dd><a lay-href="<%=basePath%>/service/iot/history_trigger_data">
+                                <i class="layui-icon layui-icon-right"></i>历史触发</a></dd>
+                        </dl>
+                    </li>
+
+                    <li data-name="app" class="layui-nav-item">
+                        <a href="javascript:;" lay-tips="用户管理" lay-direction="2">
+                            <i class="layui-icon layui-icon-user"></i>
+                            <cite>用户信息</cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <c:if test="${user.type == 10 || user.type == 8 }">
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/iot/user_manager">
+                                        <i class="layui-icon layui-icon-right"></i>子账户管理</a>
+                                </dd>
+                            </c:if>
+                            <dd>
+                                <a lay-href="<%=basePath%>/service/iot/user_detail">
+                                    <i class="layui-icon layui-icon-right"></i>个人信息</a>
+                            </dd>
+                            <dd>
+                                <a lay-href="<%=basePath%>/service/iot/user_info">
+                                    <i class="layui-icon layui-icon-right"></i>修改密码</a>
+                            </dd>
+                        </dl>
+                    </li>
+
+
+                    <c:if test="${user.type == 10 || user.type == 8 }">
+                        <li data-name="appm" class="layui-nav-item">
+                            <a href="javascript:;" lay-href="<%=basePath%>/service/iot/app_manager" lay-tips="项目管理"
+                               lay-direction="2">
+                                <i class="layui-icon layui-icon-app"></i>
+                                <cite>项目管理</cite>
+                            </a>
+                        </li>
+                    </c:if>
+
+                    <c:if test="${user.type == 10 || user.type == 8 }">
+                        <li data-name="setDE" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="设备管理" lay-direction="2">
+                                <i class="layui-icon layui-icon-engine"></i>
+                                <cite>设备管理</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/iot/gateway_manager">
+                                        <i class="layui-icon layui-icon-right"></i>设备信息</a>
+                                </dd>
+                                    <%-- <dd>
+                                      <a lay-href="<%=basePath%>/page/devicemanager/index.html">
+                                          <i class="layui-icon layui-icon-right"></i>子设备信息</a>
+                                    </dd> --%>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/iot/video_manager">
+                                        <i class="layui-icon layui-icon-right"></i>视频信息</a>
+                                </dd>
+                            </dl>
+                        </li>
+                    </c:if>
+                    <c:if test="${ user.type == 10 || user.type == 8  }">
+                        <li data-name="visualMager" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="组态管理" lay-direction="2">
+                                <i class="layui-icon layui-icon-engine"></i>
+                                <cite>组态管理</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/iot/visual_manager">
+                                        <i class="layui-icon layui-icon-right"></i>组态列表</a>
+                                </dd>
+                                <c:if test="${ user.type == 10 }">
+                                    <dd>
+                                        <a lay-href="<%=basePath%>/page/visual/moudleManagement.html">
+                                            <i class="layui-icon layui-icon-right"></i>组件管理</a>
+                                    </dd>
+                                </c:if>
+                            </dl>
+                        </li>
+                    </c:if>
+
+
+                    <c:if test="${user.type == 10 || user.type == 8 }">
+                        <li data-name="trigger" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="触发器管理" lay-direction="2">
+                                <i class="layui-icon layui-icon-senior"></i>
+                                <cite>触发器管理</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/iot/trigger_manager">
+                                        <i class="layui-icon layui-icon-right"></i>触发器列表</a>
+                                </dd>
+                                <dd data-name="workorder">
+                                    <a lay-href="<%=basePath%>/service/iot/contact_user_manager">
+                                        <i class="layui-icon layui-icon-right"></i>报警联系人</a>
+                                </dd>
+                            </dl>
+                        </li>
+                    </c:if>
+                    <c:if test="${user.type == 10 || user.type == 8 }">
+                        <li data-name="logging" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="日志管理" lay-direction="2">
+                                <i class="layui-icon layui-icon-chart"></i>
+                                <cite>日志管理</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="<%=basePath%>/service/iot/task_record">
+                                    <i class="layui-icon layui-icon-right"></i>执行记录</a></dd>
+                                    <%--                      <dd><a lay-href="<%=basePath%>/page/myhtml/index.html">--%>
+                                    <%--                          <i class="layui-icon layui-icon-right"></i>数据分析</a></dd>--%>
+                                    <%--                      <dd><a lay-href="<%=basePath%>/service/iot/history_trigger_data">--%>
+                                    <%--                          <i class="layui-icon layui-icon-right"></i>历史触发</a></dd>--%>
+                            </dl>
+                        </li>
+                    </c:if>
+                    <c:if test="${user.type == 10 }">
+                        <li data-name="system" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="系统设置" lay-direction="2">
+                                <i class="layui-icon layui-icon-set"></i>
+                                <cite>系统管理</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/user">
+                                        <i class="layui-icon layui-icon-right"></i>用户列表</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/smsStatistic">
+                                        <i class="layui-icon layui-icon-right"></i>服务统计</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/app">
+                                        <i class="layui-icon layui-icon-right"></i>项目列表</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/device">
+                                        <i class="layui-icon layui-icon-right"></i>设备列表</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/device_house">
+                                        <i class="layui-icon layui-icon-right"></i>设备仓库</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/sensorico">
+                                        <i class="layui-icon layui-icon-right"></i>图标管理</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/dictionary">
+                                        <i class="layui-icon layui-icon-right"></i>数据字典</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/lpm">
+                                        <i class="layui-icon layui-icon-right"></i>LPM管理</a>
+                                </dd>
+                                <dd>
+                                    <a lay-href="<%=basePath%>/service/base/sys">
+                                        <i class="layui-icon layui-icon-right"></i>系统参数</a>
+                                </dd>
+                            </dl>
+                        </li>
+                    </c:if>
+                </ul>
+            </div>
         </div>
-      </div>
-      
-      <!-- 辅助元素，一般用于移动设备下遮罩 -->
-      <div class="layadmin-body-shade" layadmin-event="shade"></div>
+
+        <!-- 主体内容 -->
+        <div class="layui-body" id="LAY_app_body">
+            <div class="layadmin-tabsbody-item layui-show">
+                <iframe src="<%=basePath%>/service/iot/app_map" frameborder="0" class="layadmin-iframe"></iframe>
+            </div>
+        </div>
+
+        <!-- 辅助元素，一般用于移动设备下遮罩 -->
+        <div class="layadmin-body-shade" layadmin-event="shade"></div>
     </div>
-  </div>
-  <script type="text/javascript" src="<%=basePath%>/lib/jquery/jquery-1.8.3.min.js"></script>
-  <script src="<%=basePath%>/lib/layui/layuiadmin/layui/layui.js"></script>
-  
- 
-   <script> 
- 	  layui.config({
- 	  	base: '<%=basePath%>/lib/layui/layuiadmin/' 
- 	  }).extend({
- 	    index: 'lib/index' //主入口模块
- 	  }).use('index');
-	  
- 	  function logout(){
- 		 localStorage.removeItem("ucode");
- 		 window.location.href = localUrl + "/user/logout" ;
- 	  }
- 	  
-	  $(function(){
-		
-		getAlarmCount();
-			
-		function getAlarmCount(){
-			postAjax(localUrl+"/alarm/unread", {iot_alarm_process_status:46},function(data){
-				if( data.status == 2 ){
-					if(data.count!=0)
-						$(".alarm-message").show();
-					else{
-						$(".alarm-message").hide();
-					}
-				}
-			})			
-		}
-			
-		// 报警消息定时刷新
-		setInterval(function(){
-			getAlarmCount();
-		}, 1*30*1000);
-	  
-		function postAjax(url, data,sucessCallBack, errorCallBack) {
-			if(typeof(userKey)=="undefined"){
-				userKey='';
-			}
-			$.ajax({
-				type : "POST",
-				url : url,
-				contentType : "application/json",
-				dataType : "json",
-				async : true,
-				headers : {
-					'USER-KEY' :userKey 
-				},
-				data : JSON.stringify(data),
-				success : function(data){
-					sucessCallBack(data);
-				},
-				error : errorCallBack
-			})
-		};
-	 })
-  </script>
+</div>
+<script type="text/javascript" src="<%=basePath%>/lib/jquery/jquery-1.8.3.min.js"></script>
+<script src="<%=basePath%>/lib/layui/layuiadmin/layui/layui.js"></script>
+
+
+<script>
+    layui.config({
+        base: '<%=basePath%>/lib/layui/layuiadmin/'
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use('index');
+
+    function logout() {
+        localStorage.removeItem("ucode");
+        window.location.href = localUrl + "/user/logout";
+    }
+
+    $(function () {
+
+        getAlarmCount();
+
+        function getAlarmCount() {
+            postAjax(localUrl + "/alarm/unread", {iot_alarm_process_status: 46}, function (data) {
+                if (data.status == 2) {
+                    if (data.count != 0)
+                        $(".alarm-message").show();
+                    else {
+                        $(".alarm-message").hide();
+                    }
+                }
+            })
+        }
+
+        // 报警消息定时刷新
+        setInterval(function () {
+            getAlarmCount();
+        }, 1 * 30 * 1000);
+
+        function postAjax(url, data, sucessCallBack, errorCallBack) {
+            if (typeof (userKey) == "undefined") {
+                userKey = '';
+            }
+            $.ajax({
+                type: "POST",
+                url: url,
+                contentType: "application/json",
+                dataType: "json",
+                async: true,
+                headers: {
+                    'USER-KEY': userKey
+                },
+                data: JSON.stringify(data),
+                success: function (data) {
+                    sucessCallBack(data);
+                },
+                error: errorCallBack
+            })
+        };
+    })
+</script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/oss/iot/monitor.jsp b/src/main/webapp/WEB-INF/oss/iot/monitor.jsp
index c25133d..c88983f 100644
--- a/src/main/webapp/WEB-INF/oss/iot/monitor.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/monitor.jsp
@@ -10,9 +10,18 @@
     <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %>
     <%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp" %>
     <script type="text/javascript" src="<%=basePath%>/lib/mqtt/mqtt.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
+    <script>
+        tailwind.config = {
+            corePlugins: {
+                preflight: false,
+            }
+        }
+    </script>
 
 
     <link type="text/css" href="<%=basePath%>/css/oss/iot/monitor_device.css?<%=v%>" rel="stylesheet"/>
+
     <style type="text/css">
         .red-span {
             background: #f44336;
diff --git a/src/main/webapp/WEB-INF/oss/iot/sensors_manger.jsp b/src/main/webapp/WEB-INF/oss/iot/sensors_manger.jsp
index cc51948..20afdb6 100644
--- a/src/main/webapp/WEB-INF/oss/iot/sensors_manger.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/sensors_manger.jsp
@@ -1,135 +1,157 @@
-<!--  
- * 版权所有 @鸿名物联 
- * 未经授权，禁止侵权和商业用途，违法必究
- * 联系QQ：2224313811  
+<!--
+* 版权所有 @鸿名物联
+* 未经授权，禁止侵权和商业用途，违法必究
+* 联系QQ：2224313811
 -->
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<%@ page import="com.lp.cfg.ProConfig"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+         pageEncoding="UTF-8" %>
+<%@ page import="com.lp.cfg.ProConfig" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <!DOCTYPE html>
 <html>
 <head>
-<%@ include file="/WEB-INF/oss/iot/common/variable.jsp"%>
-<%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp"%>
-<%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp"%>
-<script type="text/javascript" src="<%=basePath%>/lib/webUploader/webuploader.min.js"></script>
-	<link rel="stylesheet" href="/lib/element-ui/index.css"/>
-<style type="text/css">
-	.webuploader-element-invisible{
-		display: none !important;
-	}
-	.download{
-		text-align: center;
-		text-decoration: underline;
-		color: #3499da;
-		font-size: 16px;
-		padding-top: 15px;
-		cursor: pointer;
-	}
-	.index_theLeft ul {
-	    width: 100%;
-	    padding: 0px;
-	    margin: 0px;
-	    overflow: auto;
-	}
-	.index_theLeft li {
-	    list-style: none;
-	    position: relative;
-	     padding: 8px 0 8px 20px;
-	    border-bottom: 1px solid #f9f9f9;
-	    cursor: pointer;
-	}
-	
-	.index_theLeft li.active , .index_theLeft li:HOVER{
-		background: #f9f9f9;
-	}
-	
-	.index_theLeft li span,.index_theLeft li h5{
-		text-align: center;
-		color: #333;
-	}
-	.mapContainer{
-		height: 550px;width:100%;
-	}
-	
-	.app-container{
-		background:  #f2f2f2;width: 100%;border-top:1px solid #ecf0f5;
-	}
-	
-	.box-white {
-	    width: 97%;
-	    min-width: 897px;
-	    padding-bottom: 0;
-	    margin: 0 auto;
-	}
-	.box {
-	    padding: 10px;
-	    padding-top:1px;
-	    border-left: 1px solid #d2d6de;
-	    border-right: 1px solid #d2d6de;
-	    border-bottom: 1px solid #d2d6de;
-	}
-	.box {
-	    border: 0!important;
-	    box-shadow: 0 0 2px 1px rgba(13,5,9,.08)!important;
-	}
-	.box {
-	    position: relative;
-	    border-radius: 3px;
-	    background: #fff;
-	    border-top: 3px solid #d2d6de;
-	    margin-bottom: 20px;
-	    width: 100%;
-	    box-shadow: 0 1px 1px rgba(0,0,0,.1);
-	}
+    <%@ include file="/WEB-INF/oss/iot/common/variable.jsp" %>
+    <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %>
+    <%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp" %>
+    <script type="text/javascript" src="<%=basePath%>/lib/webUploader/webuploader.min.js"></script>
+    <link rel="stylesheet" href="/lib/element-ui/index.css"/>
+    <script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
+    <script>
+        tailwind.config = {
+            corePlugins: {
+                preflight: false,
+            }
+        }
+    </script>
 
-.sceneList-info{
-	padding-top: 10px;
-	padding-left: 10px;
-}
-	.blue-span{
-		background: #3499da;
-	    padding: 3px 6px;
-	    color: #fff;
-	    border-radius: 4px;
-	}
-	
-	.red-span{
-		background: #f44336;
-	    padding: 3px 6px;
-	    color: #fff;
-	    border-radius: 4px;
-	}
-</style>
+    <style type="text/css">
+        .webuploader-element-invisible {
+            display: none !important;
+        }
+
+        .download {
+            text-align: center;
+            text-decoration: underline;
+            color: #3499da;
+            font-size: 16px;
+            padding-top: 15px;
+            cursor: pointer;
+        }
+
+        .index_theLeft ul {
+            width: 100%;
+            padding: 0px;
+            margin: 0px;
+            overflow: auto;
+        }
+
+        .index_theLeft li {
+            list-style: none;
+            position: relative;
+            padding: 8px 0 8px 20px;
+            border-bottom: 1px solid #f9f9f9;
+            cursor: pointer;
+        }
+
+        .index_theLeft li.active, .index_theLeft li:HOVER {
+            background: #f9f9f9;
+        }
+
+        .index_theLeft li span, .index_theLeft li h5 {
+            text-align: center;
+            color: #333;
+        }
+
+        .mapContainer {
+            height: 550px;
+            width: 100%;
+        }
+
+        .app-container {
+            background: #f2f2f2;
+            width: 100%;
+            border-top: 1px solid #ecf0f5;
+        }
+
+        .box-white {
+            width: 97%;
+            min-width: 897px;
+            padding-bottom: 0;
+            margin: 0 auto;
+        }
+
+        .box {
+            padding: 10px;
+            padding-top: 1px;
+            border-left: 1px solid #d2d6de;
+            border-right: 1px solid #d2d6de;
+            border-bottom: 1px solid #d2d6de;
+        }
+
+        .box {
+            border: 0 !important;
+            box-shadow: 0 0 2px 1px rgba(13, 5, 9, .08) !important;
+        }
+
+        .box {
+            position: relative;
+            border-radius: 3px;
+            background: #fff;
+            border-top: 3px solid #d2d6de;
+            margin-bottom: 20px;
+            width: 100%;
+            box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+        }
+
+        .sceneList-info {
+            padding-top: 10px;
+            padding-left: 10px;
+        }
+
+        .blue-span {
+            background: #3499da;
+            padding: 3px 6px;
+            color: #fff;
+            border-radius: 4px;
+        }
+
+        .red-span {
+            background: #f44336;
+            padding: 3px 6px;
+            color: #fff;
+            border-radius: 4px;
+        }
+    </style>
 </head>
 <body>
-	<div>
-		<div>
-			<div>
-				<div>
-					<div style="padding-top: 15px;">
-						<button onclick="addSensor()" class="button button-small small ml-20 bg-iot">新增传感点</button>
+<div>
+    <div>
+        <div>
+            <div>
+                <div style="padding-top: 15px;">
+                    <button onclick="addSensor()" class="button button-small small ml-20 bg-iot">新增传感点</button>
 
-						<div class="upload_img" id="upload_file"
-							 style="display: inline-block; position: relative; width: 150px;">
-							<button class="button button-small ml-20 bg-iot">
-								<span class="icon-cloud-upload"></span> 导入
-							</button>
-						</div>
-						<button onclick="window.open('<%=basePath%>/file/excel/传感器导入模板.xlsx')" class="button button-small small ml-20 bg-iot "><span class="icon-download"></span> 模板下载</button>
-<%--						<button id="excel-down" onclick="excelDown()" class="button button-small small ml-20 bg-iot float-right">模板下载</button>--%>
-<%--						<button id="all-export" onclick="allexport()" class="button button-small small ml-20 bg-iot float-right">导出</button>--%>
-<%--						<button id="all-delete" onclick="deleteSensors()" class="button button-small small ml-20 " style="background: #e33;color:#fff;" >全部删除</button>--%>
-					</div>
-					<div class="container-layout sceneList-info" style="position: relative;">
+                    <div class="upload_img" id="upload_file"
+                         style="display: inline-block; position: relative; width: 150px;">
+                        <button class="button button-small ml-20 bg-iot">
+                            <span class="icon-cloud-upload"></span> 导入
+                        </button>
+                    </div>
+                    <button onclick="window.open('<%=basePath%>/file/excel/传感器导入模板.xlsx')"
+                            class="button button-small small ml-20 bg-iot "><span class="icon-download"></span> 模板下载
+                    </button>
+                    <%--						<button id="excel-down" onclick="excelDown()" class="button button-small small ml-20 bg-iot float-right">模板下载</button>--%>
+                    <%--						<button id="all-export" onclick="allexport()" class="button button-small small ml-20 bg-iot float-right">导出</button>--%>
+                    <%--						<button id="all-delete" onclick="deleteSensors()" class="button button-small small ml-20 " style="background: #e33;color:#fff;" >全部删除</button>--%>
+                </div>
+                <div class="container-layout sceneList-info" style="position: relative;">
 
-						<div class="box join-device-box">
-							<input class="node_id" type="hidden" >
-							<input class="sensor_device_id" type="hidden">
-							 <div style="margin-top:10px;">
-								<div id="init-table" type-option="table" config-option="'url':'/page/sensor',
+                    <div class="box join-device-box">
+                        <input class="node_id" type="hidden">
+                        <input class="sensor_device_id" type="hidden">
+                        <div style="margin-top:10px;">
+                            <div id="init-table" type-option="table" config-option="'url':'/page/sensor',
 											param:{ node_id:'$.node_id$',data_type:-1 ,sensor_device_id: '$.sensor_device_id$' },
 											columns:[
 												{'name':'序号','type':'seq','value':'seq','width':'4%'}, 
@@ -138,122 +160,127 @@
 												{'name':'类型',type:'self',value_callback:'func_type_name','width':'8%'}, 
 												{'name':'地址号','value':'sensor_device_id','width':'10%'}, 
 												{'name':'寄存器号','value':'port_id','width':'10%'}, 
-												{'name':'操作','type':'self','value_callback':'value_function','width':'10%'}]" > 
-								
-								</div>
-							</div>
+												{'name':'操作','type':'self','value_callback':'value_function','width':'10%'}]">
 
-						</div>
-<%--						<img title="增加传感器" alt="增加传感器"  style="cursor:pointer;width:45px;position:absolute;bottom: 11%;right:6%;" onclick="addSensor()"  src="<%=sensorImg%>/add.png">--%>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <%--						<img title="增加传感器" alt="增加传感器"  style="cursor:pointer;width:45px;position:absolute;bottom: 11%;right:6%;" onclick="addSensor()"  src="<%=sensorImg%>/add.png">--%>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 <script type="text/javascript">
-function changeScene(obj){
-	$(".dashboard-menu li").removeClass("active");
-	$(obj).addClass("active");
-	$(".scene_id").val($(".dashboard-menu li.active").attr("sid"));
-	reflash( $(".dashboard-menu li.active").attr("sid"));
-	// 
-	manual_init_selecter($(".jui-selecter"));
-}
-function reflash(id){
-	$("#init-table").data("params",{ scene_id: $(".scene_id").val(),data_type:-1 });
-	$("#init-table").tableAdaptor();
-}
-function value_function(data,seq){
-	return "<span tag='编辑' onclick='t_edit(this,"+data.id+")' class='self-icon icon-edit'></span>"+
-    "<span tag='删除' onclick='t_delete(this,"+data.id+")' class='self-icon icon-bitbucket'></span>";
-}
-function t_edit(obj,id){
-	var subUrl = '' ;
-	var sensor_device_id = GetQueryString("sensor_device_id") ;
-	if( !validater.empty( sensor_device_id ) ){
-		subUrl = "&sensor_device_id=" + sensor_device_id ;
-	}
-	forwardUrl("/iot/sensor_info_detail?id="+ $(".node_id").val()  +"&sid="+id + subUrl );
-}
+    function changeScene(obj) {
+        $(".dashboard-menu li").removeClass("active");
+        $(obj).addClass("active");
+        $(".scene_id").val($(".dashboard-menu li.active").attr("sid"));
+        reflash($(".dashboard-menu li.active").attr("sid"));
+        //
+        manual_init_selecter($(".jui-selecter"));
+    }
 
-function func_type_name(obj){
-	if(obj.data_type == 0 ){
-		return "<span class='blue-span'>数据</span>" ;
-	}else if(obj.data_type == 1) {
-		return "<span class='red-span'>配置</span>" ;
-	}else if(obj.data_type == 2) {
-		return "<span class='red-span'>报警</span>" ;
-	}
-}
+    function reflash(id) {
+        $("#init-table").data("params", {scene_id: $(".scene_id").val(), data_type: -1});
+        $("#init-table").tableAdaptor();
+    }
 
-function t_delete(obj,id){
-	lcomfirm('是否确定删除该传感点？',function(){
-		commonAjax("DELETE",localUrl+"/sensor?id="+id, "",function(){
-			tip("删除成功");
-			setTimeout(function(){
-				closeAll();
-				$("#init-table").tableAdaptor();
-			},1000)
-		});
-	});
-}
+    function value_function(data, seq) {
+        return "<span tag='编辑' onclick='t_edit(this," + data.id + ")' class='self-icon icon-edit'></span>" +
+            "<span tag='删除' onclick='t_delete(this," + data.id + ")' class='self-icon icon-bitbucket'></span>";
+    }
 
-function addSensor(){
-	var subUrl = '' ;
-	var sensor_device_id = GetQueryString("sensor_device_id") ;
-	if( !validater.empty( sensor_device_id ) ){
-		subUrl = "&sensor_device_id=" + sensor_device_id ;
-	}
-	forwardUrl("/iot/sensor_info_detail?id="+ $(".node_id").val() + subUrl )  ;
-}
+    function t_edit(obj, id) {
+        var subUrl = '';
+        var sensor_device_id = GetQueryString("sensor_device_id");
+        if (!validater.empty(sensor_device_id)) {
+            subUrl = "&sensor_device_id=" + sensor_device_id;
+        }
+        forwardUrl("/iot/sensor_info_detail?id=" + $(".node_id").val() + "&sid=" + id + subUrl);
+    }
 
-/**
- * 模板下载
- */
-function excelDown(){
-	window.open(localUrl + "/sensor/export/empty");
-}
-/**
- * 传感器列表导出
- */
-function allexport(){
-	window.open(localUrl + "/sensor/export?node_id=" + GetQueryString("node_id") );
-}
-/**
- * 全部删除点
- */
-function deleteSensors(){
-	lcomfirm('是否确定删除所有传感点？',function(){
-		commonAjax("DELETE",localUrl + "/sensor/delete?node_id=" + GetQueryString("node_id") , "" ,function(){
-			tip("删除成功");
-			setTimeout(function(){
-				closeAll();
-				$("#init-table").tableAdaptor();
-			},1000)
-		});
-	});
-}
+    function func_type_name(obj) {
+        if (obj.data_type == 0) {
+            return "<span class='blue-span'>数据</span>";
+        } else if (obj.data_type == 1) {
+            return "<span class='red-span'>配置</span>";
+        } else if (obj.data_type == 2) {
+            return "<span class='red-span'>报警</span>";
+        }
+    }
 
-var node_id = GetQueryString("node_id");
-var sensor_device_id = GetQueryString("sensor_device_id");
+    function t_delete(obj, id) {
+        lcomfirm('是否确定删除该传感点？', function () {
+            commonAjax("DELETE", localUrl + "/sensor?id=" + id, "", function () {
+                tip("删除成功");
+                setTimeout(function () {
+                    closeAll();
+                    $("#init-table").tableAdaptor();
+                }, 1000)
+            });
+        });
+    }
 
-$(function(){
-	$(".node_id").val( GetQueryString("node_id") );
-	$(".sensor_device_id").val(GetQueryString("sensor_device_id")) ;
+    function addSensor() {
+        var subUrl = '';
+        var sensor_device_id = GetQueryString("sensor_device_id");
+        if (!validater.empty(sensor_device_id)) {
+            subUrl = "&sensor_device_id=" + sensor_device_id;
+        }
+        forwardUrl("/iot/sensor_info_detail?id=" + $(".node_id").val() + subUrl);
+    }
 
-	//上传模板
-	UploadInit( localUrl + '/sensor/upload.json' , {"nodeId":node_id} ,function(file,data){
-		if(isOK(data)){
-			tip("导入成功");
-			// reflash( $(".dashboard-menu li.active").attr("sid"));
-			setTimeout(function() {
-				$("#init-table").tableAdaptor();
-			}, 2000);
-		}else{
-			tip(data.statusMsg,3000);
-		}
-	}, "upload_file" ,"","100px", "35px") ;
-})
+    /**
+     * 模板下载
+     */
+    function excelDown() {
+        window.open(localUrl + "/sensor/export/empty");
+    }
+
+    /**
+     * 传感器列表导出
+     */
+    function allexport() {
+        window.open(localUrl + "/sensor/export?node_id=" + GetQueryString("node_id"));
+    }
+
+    /**
+     * 全部删除点
+     */
+    function deleteSensors() {
+        lcomfirm('是否确定删除所有传感点？', function () {
+            commonAjax("DELETE", localUrl + "/sensor/delete?node_id=" + GetQueryString("node_id"), "", function () {
+                tip("删除成功");
+                setTimeout(function () {
+                    closeAll();
+                    $("#init-table").tableAdaptor();
+                }, 1000)
+            });
+        });
+    }
+
+    var node_id = GetQueryString("node_id");
+    var sensor_device_id = GetQueryString("sensor_device_id");
+
+    $(function () {
+        $(".node_id").val(GetQueryString("node_id"));
+        $(".sensor_device_id").val(GetQueryString("sensor_device_id"));
+
+        //上传模板
+        UploadInit(localUrl + '/sensor/upload.json', {"nodeId": node_id}, function (file, data) {
+            if (isOK(data)) {
+                tip("导入成功");
+                // reflash( $(".dashboard-menu li.active").attr("sid"));
+                setTimeout(function () {
+                    $("#init-table").tableAdaptor();
+                }, 2000);
+            } else {
+                tip(data.statusMsg, 3000);
+            }
+        }, "upload_file", "", "100px", "35px");
+    })
 </script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
index 0feb30a..fa52cdc 100644
--- a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
+++ b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp
@@ -10,7 +10,14 @@
     <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %>
     <%@ include file="/WEB-INF/oss/iot/common/resource_lib.jsp" %>
     <link type="text/css" href="<%=basePath%>/css/oss/iot/alarm_manager.css?<%=v%>" rel="stylesheet"/>
-
+    <script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
+    <script>
+        tailwind.config = {
+            corePlugins: {
+                preflight: false,
+            }
+        }
+    </script>
 
 </head>
 <body>
