From d7b1c94688aed6c5757c0b9b33e45e9120b3501c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 26 二月 2022 13:49:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/issue/issue.html | 149 +++++++++-
src/main/webapp/static/js/hostTable.js | 2
src/main/webapp/views/issue/issue_detl.html | 471 ++++++++++++++++++++++++++++++++++++
src/main/webapp/static/js/common.js | 2
src/main/webapp/static/js/issue/issue.js | 129 +++------
src/main/java/com/zy/sc/manager/entity/Issue.java | 2
6 files changed, 642 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/zy/sc/manager/entity/Issue.java b/src/main/java/com/zy/sc/manager/entity/Issue.java
index 555bd01..8f6f0cb 100644
--- a/src/main/java/com/zy/sc/manager/entity/Issue.java
+++ b/src/main/java/com/zy/sc/manager/entity/Issue.java
@@ -249,7 +249,7 @@
if (Cools.isEmpty(this.startTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime).substring(0, 10);
}
public String getEndTime$(){
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 27f2713..bbf9d94 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -231,7 +231,7 @@
var popupRight;
-var sensorByDetl;
+var issueByDetl;
var sensorByMap;
diff --git a/src/main/webapp/static/js/hostTable.js b/src/main/webapp/static/js/hostTable.js
index 0236566..304d6c1 100644
--- a/src/main/webapp/static/js/hostTable.js
+++ b/src/main/webapp/static/js/hostTable.js
@@ -122,7 +122,7 @@
/* 鍒犻櫎 */
function doDel(obj) {
- layer.confirm('纭畾瑕佸垹闄ゆ鍗曟嵁绫诲瀷鍚楋紵', {
+ layer.confirm('纭畾瑕佸垹闄ゆ椤圭洰鍚楋紵', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
diff --git a/src/main/webapp/static/js/issue/issue.js b/src/main/webapp/static/js/issue/issue.js
index dd7b367..63a2c34 100644
--- a/src/main/webapp/static/js/issue/issue.js
+++ b/src/main/webapp/static/js/issue/issue.js
@@ -1,48 +1,56 @@
var pageCurr;
+var tableData;
+var insTb2;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
+}).extend({
+ dropdown: 'dropdown/dropdown',
+ notice: 'notice/notice',
+}).use(['table','laydate', 'form', 'util', 'admin', 'dropdown', 'notice', 'treeTable', 'xmSelect'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
var admin = layui.admin;
+ var util = layui.util;
+ var notice = layui.notice;
+ var treeTable = layui.treeTable;
+ var xmSelect = layui.xmSelect;
// 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#issue',
+ insTb2 = table.render({
+ elem: '#issueTable',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/issue/list/auth',
page: true,
- limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#issueToolbar',
+ height: 'full-100',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '鏁呴殰缂栧彿'}
- ,{field: 'hostId$', align: 'center',title: '鎵�灞為」鐩�'}
- ,{field: 'issueType$', align: 'center',title: '鏁呴殰绫诲瀷'}
+ ,{field: 'hostId$', align: 'center',title: '鎵�灞為」鐩�', templet: '#hostTpl', width: 130}
+ ,{field: 'uuid', align: 'center',title: '鏁呴殰缂栧彿', width: 180}
+ ,{field: 'issueType$', align: 'center',title: '鏁呴殰绫诲瀷', templet: '#issueTypeTpl', width: 110}
,{field: 'title', align: 'center',title: '闂姒傝堪'}
- ,{field: 'reason', align: 'center',title: '鏁呴殰鍘熷洜'}
- ,{field: 'deal', align: 'center',title: '瑙ｅ喅鍔炴硶'}
- ,{field: 'files', align: 'center',title: '鏂囦欢鍒楄〃'}
- ,{field: 'img', align: 'center',title: '鍥剧墖'}
- ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃ユ湡'}
- ,{field: 'endTime$', align: 'center',title: '澶勭悊鏃ユ湡'}
- ,{field: 'lastTime$', align: 'center',title: '鏇存柊鏃ユ湡'}
- ,{field: 'discoverer', align: 'center',title: '鍙戠幇浜�'}
- ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
- ,{field: 'dealer', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'settle$', align: 'center',title: '娴佺▼'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'reason', align: 'center',title: '鏁呴殰鍘熷洜', hide: true}
+ ,{field: 'deal', align: 'center',title: '瑙ｅ喅鍔炴硶', hide: true}
+ ,{field: 'files', align: 'center',title: '鏂囦欢鍒楄〃', hide: true}
+ ,{field: 'img', align: 'center',title: '鍥剧墖', hide: true}
+ ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃ユ湡', width: 120}
+ ,{field: 'endTime$', align: 'center',title: '澶勭悊鏃ユ湡', hide: true}
+ ,{field: 'lastTime$', align: 'center',title: '鏇存柊鏃ユ湡', hide: true}
+ ,{field: 'discoverer', align: 'center',title: '鍙戠幇浜�', hide: true}
+ ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
+ ,{field: 'dealer', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'settle$', align: 'center',title: '娴佺▼', templet: '#settleTpl', width: 110}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -66,32 +74,15 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
- limit();
+ // limit();
}
});
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(issue)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {curr: 1}
- });
- });
-
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(issue)', function (obj) {
+ table.on('toolbar(issueTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
+ case 'del':
if (checkStatus.length === 0) {
layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
return;
@@ -101,49 +92,11 @@
});
del(ids);
break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'issue': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/issue/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
}
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(issue)', function(obj){
+ table.on('tool(issueTable)', function(obj){
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -211,7 +164,7 @@
layer.close(loadIndex);
if (res.code === 200){
layer.msg(res.msg, {icon: 1});
- tableReload();
+ $(".layui-laypage-btn")[0].click();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/views/issue/issue.html b/src/main/webapp/views/issue/issue.html
index 9281275..f6c1675 100644
--- a/src/main/webapp/views/issue/issue.html
+++ b/src/main/webapp/views/issue/issue.html
@@ -9,45 +9,132 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <link rel="stylesheet" href="../../static/css/originTable.css" media="all">
+ <style>
+ body {
+ color: #595959;
+ background-color: #f5f7f9;
+ }
+
+ .admin-form {
+ padding: 25px 30px 0 0 !important;
+ margin: 0 !important;
+ }
+
+ /*!* 鏉冮檺鎺у埗 *!*/
+ /*#btn-add {*/
+ /* display: none;*/
+ /*}*/
+ /*#btn-delete {*/
+ /* display: none;*/
+ /*}*/
+ /*.btn-edit {*/
+ /* display: none;*/
+ /*}*/
+ /*.btn-more {*/
+ /* display: none;*/
+ /*}*/
+ </style>
</head>
<body>
-
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+<!-- 姝ｆ枃寮�濮� -->
+<div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-row layui-col-space15">
+ <!-- 宸� -->
+ <div class="layui-col-md3" id="left-table">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline" style="max-width: 140px;">
+ <input name="name" class="layui-input" placeholder="杈撳叆椤圭洰鍚嶇О"/>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </form>
+ <table id="originTable" lay-filter="originTable"></table>
+ </div>
+ </div>
+ </div>
+ <!-- 鍙� -->
+ <div class="layui-col-md9">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁呴殰缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input name="uuid" class="layui-input" placeholder="鏁呴殰缂栧彿"/>
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ </div>
+ </div>
+ </form>
+ <table id="issueTable" lay-filter="issueTable"></table>
+ </div>
+ </div>
</div>
</div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
</div>
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="issue" lay-filter="issue"></table>
-</div>
-<script type="text/html" id="toolbar">
+<!-- 澶村伐鍏锋爮 -->
+<script type="text/html" id="issueToolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon"></i>鍒犻櫎</button>
</div>
</script>
+<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="detl" ew-event="popupRight"
+ data-type="1" data-window="top" data-area="1250px" data-url="issue/issue_detl.html">
+ <i class="layui-icon"></i>鏌ョ湅</a>
+ <a class="layui-btn layui-btn-xs layui-btn-primary btn-edit" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>淇敼</a>
+</script>
+
+<!-- 琛屾牱寮� -->
+<script type="text/html" id="hostTpl">
+ <span name="hostId$" class="layui-badge layui-badge-gray">{{d.hostId$}}</span>
+</script>
+<script type="text/html" id="issueTypeTpl">
+ <span name="issueType$" class="layui-badge layui-badge-gray">{{d.issueType$}}</span>
+</script>
+<script type="text/html" id="settleTpl">
+ <span name="settle"
+ {{# if( d.settle === 1){ }}
+ class="layui-badge layui-badge-blue"
+ {{# }else if(d.settle === 2){ }}
+ class="layui-badge layui-badge-blue"
+ {{# }else if(d.settle === 3){ }}
+ class="layui-badge layui-badge-blue"
+ {{# }else if(d.settle === 4){ }}
+ class="layui-badge layui-badge-green"
+ {{# }else if(d.settle === 5){ }}
+ class="layui-badge layui-badge-red"
+ {{# }else if(d.settle === 6){ }}
+ class="layui-badge layui-badge-gray"
+ {{# } }}
+ >{{d.settle$}}</span>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/hostTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/issue/issue.js" charset="utf-8"></script>
</body>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -228,5 +315,23 @@
</div>
</form>
</script>
+
+<!-- 椤圭洰缂栬緫绐楀彛 -->
+<script type="text/html" id="hostEditDialog">
+ <form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О:</label>
+ <div class="layui-input-block">
+ <input name="name" placeholder="璇疯緭鍏ラ」鐩悕绉�" class="layui-input"
+ lay-verType="tips" lay-verify="required" required/>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="hostEditSubmit" lay-submit>淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
</html>
diff --git a/src/main/webapp/views/issue/issue_detl.html b/src/main/webapp/views/issue/issue_detl.html
new file mode 100644
index 0000000..34e3d7f
--- /dev/null
+++ b/src/main/webapp/views/issue/issue_detl.html
@@ -0,0 +1,471 @@
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+<link rel="stylesheet" href="../static/css/jquery.upload.css" media="all"/>
+<style>
+ #formAdvForm {
+ background-color: #f3f3f3;
+ }
+ #formAdvForm .layui-form-item {
+ margin-top: 20px;
+ margin-bottom: 0;
+ }
+
+ #formAdvForm .layui-form-item .layui-inline {
+ margin-bottom: 25px;
+ margin-right: 0;
+ }
+
+ .form-group-bottom {
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 10px 20px;
+ background-color: #fff;
+ box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, .05);
+ }
+ .cool-divider {
+ float: left;
+ margin: 4px 18px;
+ display: inline-block;
+ height: 32px;
+ width: 1px;
+ vertical-align: middle;
+ position: relative;
+ top: -.06em;
+ box-sizing: border-box;
+ -webkit-tap-highlight-color: transparent;
+ margin-top: 5px !important;
+ margin-bottom: 5px !important;
+ background: #c8d1dabd;
+ }
+ .sensor-label {
+ display: inline-block;
+ float: left;
+ font-size: 16px;
+ font-weight: bolder;
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ border-radius: .25em;
+ }
+ .online-info {
+ display: inline-block;
+ float: left;
+ font-weight: bold;
+ text-shadow: 0 1px 0 rgb(0 0 0 / 20%);
+ padding: .3em .6em;
+ font-size: 85%;
+ height: 30px;
+ line-height: 30px;
+ color: #fff;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: baseline;
+ border-radius: .25em;
+ }
+ .online-success {
+ background-color: #5cb85c;
+ }
+ .online-fail {
+ background-color: #d9534f;
+ }
+</style>
+<!-- 姝ｆ枃寮�濮� -->
+<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm">
+ <div class="layui-fluid" style="padding-bottom: 75px;">
+ <!-- 瀹氫綅 -->
+<!-- <div class="layui-card">-->
+<!-- <div class="layui-card-header">瀹氫綅</div>-->
+<!-- <div class="layui-card-body">-->
+<!-- <div class="upload-box clear">-->
+<!-- <div id="map" style="width: 100%; height: 200px"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+ <!-- 鍥剧墖 -->
+ <div class="layui-card">
+ <div class="layui-card-header">鍥剧墖</div>
+ <div class="layui-card-body">
+ <div class="upload-box clear">
+ <div class="image-box"></div>
+ </div>
+ </div>
+ </div>
+ <!-- 鍩烘湰淇℃伅 -->
+ <div class="layui-card">
+ <div class="layui-card-header">鍩烘湰淇℃伅</div>
+ <div class="layui-card-body">
+
+ <div class="layui-form-item layui-row">
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">璁惧缂栧彿:</label>
+ <div class="layui-input-block">
+ <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鎵�灞為」鐩�:</label>
+ <div class="layui-input-block">
+ <input name="hostId$" placeholder="璇疯緭鍏ユ墍灞為」鐩�" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">ccid:</label>
+ <div class="layui-input-block">
+ <input name="sim" placeholder="璇疯緭鍏im鍗″彿" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">绯荤粺鐘舵��:</label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="1">鍚敤</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">娣诲姞鏃堕棿:</label>
+ <div class="layui-input-block">
+ <input id="formAdvDateSel1" name="createTime$" placeholder="璇烽�夋嫨鏃ユ湡"
+ class="layui-input icon-date" autocomplete="off"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label ">娣诲姞浜哄憳:</label>
+ <div class="layui-input-block">
+ <input name="createBy$" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md12">
+ <label class="layui-form-label ">鍦扮悊浣嶇疆:</label>
+ <div class="layui-input-block">
+ <input name="locationMore" placeholder="鏈煡" class="layui-input" disabled/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md12">
+ <label class="layui-form-label ">鍏蜂綋鎻忚堪:</label>
+ <div class="layui-input-block">
+ <input name="desc" placeholder="鏆傛棤" class="layui-input"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <!-- 璁惧鍙傛暟 -->
+ <div class="layui-card">
+ <div class="layui-card-header">璁惧鍙傛暟</div>
+ <div class="layui-card-body">
+
+ <div class="layui-form-item layui-row">
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">涓婚-topic:</label>
+ <div class="layui-input-block">
+ <input name="topic" placeholder="璇疯緭鍏ヤ富棰�" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍦板潃-ip:</label>
+ <div class="layui-input-block">
+ <input name="ip" placeholder="璇疯緭鍏p鍦板潃" class="layui-input"/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">绔彛-port:</label>
+ <div class="layui-input-block">
+ <input type="number" name="port" placeholder="璇疯緭鍏ョ鍙�" class="layui-input"
+ lay-verType="tips" lay-verify="number" required/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">淇″彿鍊�:</label>
+ <div class="layui-input-block">
+ <input type="number" name="signal" placeholder="璇疯緭鍏ヤ俊鍙峰��" class="layui-input"
+ lay-verType="tips" lay-verify="number" required/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鐢垫睜鐢甸噺:</label>
+ <div class="layui-input-block">
+ <input type="number" name="battery" placeholder="璇疯緭鍏ョ數閲�" class="layui-input"
+ lay-verType="tips" lay-verify="number" required/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鐜娓╁害-鈩�:</label>
+ <div class="layui-input-block">
+ <input type="number" name="tempe" placeholder="璇疯緭鍏ユ俯搴�" class="layui-input"
+ lay-verType="tips" lay-verify="number" required/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍏呯數鐘舵��:</label>
+ <div class="layui-input-block">
+ <select name="charge">
+ <option value="1">鍏呯數涓�</option>
+ <option value="0">涓嶅湪鍏呯數</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍊炬枩瑙掑害-掳:</label>
+ <div class="layui-input-block">
+ <input type="number" name="tiltZ" placeholder="鍊炬枩瑙掑害" class="layui-input"
+ lay-verType="tips" lay-verify="number" required/>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鐮存崯鐘舵��:</label>
+ <div class="layui-input-block">
+ <select name="worn">
+ <option value="1">宸茬牬鎹�</option>
+ <option value="0">鏈牬鎹�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">姘翠綅鎯呭喌:</label>
+ <div class="layui-input-block">
+ <select name="overflow">
+ <option value="0">姘翠綅姝ｅ父</option>
+ <option value="1">姘翠綅瓒呮爣</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍏変紡鍔熻兘:</label>
+ <div class="layui-input-block">
+ <select name="agc">
+ <option value="1">鏈�</option>
+ <option value="0">娌℃湁</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">褰㈢姸:</label>
+ <div class="layui-input-block">
+ <select name="shape">
+ <option value="1">鍦嗗舰</option>
+ <option value="2">闀挎柟褰�</option>
+ <option value="3">姝ｆ柟褰�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">灏哄:</label>
+ <div class="layui-input-block">
+ <input type="number" name="size" placeholder="璇疯緭鍏ュ昂瀵�" class="layui-input"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- 鎶ユ枃鏃ュ織 -->
+ <div class="layui-card">
+ <div class="layui-card-header">鎶ユ枃鏃ュ織</div>
+ <div class="layui-card-body">
+ <table id="sensorLogTable" lay-filter="sensorLogTable"></table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group-bottom text-right">
+ <div>
+ <span class="online-info">鍦ㄧ嚎锛屽彲浠ヨ繘琛岃繙绋嬫搷浣�</span>
+ <div class="cool-divider"></div>
+ <span class="sensor-label"></span>
+ </div>
+ <button class="layui-btn" lay-filter="refresh" lay-submit><i class="layui-icon"></i> 鍒锋柊 </button>
+ </div>
+
+</form>
+<!--<script type="text/javascript" src="../static/js/tools/jquery.upload.min.js" charset="utf-8"></script>-->
+<script type="text/javascript" src="../static/js/upload/jquery.upload.js" charset="utf-8"></script>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=24c671d7d8365d7eaff888498538452f"></script>
+<script>
+ var map;
+ var issueId = top.issueByDetl;
+ layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+ }).extend({
+ notice: 'notice/notice',
+ }).use(['form', 'table', 'laydate', 'notice'], function () {
+ var $ = layui.jquery;
+ var form = layui.form;
+ var table = layui.table;
+ var laydate = layui.laydate;
+ var notice = layui.notice;
+
+ form.render('select');
+
+ init();
+ function init(){
+ notice.msg('姝ｅ湪杞藉叆鏁版嵁......', {icon: 4, position: "topRight"});
+ $.ajax({
+ url: baseUrl + "/issue/" + issueId + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ notice.destroy();
+ if (res.code === 200) {
+ var issue = res.data;
+ top.sensorByDetl = null;
+ // 鍦板浘
+ // map = new AMap.Map('map', {
+ // resizeEnable: true,
+ // zoom: 13,
+ // center: [sensor.lon, sensor.lat]
+ // });
+ // marker = new AMap.Marker({
+ // icon: "https://dz-admin.oss-cn-hangzhou.aliyuncs.com/other/marker.png",
+ // position:[sensor.lon, sensor.lat]
+ // });
+ // marker.setMap(map);
+ // 璁惧鍞竴鐮�
+ $('.sensor-label').text(issue.uuid);
+ // 璁惧鏄庣粏
+ form.val('formAdvForm', issue);
+ // 鏃ュ織琛ㄦ牸
+ initLogTable(issue.id);
+ // 鍥剧墖
+ initImgs(sensor.id, issue.imgArr);
+ // 鍦ㄧ嚎鎯呭喌
+ $('.online-info').attr("class", sensor.online?"online-info online-success":"online-info online-fail");
+ $('.online-info').text(sensor.online?"鍦ㄧ嚎锛屽彲浠ヨ繘琛岃繙绋嬫搷浣�":"绂荤嚎锛屼笉鑳借繘琛岃繙绋嬫搷浣�");
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+
+ /* 娓叉煋琛ㄦ牸 */
+ var LogTb;
+ function initLogTable(sensorId){
+ if (sensorId == null) {
+ return false;
+ }
+ if (typeof LogTb === "undefined") {
+ LogTb = table.render({
+ elem: '#sensorLogTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/sensorLog/list/auth',
+ where: {sensor_id: sensorId},
+ page: true,
+ limit: 10,
+ limits: [10, 30, 50, 100, 200, 500],
+ cols: [[
+ {type: 'numbers', title: '#'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'hostId$', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
+ // ,{field: 'sensorId$', align: 'center',title: '璁惧缂栧彿'}
+ // ,{field: 'senserType$', align: 'center',title: '璁惧绫诲瀷'}
+ ,{field: 'data', align: 'center',title: '鎶ユ枃'}
+ ,{field: 'createTime$', align: 'center',title: '鏃堕棿', minWidth: 200, width: 200}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ $('#sensorLogTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick', function(){
+ var id = JSON.stringify($('#sensorLogTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover").data('index'));
+ layer.open({
+ type: 1,
+ shade: false,
+ area: '500px',
+ title: false,
+ content: "<div style='color: #ffffff;font-size: 18px;overflow: hidden;" +
+ "background-color: #5FB878;padding: 15px 10px;word-break:break-all;'>" + res.data[id].data + "</div>"
+ });
+ })
+ }
+ });
+ } else {
+ LogTb.reload();
+ }
+ }
+
+ /* 娓叉煋鍥剧墖 */
+ function initImgs(sensorId, imgArr) {
+ if (imgArr == null) {
+ imgArr = [];
+ }
+ // https://gitee.com/gouguoyin/ajax-image-upload?_from=gitee_search#http://www.gouguoyin.cn/ajax-image-upload
+ $(".image-box").ajaxImageUpload({
+ fileInput : 'file',
+ postUrl : baseUrl + '/sensor/upload.action', //涓婁紶鐨勬湇鍔″櫒鍦板潃
+ width : 180,
+ height : 180,
+ imageUrl: imgArr,
+ postData : { sensorId: sensorId },
+ maxNum: 5, //鍏佽涓婁紶鍥剧墖鏁伴噺
+ allowZoom : true, //鍏佽鏀惧ぇ
+ maxSize : 3, //鍏佽涓婁紶鍥剧墖鐨勬渶澶у昂瀵革紝鍗曚綅M
+ appendMethod : 'after',
+ before : function () {
+ // layer.msg('涓婁紶鍓嶅洖璋冨嚱鏁�2');
+ },
+ success : function(json){
+ },
+ complete : function () {
+ layer.msg('涓婁紶鎴愬姛', {icon: 1});
+ },
+ delete : function (src) {
+ $.ajax({
+ url: baseUrl + "/sensor/remove.action",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ sensorId: sensorId,
+ src: src
+ },
+ // async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ },
+ error : function (e) {
+ layer.msg(e.msg + '(' + e.code + ')', {icon: 2});
+ }
+ });
+ }
+
+ /* 娓叉煋laydate */
+ laydate.render({
+ elem: '#createTime\\$',
+ type: 'datetime'
+ });
+
+ /* 鐩戝惉琛ㄥ崟鎻愪氦 */
+ form.on('submit(refresh)', function (data) {
+ init();
+ return false;
+ });
+
+ });
+</script>
--
Gitblit v1.9.1