seg_yinzy
/
iotadmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 修复布局自适应问题

dev
chuguofei 2023-06-12 21:39:10 +08:00
parent d489e02103
commit bc5a1f6919
14 changed files with 1081 additions and 892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/oss/admin/index.jsp
View File

@ -15,7 +15,7 @@
<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>
</head>
<body class="layui-layout-body">

3
src/main/webapp/WEB-INF/oss/base/common/resource_lib.jsp
View File

@ -30,10 +30,11 @@
<link rel="stylesheet" type="text/css" href="<%=basePath%>/lib/kkpager/kkpager_blue.css"/>
<link type="text/css" href="<%=basePath%>/lib/jedate/skin/jedate.css" rel="stylesheet"/>
<link type="text/css" href="<%=basePath%>/lib/lpro/style.css?<%=v%>" rel="stylesheet"/>
<%
}
%>
<script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
<script type="text/javascript" src="<%=basePath%>/lib/layer/layer.js"></script>
<link type="text/css" href="<%=basePath%>/css/oss/base/style.css?<%=v%>" rel="stylesheet"/>

166
src/main/webapp/WEB-INF/oss/iot/alarm_all.jsp
View File

@ -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" %>
<!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"%>
<link type="text/css" href="<%=basePath%>/css/oss/iot/alarm_manager.css?<%=v%>" rel="stylesheet"/>
<style type="text/css">
</style>
<%@ 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" %>
<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>
</head>
<body>
<div>
<!-- 下方部位 -->
<div style="background: #ecf0f5;">
<div class="mapContainer" >
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table" config-option=" submit:'#searchbtns',table:'#init-table'">
<span>项目名称：</span>
<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>
<!-- <span class="ml-10">传感器名称：</span>
<input type-name="sensor_name" class="input input-self" /> -->
<span class="ml-10">报警级别：</span>
<select type-name="iot_trigger_alarm_level" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/38','key':'code','value':'name',
'type':'list' ,init_value:'选择报警级别' " class="input input-select input-self" ></select>
<span class="ml-10 ml-10-r">时间区间：</span>
<input type-name="start_time" class="input jui-time start_time" data-options="defaultValue:-7" />
<span>~</span>
<input type-name="end_time" class="input jui-time end_time" data-options="" />
<button id="searchbtns" class="button ml-20 bg-iot float-right"><span class="icon-search"></span> 查询</button>
</div>
<div id="init-table" class="jui-table" config-option="url:'/page/alarm',
<div>
<!-- 下方部位 -->
<div style="background: #ecf0f5;">
<div class="mapContainer">
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table"
config-option=" submit:'#searchbtns',table:'#init-table'">
<div class="flex justify-between flex-col flex-wrap lg:flex-row">
<div class="flex flex-row flex-wrap">
<div class="flex items-center mr-2 mb-2">
<span>项目名称：</span>
<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>
</div>
<div class="flex items-center mr-2 mb-2">
<span >报警级别：</span>
<select type-name="iot_trigger_alarm_level" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/38','key':'code','value':'name',
'type':'list' ,init_value:'选择报警级别' "
class="input input-select input-self"></select>
</div>
<div class="flex items-center mb-2">
<span>时间区间：</span>
<input type-name="start_time" class="input jui-time start_time"
data-options="defaultValue:-7"/>
<span class="mx-1">~</span>
<input type-name="end_time" class="input jui-time end_time" data-options=""/>
</div>
</div>
<div class="w-full flex justify-end lg:mt-0 lg:w-auto items-center mb-1">
<button id="searchbtns" class="button ml-2 bg-iot h-7"><span
class="icon-search"></span> 查询
</button>
</div>
</div>
</div>
<div id="init-table" class="jui-table" config-option="url:'/page/alarm',
param:{ start_time:'$.start_time$',end_time:'$.end_time$' },
columns:[
{name:'序号','type':'seq','value':'seq','width':'5%'},
@ -54,40 +72,42 @@
{name:'报警级别','type':'category','value':'iot_trigger_alarm_level','width':'6%',style:{39:'color,#e33',40:'color,#CD5C5C',41:'#FF7F50' } },
{name:'处理标志','type':'category','value':'iot_alarm_process_status','width':'7%',style:{47:'color,#A9A9A9',48:'color,#FF7F50',46:'color,#e33' }},
{name:'时间','type':'time','value':'atime','width':'10%'},
{ name:'操作', type:'self', value_callback :'value_function','width':'5%'}]" >
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{ name:'操作', type:'self', value_callback :'value_function','width':'5%'}]">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<script type="text/javascript">
function value_function(data,seq){
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='删除' onclick='t_delete(this,"+data.id+")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
function t_delete(obj,i){
lcomfirm('是否确定删除该报警信息？',function(){
commonAjax("DELETE",localUrl+"/alarm?id="+i, '',function(data){
if(isOK(data)){
tip("删除成功");
setTimeout(function(){
$("#init-table").tableAdaptor();
},1000);
}
});
})
}
$(function(){
function value_function(data, seq) {
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='删除' onclick='t_delete(this," + data.id + ")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
$(document).delegate(".limiter","click",function(){
layer.tips($(this).attr("tag") , this, {
tips: [1, '#4682B4']
});
})
})
function t_delete(obj, i) {
lcomfirm('是否确定删除该报警信息？', function () {
commonAjax("DELETE", localUrl + "/alarm?id=" + i, '', function (data) {
if (isOK(data)) {
tip("删除成功");
setTimeout(function () {
$("#init-table").tableAdaptor();
}, 1000);
}
});
})
}
$(function () {
$(document).delegate(".limiter", "click", function () {
layer.tips($(this).attr("tag"), this, {
tips: [1, '#4682B4']
});
})
})
</script>
</html>

243
src/main/webapp/WEB-INF/oss/iot/alarm_manager.jsp
View File

@ -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" %>
<!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"%>
<link type="text/css" href="<%=basePath%>/css/oss/iot/alarm_manager.css?<%=v%>" rel="stylesheet"/>
<%@ 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" %>
<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>
</head>
<body>
<div>
<div style="background: #ecf0f5;">
<div class="mapContainer" >
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table" config-option=" submit:'#searchbtns',table:'#init-table'">
<span>项目名称：</span>
<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>
<span class="ml-10">传感器名称：</span>
<input type-name="sensor_name" placeholder="传感器名称" class="input input-self" />
<input type="hidden" type-name="iot_alarm_process_status" value="46" >
<span class="ml-10">报警级别：</span>
<select type-name="iot_trigger_alarm_level" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/38','key':'code','value':'name',
'type':'list' ,init_value:'选择报警级别' " class="input input-select input-self" ></select>
<c:if test="${user.type == 10 || user.type == 8 }">
<button id="solvebtns" onclick="allSetRead()" class="button ml-20 bg-iot float-right"><span class="icon-bullhorn"></span> 全部标记为已读</button>
</c:if>
<button id="searchbtns" class="button ml-20 bg-iot float-right"><span class="icon-search"></span> 查询</button>
</div>
<!-- {name:'报警数值 / 阀值','value':'{sdata} / {alarm_sdata}','width':'13%'}, -->
<div id="init-table" class="jui-table" config-option="url:'/page/alarm',
<div>
<div style="background: #ecf0f5;">
<div class="mapContainer">
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table"
config-option=" submit:'#searchbtns',table:'#init-table'">
<div class="flex justify-between flex-col flex-wrap lg:flex-row">
<div class="flex">
<div class="flex items-center w-52">
<span>项目名称：</span>
<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>
</div>
<div class="flex items-center w-52">
<span>传感器名称：</span>
<input type-name="sensor_name" placeholder="传感器名称"
class="input input-self"/>
<input type="hidden" type-name="iot_alarm_process_status" value="46">
</div>
<div class="flex items-center w-52">
<span>报警级别：</span>
<select type-name="iot_trigger_alarm_level" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/38','key':'code','value':'name',
'type':'list' ,init_value:'选择报警级别' "
class="input input-select input-self"></select>
</div>
</div>
<div class="w-full flex justify-end mt-2 lg:mt-0 lg:w-auto">
<c:if test="${user.type == 10 || user.type == 8 }">
<button id="solvebtns" onclick="allSetRead()"
class="button bg-iot ml-2">
<span class="icon-bullhorn"></span> 全部标记为已读
</button>
</c:if>
<button id="searchbtns" class="button bg-iot ml-2"><span
class="icon-search"></span> 查询
</button>
</div>
</div>
</div>
<!-- {name:'报警数值 / 阀值','value':'{sdata} / {alarm_sdata}','width':'13%'}, -->
<div id="init-table" class="jui-table" config-option="url:'/page/alarm',
param:{iot_alarm_process_status:46},
columns:[
{name:'序号','type':'seq','value':'seq','width':'6%'},
@ -52,82 +76,83 @@
{name:'报警级别','type':'category','value':'iot_trigger_alarm_level','width':'8%',style:{39:'color,#e33',40:'color,#CD5C5C',41:'#FF7F50' } },
{name:'处理标志','type':'category','value':'iot_alarm_process_status','width':'8%',style:{47:'color,#A9A9A9',48:'color,#FF7F50',46:'color,#e33' }},
{name:'时间','type':'time','value':'atime','width':'12%'},
{ name:'操作', type:'self', value_callback :'value_function','width':'10%'}]" >
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{ name:'操作', type:'self', value_callback :'value_function','width':'10%'}]">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<script type="text/javascript">
function value_function(data,seq){
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='处理消息' onclick='t_modify(this,"+data.id+")' class='icon-eye self-icon'></span>"+
"<span tag='标记' onclick='t_tag(this,"+data.id+")' class='self-icon icon-tag'></span>"+
"<span tag='删除' onclick='t_delete(this,"+data.id+")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
function value_function(data, seq) {
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='处理消息' onclick='t_modify(this," + data.id + ")' class='icon-eye self-icon'></span>" +
"<span tag='标记' onclick='t_tag(this," + data.id + ")' class='self-icon icon-tag'></span>" +
"<span tag='删除' onclick='t_delete(this," + data.id + ")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
function t_modify(obj,i){
var data ={
id: i,
iot_alarm_process_status:47
};
commonAjax("PUT",localUrl+"/alarm", data,function(){
tip("报警消息已处理");
setTimeout(function(){
$("#init-table").tableAdaptor();
},1000)
});
}
function t_modify(obj, i) {
var data = {
id: i,
iot_alarm_process_status: 47
};
commonAjax("PUT", localUrl + "/alarm", data, function () {
tip("报警消息已处理");
setTimeout(function () {
$("#init-table").tableAdaptor();
}, 1000)
});
}
function t_tag(obj,i){
lcomfirm('是否确定标记该报警信息？',function(){
var data ={
id:i,
iot_alarm_process_status:48
};
commonAjax("PUT",localUrl+"/alarm", data,function(){
tip("标记成功");
setTimeout(function(){
$("#init-table").tableAdaptor();
},1000)
});
})
}
function t_tag(obj, i) {
lcomfirm('是否确定标记该报警信息？', function () {
var data = {
id: i,
iot_alarm_process_status: 48
};
commonAjax("PUT", localUrl + "/alarm", data, function () {
tip("标记成功");
setTimeout(function () {
$("#init-table").tableAdaptor();
}, 1000)
});
})
}
function t_delete(obj,i){
lcomfirm('是否确定删除该报警信息？',function(){
commonAjax("DELETE",localUrl+"/alarm?id="+i, '',function(data){
if(isOK(data)){
tip("删除成功");
setTimeout(function(){
$("#init-table").tableAdaptor();
},1000);
}
});
})
}
function t_delete(obj, i) {
lcomfirm('是否确定删除该报警信息？', function () {
commonAjax("DELETE", localUrl + "/alarm?id=" + i, '', function (data) {
if (isOK(data)) {
tip("删除成功");
setTimeout(function () {
$("#init-table").tableAdaptor();
}, 1000);
}
});
})
}
function allSetRead(){
lcomfirm('是否确定设置所有报警信息为已处理？',function(){
commonAjax("GET",localUrl+"/alarm/read", '',function(){
tip("处理成功");
$("#init-table").tableAdaptor();
});
})
}
$(function(){
$(document).delegate(".limiter","click",function(){
layer.tips($(this).attr("tag") , this, {
tips: [1, '#4682B4']
});
})
})
function allSetRead() {
lcomfirm('是否确定设置所有报警信息为已处理？', function () {
commonAjax("GET", localUrl + "/alarm/read", '', function () {
tip("处理成功");
$("#init-table").tableAdaptor();
});
})
}
$(function () {
$(document).delegate(".limiter", "click", function () {
layer.tips($(this).attr("tag"), this, {
tips: [1, '#4682B4']
});
})
})
</script>
</html>

8
src/main/webapp/WEB-INF/oss/iot/history_sensor_data.jsp
View File

@ -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"%>
<style type="text/css">
<script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
<style type="text/css">
.index_theLeft ul {
width: 100%;
padding: 0px;
@ -93,12 +95,14 @@
<select type-name="sensor_id" class="input input-self input-select sensor_id"
config-option=" url:'/page/sensor.json?pageSize=300&paged=1',data:{node_id:'$.node_id$' },
init_value:'请选择传感点','key':'id','value':'name',type:'page'" ></select>
init_value:'请选择传感点1','key':'id','value':'name',type:'page'" ></select>
<input type-name="scene_id" class="scene_id" type="hidden" />
<input type-name="start_time" class="input input-self jui-time start_time" data-options="defaultValue:-1" >
<span >~</span>
<input type-name="end_time" class="input input-self jui-time end_time" >
<button type-option="button" style="margin-left: 5px;" config-option="'type':'excel','selector':'.search-container','url':'/sensor/history/excel' "
class="button bg-iot float-right"><span class="icon-file-excel-o"></span> 导出</button>
<button id="searchbtns" class="button ml-20 bg-iot float-right"><span class="icon-search"></span> 查询</button>

2
src/main/webapp/WEB-INF/oss/iot/index.jsp
View File

@ -17,7 +17,7 @@
<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>
</head>
<body class="layui-layout-body">

1182
src/main/webapp/WEB-INF/oss/iot/monitor.jsp
View File

File diff suppressed because it is too large Load Diff

167
src/main/webapp/WEB-INF/oss/iot/task_record.jsp
View File

@ -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" %>
<!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"%>
<link type="text/css" href="<%=basePath%>/css/oss/iot/alarm_manager.css?<%=v%>" rel="stylesheet"/>
<style type="text/css">
</style>
<%@ 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" %>
<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>
</head>
<body>
<div>
<!-- 下方部位 -->
<div style="background: #ecf0f5;">
<div class="mapContainer" >
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table" config-option=" submit:'#searchbtns',table:'#init-table'">
<span>项目名称：</span>
<%--<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>--%>
<select type-name="scene_id" type-option="selecter"
config-option=" method:'POST','url':'/page/scene-all','key':'id','value':'name',
'type':'list' ,init_value:'选择项目' " class="input input-select input-self" ></select>
<!-- <span class="ml-10">传感器名称：</span>
<input type-name="sensor_name" class="input input-self" /> -->
<span class="ml-10">执行结果：</span>
<select type-name="task_result" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/451','key':'code','value':'name',
'type':'list' ,init_value:'选择执行结果' " class="input input-select input-self" ></select>
<!-- 下方部位 -->
<div style="background: #ecf0f5;">
<div class="mapContainer">
<div class="app-container">
<div class="container-layout sceneList-info">
<div class="box join-device-box">
<div class="search-container" type-option="search_table"
config-option=" submit:'#searchbtns',table:'#init-table'">
<span class="ml-10 ml-10-r">时间区间：</span>
<input type-name="start_time" class="input jui-time start_time" data-options="defaultValue:-7" />
<span>~</span>
<input type-name="end_time" class="input jui-time end_time" data-options="" />
<button id="searchbtns" class="button ml-20 bg-iot float-right"><span class="icon-search"></span> 查询</button>
</div>
<div class="flex justify-between flex-col flex-wrap lg:flex-row">
<div id="init-table" class="jui-table" config-option="url:'/page/task-record',
<div class="flex flex-row flex-wrap">
<div class="flex items-center mr-2 mb-2">
<span>项目名称：</span>
<%--<select type-name="scene_id" class="input input-select input-self">
<option value="">选择项目</option>
<c:forEach items="${info.data.getData()}" varStatus="status" var="obj">
<option value="${obj.id}">${obj.name }</option>
</c:forEach>
</select>--%>
<select type-name="scene_id" type-option="selecter"
config-option=" method:'POST','url':'/page/scene-all','key':'id','value':'name',
'type':'list' ,init_value:'选择项目' "
class="input input-select input-self"></select>
</div>
<div class="flex items-center mr-2 mb-2">
<span>执行结果：</span>
<select type-name="task_result" type-option="selecter"
config-option=" method:'GET','url':'/dictionary/451','key':'code','value':'name',
'type':'list' ,init_value:'选择执行结果' "
class="input input-select input-self"></select>
</div>
<div class="flex items-center mb-2">
<span>时间区间：</span>
<input type-name="start_time" class="input jui-time start_time"
data-options="defaultValue:-7"/>
<span class="mx-1">~</span>
<input type-name="end_time" class="input jui-time end_time" data-options=""/>
</div>
</div>
<div class="w-full flex justify-end lg:mt-0 lg:w-auto items-center mb-1">
<button id="searchbtns" class="button ml-2 bg-iot h-7"><span
class="icon-search"></span> 查询
</button>
</div>
</div>
</div>
<div id="init-table" class="jui-table" config-option="url:'/page/task-record',
param:{ start_time:'$.start_time$',end_time:'$.end_time$' },
columns:[
{name:'执行者','value':'call_name','width':'8%'},
@ -57,39 +78,41 @@
{name:'传感器','value':'sensor_name','width':'9%',limit:26},
{name:'数据','value':'task_data','width':'5%',limit:26},
{name:'结果','value':'result_name','width':'6%',style:{'成功':'color,#e33','失败':'color,#CD5C5C',41:'#FF7F50' } },
{name:'时间','type':'time','value':'task_time','width':'10%'}]" >
</div>
</div>
</div>
</div>
</div>
</div>
{name:'时间','type':'time','value':'task_time','width':'10%'}]">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
<script type="text/javascript">
function value_function(data,seq){
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='删除' onclick='t_delete(this,"+data.id+")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
function t_delete(obj,i){
lcomfirm('是否确定删除该报警信息？',function(){
commonAjax("DELETE",localUrl+"/alarm?id="+i, '',function(data){
if(isOK(data)){
tip("删除成功");
setTimeout(function(){
$("#init-table").tableAdaptor();
},1000);
}
});
})
}
$(function(){
$(document).delegate(".limiter","click",function(){
layer.tips($(this).attr("tag") , this, {
tips: [1, '#4682B4']
});
})
})
function value_function(data, seq) {
<c:if test="${user.type == 10 || user.type == 8 }">
return "<span tag='删除' onclick='t_delete(this," + data.id + ")' class='self-icon icon-bitbucket'></span>";
</c:if>
}
function t_delete(obj, i) {
lcomfirm('是否确定删除该报警信息？', function () {
commonAjax("DELETE", localUrl + "/alarm?id=" + i, '', function (data) {
if (isOK(data)) {
tip("删除成功");
setTimeout(function () {
$("#init-table").tableAdaptor();
}, 1000);
}
});
})
}
$(function () {
$(document).delegate(".limiter", "click", function () {
layer.tips($(this).attr("tag"), this, {
tips: [1, '#4682B4']
});
})
})
</script>
</html>

122
src/main/webapp/WEB-INF/web.xml
View File

@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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">
<display-name></display-name>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<filter>
<filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
<init-param>
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
classpath:rest-content.xml
</param-value>
</context-param>
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">
<display-name></display-name>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<filter>
<filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
<init-param>
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
classpath:rest-content.xml
</param-value>
</context-param>
<filter>
<filter-name>header</filter-name>
<filter-class>com.lp.HeaderFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>header</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter>
<filter-name>header</filter-name>
<filter-class>com.lp.HeaderFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>header</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>com.lp.Dispatcher</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:rest-servlet.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern></url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/vp/*</url-pattern>
</servlet-mapping>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>com.lp.Dispatcher</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:rest-servlet.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern></url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/vp/*</url-pattern>
</servlet-mapping>
</web-app>

1
src/main/webapp/WEB-INF/wechat/iot/common/resource_lib.jsp
View File

@ -15,6 +15,7 @@
<script type="text/javascript" src="<%=basePath%>/lib/jqueryweiui/jquery-weui.min.js"></script>
<script type="text/javascript" src="<%=basePath%>/lib/jqueryweiui/fastclick.js"></script>
<script type="text/javascript" src="<%=basePath%>/lib/lpro/tool_wap_0.1.js"></script>
<script type="text/javascript" src="<%=basePath%>/lib/tailwind/tailwind.js"></script>
<script>
$(function() {

1
src/main/webapp/css/oss/iot/monitor.css
View File

@ -85,7 +85,6 @@ h3{
line-height: 60px;
}
.join-device-box a{
text-align: center;
text-decoration: underline !important;
cursor: pointer;
}

3
src/main/webapp/css/oss/iot/monitor_device.css
View File

@ -60,9 +60,6 @@ h3{
background: #f3f3f3;
}
.sensor_info_container span{
line-height: 60px;
}
.sensor_info_container{
padding-top: 10px;

63
src/main/webapp/lib/tailwind/tailwind.js Normal file
View File

File diff suppressed because one or more lines are too long

10
src/main/webapp/page/visual/index.html
View File

@ -39,7 +39,13 @@
<script type="text/javascript" src="../../lib/echarts/echarts.min.js"></script>
<script type="text/javascript" src="../../lib/echarts/echarts-liquidfill.min.js"></script>
<script type="text/javascript" src="js/cfg.js"></script>
<link rel="stylesheet" href="css/cfg.css" />
<link rel="stylesheet" href="css/cfg.css" />
<style>
.iot-container{
height: calc(100vh - 60px);
/*border: 1px red solid;*/
}
</style>
</head>
<body>
<div id="app" style="display: none;">
@ -60,7 +66,7 @@
<div class="head_btn" @click="showVisual()"> <div class="el-icon-position "></div> 预览</div>
</div>
</el-header>
<el-container>
<el-container class="iot-container">
<el-aside width="240px">
<el-container>
<el-aside width="60px" style="background: #4a5053;" class="left-container" >