diff --git a/src/main/webapp/WEB-INF/oss/admin/index.jsp b/src/main/webapp/WEB-INF/oss/admin/index.jsp index e3edfbc..6456cf5 100644 --- a/src/main/webapp/WEB-INF/oss/admin/index.jsp +++ b/src/main/webapp/WEB-INF/oss/admin/index.jsp @@ -15,7 +15,7 @@ - + diff --git a/src/main/webapp/WEB-INF/oss/base/common/resource_lib.jsp b/src/main/webapp/WEB-INF/oss/base/common/resource_lib.jsp index 73b31f5..82593aa 100644 --- a/src/main/webapp/WEB-INF/oss/base/common/resource_lib.jsp +++ b/src/main/webapp/WEB-INF/oss/base/common/resource_lib.jsp @@ -30,10 +30,11 @@ + <% } %> - + diff --git a/src/main/webapp/WEB-INF/oss/iot/alarm_all.jsp b/src/main/webapp/WEB-INF/oss/iot/alarm_all.jsp index 0d1eb9a..bb0d07e 100644 --- a/src/main/webapp/WEB-INF/oss/iot/alarm_all.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/alarm_all.jsp @@ -1,50 +1,68 @@ <%@ 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" %> -<%@ 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"%> - - + <%@ 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" %> + + -
- -
-
-
-
-
-
- 项目名称： - - - 报警级别： - - - 时间区间： - - ~ - - -
- -
+
+
+
+
+
+ +
+ +
+
+ 项目名称： + +
+ +
+ 报警级别： + +
+ +
+ 时间区间： + + ~ + +
+
+ +
+ +
+
+ +
+ +
-
-
-
-
-
-
-
+ { name:'操作', type:'self', value_callback :'value_function','width':'5%'}]"> +
+
+
+
+
+ + \ No newline at end of file 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 60c0a62..d54bdf2 100644 --- a/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp @@ -1,48 +1,72 @@ <%@ 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" %> -<%@ 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"%> - - + <%@ 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" %> + + -
-
-
-
-
-
-
- 项目名称： - - 传感器名称： - - - - - 报警级别： - - - - - -
- -
+
+
+
+
+
+ +
+ +
+
+ 项目名称： + +
+ +
+ 传感器名称： + + +
+ +
+ 报警级别： + +
+
+ +
+ + + + +
+
+ +
+ +
-
-
-
-
-
-
-
+ { name:'操作', type:'self', value_callback :'value_function','width':'10%'}]"> +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/oss/iot/history_sensor_data.jsp b/src/main/webapp/WEB-INF/oss/iot/history_sensor_data.jsp index 7b23a2f..a2046fd 100644 --- a/src/main/webapp/WEB-INF/oss/iot/history_sensor_data.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/history_sensor_data.jsp @@ -9,7 +9,9 @@ <%@ 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"%> - + + -
- -
- -
-
- 项目列表 -
-
    - -
  • - - class="active" - - - - - class="active" - - - sid="${obj.id}"> -  ${obj.name } -
    • -     -
-
-
-
-
- - -
-
- -
-
-
- -
-
-
  - {0}     {1} - 设置参数 - 设备号：{2} -
-
- {3} -
-
-
- - -
-
-
-
-
- image -
-
-
{0}
-
{2}
-
-
-
-
- {3} -<%-- 下发--%> - 下发 -
-
- 详情 -
-
-
- -
-
-
-
-
- image -
-
-
{0}
-
{2}
-
-
-
-
- - -<%-- 下发--%> - 下发 -
-
- 详情 -
-
-
- -
-
-
-
-
- image -
-
-
{0}
-
{2}
-
-
-
-
- -
-
- 详情 -
-
-
- -
-
-
-
-
- image -
-
-
{0}
-
{2}
-
-
-
-
- {3} - 下发 -
-
- 详情 -
-
-
- -
-
-
-
-
- image -
-
-
{0}
-
{2}
-
-
-
-
- {3} -
-
- 详情 -
-
-
-
-
+
+ +
+ +
+
+ 项目列表 +
+
    + +
  • + + class="active" + + + + + class="active" + + + sid="${obj.id}"> +  ${obj.name } +
    • +     +
+
+
+
+
+ + +
+
+ +
+
+
+ +
+
+
  + {0}     {1} + 设置参数 + 设备号：{2} +
+
+ {3} +
+
+
+ + +
+
+
+ +
+
{0}
+
{2}
+
+
+
+ {3} + 下发 +
+ + 详情 +  >> + +
+
+ + +
+
+
+ +
+
{0}
+
{2}
+
+
+
+ + 下发 +
+ + 详情 +  >> + +
+
+ + + +
+
+
+ +
+
{0}
+
{2}
+
+
+
+ +
+ + 详情 +  >> + +
+
+ + +
+
+
+ +
+
{0}
+
{2}
+
+
+
+ {3} + 下发 +
+ + 详情 +  >> + +
+
+ + + +
+
+
+ +
+
{0}
+
{2}
+
+
+
+ {3} +
+ + 详情 +  >> + +
+
+
+
\ 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 bb51c62..08a4393 100644 --- a/src/main/webapp/WEB-INF/oss/iot/task_record.jsp +++ b/src/main/webapp/WEB-INF/oss/iot/task_record.jsp @@ -1,53 +1,74 @@ <%@ 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" %> - <%@ 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"%> - - + <%@ 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" %> + +
- -
-
-
-
-
-
- 项目名称： - <%----%> - - - 执行结果： - + +
+
+
+
+
+
- 时间区间： - - ~ - - -
+
-
+
+ 项目名称： + <%----%> + +
+ +
+ 执行结果： + +
+ +
+ 时间区间： + + ~ + +
+
+ +
+ +
+
+ + + +
+ +
-
-
-
-
-
-
+ {name:'时间','type':'time','value':'task_time','width':'10%'}]"> +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 1d34bc8..a2b1a80 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,66 +1,66 @@ - - - index.jsp - - - encodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - encodingFilter - /* - - - contextConfigLocation - - classpath:rest-content.xml - - + xmlns:web="http://java.sun.com/xml/ns/javaee" xmlns:websocket="http://www.springframework.org/schema/websocket" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd" + id="WebApp_ID" version="3.0"> + + + index.jsp + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + encodingFilter + /* + + + contextConfigLocation + + classpath:rest-content.xml + + - - header - com.lp.HeaderFilter - - - header - /* - + + header + com.lp.HeaderFilter + + + header + /* + - - org.springframework.web.context.ContextLoaderListener - - - spring - com.lp.Dispatcher - - contextConfigLocation - classpath:rest-servlet.xml - - 1 - - - spring - /service/* - - - spring - - - - spring - /vp/* - + + org.springframework.web.context.ContextLoaderListener + + + spring + com.lp.Dispatcher + + contextConfigLocation + classpath:rest-servlet.xml + + 1 + + + spring + /service/* + + + spring + + + + spring + /vp/* + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/wechat/iot/common/resource_lib.jsp b/src/main/webapp/WEB-INF/wechat/iot/common/resource_lib.jsp index 3729a33..46464bf 100644 --- a/src/main/webapp/WEB-INF/wechat/iot/common/resource_lib.jsp +++ b/src/main/webapp/WEB-INF/wechat/iot/common/resource_lib.jsp @@ -15,6 +15,7 @@ + - + + - +