From 9e96457d6ed7ebd676a9a7b905fa2032f23aa66a Mon Sep 17 00:00:00 2001 From: chuguofei <1633295391@qq.com> Date: Thu, 15 Jun 2023 13:18:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/oss/iot/alarm_manager.jsp | 8 + .../WEB-INF/oss/iot/common/variable_js.jsp | 10 +- src/main/webapp/WEB-INF/oss/iot/index.jsp | 768 +++++++++--------- src/main/webapp/WEB-INF/oss/iot/monitor.jsp | 9 + .../webapp/WEB-INF/oss/iot/sensors_manger.jsp | 485 +++++------ .../webapp/WEB-INF/oss/iot/task_record.jsp | 9 +- 6 files changed, 673 insertions(+), 616 deletions(-) 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" %> + + 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%>"; - - -<%=ProConfig.PROJECT_NAME%> \ No newline at end of file +<%=ProConfig.PROJECT_NAME%> \ 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" %> <%--后台首页--%> - - <%@ 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/variable.jsp" %> + <%@ include file="/WEB-INF/oss/iot/common/variable_js.jsp" %> + + + + + + + + - -
-
-
- - - -
- - -
-
- - - +
-
- - -
-
- + + +
+
+ + + +
-
- - -
+ + +
+
+ +
+
+ + +
-
- - - - - +
+ + + + + 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" %> + + + + -
-
-
-
-
- +
+
+
+
+
+ -
- -
- -<%-- --%> -<%-- --%> -<%-- --%> -
-
+
+ +
+ + <%-- --%> + <%-- --%> + <%-- --%> +
+
-
- - -
-
+ + +
+
- -
-
+ {'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/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" %> - + +