Skip to content

J
jcy_monitor
Commit e8e13e6d authored by beilang's avatar beilang
Browse files
Options

2024-12-13

parent 8ce14840
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 486 additions and 178 deletions
src/main/java/com/ces/web/hw/controller/HWController.java
View file @ e8e13e6d
...@@ -82,4 +82,16 @@ public class HWController { ...@@ -82,4 +82,16 @@ public class HWController {
public ModelAndView lhjlIndex() { public ModelAndView lhjlIndex() {
return new ModelAndView("hw/hw_lhjl"); return new ModelAndView("hw/hw_lhjl");
} }
@GetMapping("/caochang")
@RequiresRoles({Constant.RoleCode.WGS})
public ModelAndView caoChangIndex() {
return new ModelAndView("hw/hw_caochang");
}
@GetMapping("/chuichang")
@RequiresRoles({Constant.RoleCode.WGS})
public ModelAndView chuiChangIndex() {
return new ModelAndView("hw/hw_chuichang");
}
} }
src/main/webapp/WEB-INF/views/base.jsp
View file @ e8e13e6d
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<script src="${ctx}/static/js/rem.js"></script> <script src="${ctx}/static/js/rem.js"></script>
<script src="${ctx}/static/js/popper.min.js"></script> <script src="${ctx}/static/js/popper.min.js"></script>
<script src="${ctx}/static/libs/layer/layer.js"></script> <script src="${ctx}/static/libs/layer/layer.js"></script>
<script src="${ctx}/static/js/jquery.nicescroll.min.js"></script>
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/common.css?v=100"/> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/common.css?v=100"/>
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/workshop.css"/> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/workshop.css"/>
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/commonArea.css"/> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/commonArea.css"/>
...@@ -106,4 +107,25 @@ ...@@ -106,4 +107,25 @@
.layui-layer-msg .layui-layer-content{ .layui-layer-msg .layui-layer-content{
color: #fff!important; color: #fff!important;
} }
/* 滚动条轨道样式 */
::-webkit-scrollbar {
width: 8px; /* 设置滚动条宽度 */
}
/* 滚动条滑块样式 */
::-webkit-scrollbar-thumb {
background-color: #888; /* 设置滑块背景颜色 */
border-radius: 4px; /* 设置滑块圆角 */
}
/* 滚动条轨道hover状态样式 */
::-webkit-scrollbar-track:hover {
background-color: #f1f1f1; /* 设置轨道hover状态时的背景颜色 */
}
/* 滚动条滑块hover状态样式 */
::-webkit-scrollbar-thumb:hover {
background-color: #555; /* 设置滑块hover状态时的背景颜色 */
}
</style> </style>
\ No newline at end of file
src/main/webapp/WEB-INF/views/bxj/areaPlan.jsp
View file @ e8e13e6d
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<div class="flex-box"> <div class="flex-box">
<a href="${ctx}/bxj/jqone"> <a href="${ctx}/bxj/jqone">
<p class="tabName">一监区</p> <p class="tabName">一监区</p>
<p class="monitor">监控点<span style="background-color: #ff6363;">75</span></p> <p class="monitor">监控点<span style="background-color: #ff6363;">73</span></p>
</a> </a>
</div> </div>
</li> </li>
...@@ -152,12 +152,92 @@ ...@@ -152,12 +152,92 @@
</li> </li>
<li> <li>
<div class="flex-box"> <div class="flex-box">
<a href="${ctx}/bxj/nxyl">
<p class="tabName">南习艺楼</p>
<p class="monitor">监控点 <span style="background-color: #43e04e;">119</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/bxyl">
<p class="tabName">北习艺楼</p>
<p class="monitor">监控点 <span style="background-color: #43e04e;">119</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/kjt">
<p class="tabName">宽见厅</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/pjt">
<p class="tabName">普见厅</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/jb">
<p class="tabName">禁闭</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/yg">
<p class="tabName">严管</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/cc">
<p class="tabName">炊场</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/wss"> <a href="${ctx}/bxj/wss">
<p class="tabName">卫生所</p> <p class="tabName">卫生所</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p> <p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a> </a>
</div> </div>
</li> </li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/zfys">
<p class="tabName">罪犯浴室</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/edm">
<p class="tabName">二大门</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
<li>
<div class="flex-box">
<a href="${ctx}/bxj/ddt">
<p class="tabName">大地图</p>
<p class="monitor">监控点 <span style="background-color: #ff6363;">36</span></p>
</a>
</div>
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -170,7 +250,13 @@ ...@@ -170,7 +250,13 @@
</div> </div>
<script> <script>
$(function () {
$(".tab_list ul").niceScroll({
cursorcolor: '#b5b5b5',
cursorborder: 'none',
autohidemode: 'leave'
});
})
</script> </script>
</body> </body>
</html> </html>
......
src/main/webapp/WEB-INF/views/collect/index.jsp
View file @ e8e13e6d
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/bootstrap.min.css">
<script src="${ctx}/static/js/bootstrap.min.js"></script> <script src="${ctx}/static/js/bootstrap.min.js"></script>
<!-- Latest compiled and minified CSS --> <!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.css"> <link rel="stylesheet" href="${ctx}/static/css/bootstrap-table.min.css">
<!-- Latest compiled and minified JavaScript --> <!-- Latest compiled and minified JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/bootstrap-table.min.js"></script> <script src="${ctx}/static/js/bootstrap-table.min.js"></script>
<!-- Latest compiled and minified Locales --> <!-- Latest compiled and minified Locales -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.23.5/dist/locale/bootstrap-table-zh-CN.min.js"></script> <script src="${ctx}/static/js/bootstrap-table-zh-CN.min.js"></script>
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/css/iconfont.css" /> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/css/iconfont.css" />
<script src="${ctx}/static/js/kmedia-uni.js"></script> <script src="${ctx}/static/js/kmedia-uni.js"></script>
<script> <script>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
appearance: none; appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
padding: 0px 12px; padding: 0 12px;
background-color: #103AA5; background-color: #103AA5;
color: #ffffff; color: #ffffff;
font-size: 16px; font-size: 16px;
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
} }
.bootstrap-table .fixed-table-container .fixed-table-body { .bootstrap-table .fixed-table-container .fixed-table-body {
overflow: auto; overflow: auto;
height: 90%; height: 70%;
} }
.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{ .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{
background: transparent; background: transparent;
...@@ -88,6 +88,27 @@ ...@@ -88,6 +88,27 @@
.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{ .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{
background: #fff; background: #fff;
} }
/* 滚动条轨道样式 */
::-webkit-scrollbar {
width: 6px; /* 设置滚动条宽度 */
}
/* 滚动条滑块样式 */
::-webkit-scrollbar-thumb {
background-color: #888; /* 设置滑块背景颜色 */
border-radius: 3px; /* 设置滑块圆角 */
}
/* 滚动条轨道hover状态样式 */
::-webkit-scrollbar-track:hover {
background-color: #f1f1f1; /* 设置轨道hover状态时的背景颜色 */
}
/* 滚动条滑块hover状态样式 */
::-webkit-scrollbar-thumb:hover {
background-color: #555; /* 设置滑块hover状态时的背景颜色 */
}
</style> </style>
</head> </head>
<body style="background-color: transparent;"> <body style="background-color: transparent;">
...@@ -100,15 +121,15 @@ ...@@ -100,15 +121,15 @@
<li> <li>
监狱：<select name="prisonName"> 监狱：<select name="prisonName">
<option value="">所有</option> <option value="">所有</option>
<option value="沪-北">北新泾</option>
<option value="沪-未">未管所</option>
<option value="沪-五">五角场</option> <option value="沪-五">五角场</option>
<option value="沪-周">周浦</option> <option value="沪-周">周浦</option>
<option value="沪-南">南汇</option> <option value="沪-南">南汇</option>
<option value="沪-总">总医院</option> <option value="沪-总">总医院</option>
<option value="沪-新">新收犯</option> <option value="沪-新">新收犯</option>
<option value="沪-青">青浦</option> <option value="沪-青">青浦</option>
<option value="沪-北">北新泾</option>
<option value="沪-女">女子</option> <option value="沪-女">女子</option>
<option value="沪-未">未管所</option>
<option value="沪-宝">宝山</option> <option value="沪-宝">宝山</option>
</select> </select>
</li> </li>
...@@ -125,7 +146,7 @@ ...@@ -125,7 +146,7 @@
</div> </div>
<div class="videoBox"> <div class="videoBox">
<p id="cameraName" style="text-align: center"></p> <p id="cameraName" style="text-align: center"></p>
<div id="video" style="height: 450px"> <div id="video" style="height: 425px">
</div> </div>
</div> </div>
...@@ -133,6 +154,8 @@ ...@@ -133,6 +154,8 @@
<script> <script>
var firstLoad = true;
$(function () { $(function () {
loadList(); loadList();
...@@ -167,25 +190,26 @@ ...@@ -167,25 +190,26 @@
detailView: false, //是否显示父子表 detailView: false, //是否显示父子表
queryParamsType: 'limit', queryParamsType: 'limit',
columns: [ columns: [
{ /*{
field: 'prisonName', field: 'prisonName',
title: '监狱名称', title: '监狱名称',
align: 'center' align: 'center'
}, },*/
{ {
field: 'deviceName', field: 'deviceName',
title: '摄像头名称', title: '摄像头名称',
width: '350', width: '350',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return '<a onclick="showVideo(\'' + row.gbid + '\', \'' + row.deviceName + '\')">' + row.deviceName + '</a>'; let deviceName = row.deviceName ? row.deviceName : '未命名'
return '<a onclick="showVideo(\'' + row.gbid + '\', \'' + deviceName + '\')">' + deviceName + '</a>';
} }
}, },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return '<a onclick="removeCollect(\'' + row.deviceId + '\')">移除</a>'; return '<a title="删除收藏" onclick="removeCollect(\'' + row.deviceId + '\')">移除</a>';
} }
} }
], ],
...@@ -199,10 +223,13 @@ ...@@ -199,10 +223,13 @@
$('#collectTable').on('load-success.bs.table', function (e, data) { $('#collectTable').on('load-success.bs.table', function (e, data) {
// data.rows是加载成功后的数据集合数组 // data.rows是加载成功后的数据集合数组
var firstRow = data.rows[0]; if (firstLoad) {
if (firstRow) { var firstRow = data.rows[0];
$("#cameraName").html(firstRow.deviceName + '监控点情况'); if (firstRow) {
player.play(firstRow.gbid); $("#cameraName").html(firstRow.deviceName + '监控点情况');
player.play(firstRow.gbid);
firstLoad = false
}
} }
}); });
...@@ -239,7 +266,6 @@ ...@@ -239,7 +266,6 @@
play: function (gbId) { play: function (gbId) {
if (this.obj === null) { if (this.obj === null) {
this.init(); this.init();
return;
} }
let _this = this; let _this = this;
......
src/main/webapp/WEB-INF/views/hw/areaPlan.jsp
View file @ e8e13e6d
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<title>未管所</title> <title>未管所</title>
<script src="${ctx}/static/js/flexible.js"></script> <script src="${ctx}/static/js/flexible.js"></script>
<link rel="stylesheet" href="${ctx}/static/css/common.css"> <link rel="stylesheet" href="${ctx}/static/css/common.css">
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/leader.css" /> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/leader.css"/>
<style> <style>
.area-right{ .area-right {
background: url(${ctx}/static/images/plan_floor.png) no-repeat; background: url(${ctx}/static/images/plan_floor.png) no-repeat;
height: 23rem; height: 23rem;
float: right; float: right;
...@@ -17,9 +17,44 @@ ...@@ -17,9 +17,44 @@
width: 78%; width: 78%;
background-size: 100% 100%; background-size: 100% 100%;
} }
.area-box img{
.area-box img {
max-width: 70%; max-width: 70%;
} }
.area-right ul .caochang {
left: 8rem;
top: 7rem;
}
.icon_text {
width: 100px;
height: 30px;
background-image: url('${ctx}/static/images/dalou/icon_text.png');
background-size: contain;
}
.icon_text a {
display: block;
width: 100%;
height: 100%;
text-decoration: none;
font-size: 18px;
color: #fff;
line-height: 30px;
padding-left: 37px;
}
.left-menu ul li:first-child{
margin-top: 0;
}
.left-menu ul{
max-height: 75%;
overflow: hidden;
padding-right: 8px;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -126,7 +161,29 @@ ...@@ -126,7 +161,29 @@
</div> </div>
<div class="menu-num"> <div class="menu-num">
<span>监控点</span> <span>监控点</span>
<span style="background-color: #43e04e;">14</span> <span style="background-color: #2f8fff;">14</span>
</div>
</a>
</li>
<li>
<a href="${ctx}/hw/chuichang">
<div class="menu-mc">
<span>炊场</span>
</div>
<div class="menu-num">
<span>监控点</span>
<span style="background-color: #ff6363;">14</span>
</div>
</a>
</li>
<li>
<a href="${ctx}/hw/caochang">
<div class="menu-mc">
<span>操场</span>
</div>
<div class="menu-num">
<span>监控点</span>
<span style="background-color: #ffba00;">14</span>
</div> </div>
</a> </a>
</li> </li>
...@@ -137,7 +194,7 @@ ...@@ -137,7 +194,7 @@
</div> </div>
<div class="menu-num"> <div class="menu-num">
<span>监控点</span> <span>监控点</span>
<span style="background-color: #43e04e;">87</span> <span style="background-color: #43e04e;">56</span>
</div> </div>
</a> </a>
</li> </li>
...@@ -148,37 +205,44 @@ ...@@ -148,37 +205,44 @@
<div class="area-box"> <div class="area-box">
<ul> <ul>
<li class="xzqy_floor"> <li class="xzqy_floor">
<a href="javascript:;"> <img src="${ctx}/static/images/xzqy.png"/></a> <a href="javascript:;"> <img src="${ctx}/static/images/xzqy.png"/></a>
</li> </li>
<li class="jyl_floor"> <li class="jyl_floor">
<a href="${ctx}/hw/jyl"> <img src="${ctx}/static/images/jyl.png"/></a> <a href="${ctx}/hw/jyl"> <img src="${ctx}/static/images/jyl.png"/></a>
</li> </li>
<li class="cuican_floor"> <li class="cuican_floor">
<a href="${ctx}/hw/jcqy/炊场"> <img src="${ctx}/static/images/cuican.png"/></a> <a href="${ctx}/hw/chuichang"> <img src="${ctx}/static/images/cuican.png"/></a>
</li> </li>
<li class="litan_floor"> <li class="litan_floor">
<a href="${ctx}/hw/lt"> <img src="${ctx}/static/images/lidan.png"/></a> <a href="${ctx}/hw/lt"> <img src="${ctx}/static/images/lidan.png"/></a>
</li> </li>
<li class="wss_floor"> <li class="wss_floor">
<a href="${ctx}/hw/wss"> <img src="${ctx}/static/images/wss.png"/></a> <a href="${ctx}/hw/wss"> <img src="${ctx}/static/images/wss.png"/></a>
</li> </li>
<li class="nanjian_floor"> <li class="nanjian_floor">
<a href="${ctx}/hw/nj"> <img src="${ctx}/static/images/lanjian.png"/></a> <a href="${ctx}/hw/nj"> <img src="${ctx}/static/images/lanjian.png"/></a>
</li> </li>
<li class="beijianyu_floor" style="z-index: 1;"> <li class="beijianyu_floor" style="z-index: 1;">
<a href="${ctx}/hw/bj"> <img src="${ctx}/static/images/beijianyu.png"/></a> <a href="${ctx}/hw/bj"> <img src="${ctx}/static/images/beijianyu.png"/></a>
</li> </li>
<li class="beijian_floor"> <li class="beijian_floor">
<a href="${ctx}/hw/bcj"> <img src="${ctx}/static/images/beiche.png"/></a> <a href="${ctx}/hw/bcj"> <img src="${ctx}/static/images/beiche.png"/></a>
</li> </li>
<li class="nanchejian_floor"> <li class="nanchejian_floor">
<a href="${ctx}/hw/ncj"> <img src="${ctx}/static/images/lanche.png"/></a> <a href="${ctx}/hw/ncj"> <img src="${ctx}/static/images/lanche.png"/></a>
</li> </li>
<li class="lhjl_floor"> <li class="lhjl_floor">
<a href="${ctx}/hw/lhjl"> <img src="${ctx}/static/images/lhjl.png"/></a> <a href="${ctx}/hw/lhjl"> <img src="${ctx}/static/images/lhjl.png"/></a>
</li> </li>
<li class="xkzx_floor"> <li class="xkzx_floor">
<a href="${ctx}/hw/xkl"> <img src="${ctx}/static/images/xkzx.png"/></a> <a href="${ctx}/hw/xkl"> <img src="${ctx}/static/images/xkzx.png"/></a>
</li>
<li class="caochang">
<div class="icon_text">
<a href="${ctx}/hw/caochang">
操场
</a>
</div>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -186,5 +250,16 @@ ...@@ -186,5 +250,16 @@
</div> </div>
</div> </div>
</div> </div>
<script>
$(function () {
$(".left-menu ul").niceScroll({
cursorcolor: '#b5b5b5',
cursorborder: 'none',
autohidemode: 'leave'
});
})
</script>
</body> </body>
</html> </html>
src/main/webapp/WEB-INF/views/hw/hw_caochang.jsp 0 → 100644
View file @ e8e13e6d
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="../base.jsp"%>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>操场</title>
</head>
<body>
<div class="content">
<div class="header"></div>
<div class=" padding_box2 clearfix">
<div class="menu_box">
<div class="menu_title_box"><a class="menu_name" href="${ctx}/hw">操场</a></div>
<div class="tab_list">
<ul>
<li class="current">
<a class="flex-box">
<p class="tabName">操场</p>
<p class="monitor monitor2">监控点<span>2</span></p>
</a>
</li>
</ul>
</div>
</div>
<div class="content_box">
<div class="room_box">
</div>
</div>
</div>
</div>
<script type="text/javascript">
let dataList = {
'arr1': [
{
top: '0.25rem',
left: '0.25rem',
gbid: '31011700001320001133'
}, {
top: '7.4rem',
left: '11.1rem',
gbid: '31011700001320001134'
}
]
}
$(function () {
new DeviceRender(dataList, '/static/images/caochang.jpg', false).init();
});
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/views/hw/hw_chuichang.jsp 0 → 100644
View file @ e8e13e6d
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="../base.jsp"%>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>炊场</title>
</head>
<body>
<div class="content">
<div class="header"></div>
<div class=" padding_box2 clearfix">
<div class="menu_box">
<div class="menu_title_box"><a class="menu_name" href="${ctx}/hw">炊场</a></div>
<div class="tab_list">
<ul>
<li class="current">
<a class="flex-box">
<p class="tabName">炊场</p>
<p class="monitor monitor2">监控点<span>29</span></p>
</a>
</li>
</ul>
</div>
</div>
<div class="content_box">
<div class="room_box">
</div>
</div>
</div>
</div>
<script type="text/javascript">
let dataList = {
'arr1': [
{
top: '0.33rem',
left: '0.33rem',
gbid: '31011700001320000799'
}, {
top: '0.33rem',
left: '1.99rem',
gbid: '31011700001320000801'
}, {
top: '0.33rem',
left: '3.44rem',
gbid: '31011700001320000802'
}, {
top: '0.33rem',
left: '4.85rem',
gbid: '31011700001320000804'
}, {
top: '0.33rem',
left: '6.14rem',
gbid: '31011700001320000805'
}, {
top: '0.33rem',
left: '6.55rem',
gbid: '31011700001320001313'
}, {
top: '0.33rem',
left: '8.4rem',
gbid: '31011700001320001309'
}, {
top: '0.33rem',
left: '9.68rem',
gbid: '31011700001320001310'
}, {
top: '0.33rem',
left: '10.05rem',
gbid: '31011700001320001314'
}, {
top: '1.84rem',
left: '4.45rem',
gbid: '31011700001320000803'
}, {
top: '1.84rem',
left: '6.18rem',
gbid: '31011700001320001316'
}, {
top: '1.84rem',
left: '9.68rem',
gbid: '31011700001320001311'
}, {
top: '1.84rem',
left: '11.4rem',
gbid: '31011700001320001315'
}, {
top: '2.95rem',
left: '0.33rem',
gbid: '31011700001320001319'
}, {
top: '4.85rem',
left: '1.72rem',
gbid: '31011700001320001320'
}, {
top: '3.9rem',
left: '2.39rem',
gbid: '31011700001320001317'
}, {
top: '3.9rem',
left: '6.55rem',
gbid: '31011700001320001307'
}, {
top: '3.9rem',
left: '11.2rem',
gbid: '31011700001320001305'
}, {
top: '6rem',
left: '4.27rem',
gbid: '31011700001320000797'
}, {
top: '6rem',
left: '5.8rem',
gbid: '31011700001320000793'
}, {
top: '6rem',
left: '11.4rem',
gbid: '31011700001320000795'
}, {
top: '7.48rem',
left: '0.33rem',
gbid: '31011700001320001304'
}, {
top: '7.48rem',
left: '1.75rem',
gbid: '31011700001320001308'
}, {
top: '7.48rem',
left: '3.34rem',
gbid: '31011700001320000798'
}, {
top: '7.48rem',
left: '4.65rem',
gbid: '31011700001320000794'
}, {
top: '7.48rem',
left: '6.2rem',
gbid: '31011700001320001312'
}, {
top: '7.48rem',
left: '7.2rem',
gbid: '31011700001320001306'
}, {
top: '7.48rem',
left: '8.7rem',
gbid: '31011700001320000792'
}, {
top: '7.48rem',
left: '10.35rem',
gbid: '31011700001320000796'
}
]
}
$(function () {
new DeviceRender(dataList, '/static/images/chuichang.jpg', false).init();
});
</script>
</body>
</html>
\ No newline at end of file
src/main/webapp/WEB-INF/views/hw/hw_jcqy.jsp
View file @ e8e13e6d
...@@ -40,18 +40,6 @@ ...@@ -40,18 +40,6 @@
</li> </li>
<li> <li>
<a class="flex-box"> <a class="flex-box">
<p class="tabName">操场</p>
<p class="monitor monitor2">监控点<span>2</span></p>
</a>
</li>
<li>
<a class="flex-box">
<p class="tabName">炊场</p>
<p class="monitor monitor2">监控点<span>29</span></p>
</a>
</li>
<li>
<a class="flex-box">
<p class="tabName">车间</p> <p class="tabName">车间</p>
<p class="monitor monitor2">监控点<span>9</span></p> <p class="monitor monitor2">监控点<span>9</span></p>
</a> </a>
...@@ -273,136 +261,6 @@ ...@@ -273,136 +261,6 @@
], ],
'arr5': [ 'arr5': [
{ {
top: '0.25rem',
left: '0.25rem',
gbid: '31011700001320001133'
}, {
top: '7.4rem',
left: '11.1rem',
gbid: '31011700001320001134'
}
],
'arr6': [
{
top: '0.33rem',
left: '0.33rem',
gbid: '31011700001320000799'
}, {
top: '0.33rem',
left: '1.99rem',
gbid: '31011700001320000801'
}, {
top: '0.33rem',
left: '3.44rem',
gbid: '31011700001320000802'
}, {
top: '0.33rem',
left: '4.85rem',
gbid: '31011700001320000804'
}, {
top: '0.33rem',
left: '6.14rem',
gbid: '31011700001320000805'
}, {
top: '0.33rem',
left: '6.55rem',
gbid: '31011700001320001313'
}, {
top: '0.33rem',
left: '8.4rem',
gbid: '31011700001320001309'
}, {
top: '0.33rem',
left: '9.68rem',
gbid: '31011700001320001310'
}, {
top: '0.33rem',
left: '10.05rem',
gbid: '31011700001320001314'
}, {
top: '1.84rem',
left: '4.45rem',
gbid: '31011700001320000803'
}, {
top: '1.84rem',
left: '6.18rem',
gbid: '31011700001320001316'
}, {
top: '1.84rem',
left: '9.68rem',
gbid: '31011700001320001311'
}, {
top: '1.84rem',
left: '11.4rem',
gbid: '31011700001320001315'
}, {
top: '2.95rem',
left: '0.33rem',
gbid: '31011700001320001319'
}, {
top: '4.85rem',
left: '1.72rem',
gbid: '31011700001320001320'
}, {
top: '3.9rem',
left: '2.39rem',
gbid: '31011700001320001317'
}, {
top: '3.9rem',
left: '6.55rem',
gbid: '31011700001320001307'
}, {
top: '3.9rem',
left: '11.2rem',
gbid: '31011700001320001305'
}, {
top: '6rem',
left: '4.27rem',
gbid: '31011700001320000797'
}, {
top: '6rem',
left: '5.8rem',
gbid: '31011700001320000793'
}, {
top: '6rem',
left: '11.4rem',
gbid: '31011700001320000795'
}, {
top: '7.48rem',
left: '0.33rem',
gbid: '31011700001320001304'
}, {
top: '7.48rem',
left: '1.75rem',
gbid: '31011700001320001308'
}, {
top: '7.48rem',
left: '3.34rem',
gbid: '31011700001320000798'
}, {
top: '7.48rem',
left: '4.65rem',
gbid: '31011700001320000794'
}, {
top: '7.48rem',
left: '6.2rem',
gbid: '31011700001320001312'
}, {
top: '7.48rem',
left: '7.2rem',
gbid: '31011700001320001306'
}, {
top: '7.48rem',
left: '8.7rem',
gbid: '31011700001320000792'
}, {
top: '7.48rem',
left: '10.35rem',
gbid: '31011700001320000796'
}
],
'arr7': [
{
top: '1.53rem', top: '1.53rem',
left: '2.12rem', left: '2.12rem',
gbid: '31011700001320000791' gbid: '31011700001320000791'
...@@ -448,7 +306,6 @@ ...@@ -448,7 +306,6 @@
$("p:contains(" + model + ")").parents('li').trigger('click'); $("p:contains(" + model + ")").parents('li').trigger('click');
// new PersonRender('', '').init();
}); });
</script> </script>
</body> </body>
......
src/main/webapp/static/css/bootstrap-table.min.css 0 → 100644
View file @ e8e13e6d
This diff is collapsed.
src/main/webapp/static/css/workshop.css
View file @ e8e13e6d
...@@ -26,8 +26,12 @@ a.menu_name{ ...@@ -26,8 +26,12 @@ a.menu_name{
} }
.tab_list ul { .tab_list ul {
margin-top: 0.2rem;
display: block; display: block;
width: 100%; width: 100%;
max-height: 750px;
overflow: hidden;
padding-right: 8px;
} }
.tab_list ul li { .tab_list ul li {
...@@ -39,6 +43,9 @@ a.menu_name{ ...@@ -39,6 +43,9 @@ a.menu_name{
border-radius: 0.2rem; border-radius: 0.2rem;
line-height: 0.6rem; line-height: 0.6rem;
} }
.tab_list ul li:first-child{
margin: 0;
}
.tab_list ul li div { .tab_list ul li div {
font-size: 0.24rem; font-size: 0.24rem;
......
src/main/webapp/static/js/bootstrap-table-zh-CN.min.js 0 → 100644
View file @ e8e13e6d
This diff is collapsed.
src/main/webapp/static/js/bootstrap-table.min.js 0 → 100644
View file @ e8e13e6d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/js/jquery.nicescroll.min.js 0 → 100644
View file @ e8e13e6d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment