From c27ad3dcb8b67a6c10a99c98b9bd6dd1f08b7967 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 三月 2022 10:43:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/issue/issue_detl.html | 368 +++++++++++++++++++++-------------------------------
1 files changed, 147 insertions(+), 221 deletions(-)
diff --git a/src/main/webapp/views/issue/issue_detl.html b/src/main/webapp/views/issue/issue_detl.html
index 25d87d4..0c88f9b 100644
--- a/src/main/webapp/views/issue/issue_detl.html
+++ b/src/main/webapp/views/issue/issue_detl.html
@@ -1,5 +1,5 @@
<meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-<link rel="stylesheet" href="../static/css/jquery.upload.css" media="all"/>
+<link rel="stylesheet" href="../../static/css/jquery.upload.css" media="all"/>
<style>
#formAdvForm {
background-color: #f3f3f3;
@@ -55,7 +55,7 @@
float: left;
font-weight: bold;
text-shadow: 0 1px 0 rgb(0 0 0 / 20%);
- padding: .3em .6em;
+ padding: .3em 1em;
font-size: 85%;
height: 30px;
line-height: 30px;
@@ -71,19 +71,11 @@
.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>
@@ -93,181 +85,122 @@
</div>
</div>
</div>
+ <!-- 瑙嗛 -->
+ <div class="layui-card">
+ <div class="layui-card-header">瑙嗛</div>
+ <div class="layui-card-body">
+ <div class="upload-box clear">
+ <div id="issueVideo"></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">
+ <input name="id" type="hidden" />
<div class="layui-inline layui-col-md4">
- <label class="layui-form-label">璁惧缂栧彿:</label>
+ <label class="layui-form-label">鏁呴殰缂栧彿:</label>
<div class="layui-input-block">
- <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input"/>
+ <input name="uuid" placeholder="鏈煡" class="layui-input" disabled />
</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"/>
+ <input name="hostId$" placeholder="璇疯緭鍏ユ墍灞為」鐩�" class="layui-input" disabled/>
</div>
</div>
<div class="layui-inline layui-col-md4">
- <label class="layui-form-label">ccid:</label>
+ <label class="layui-form-label">鏁呴殰绫诲瀷:</label>
<div class="layui-input-block">
- <input name="sim" placeholder="璇疯緭鍏im鍗″彿" class="layui-input"/>
+ <input name="issueType$" placeholder="鏈煡" class="layui-input" disabled />
</div>
</div>
<div class="layui-inline layui-col-md4">
- <label class="layui-form-label">绯荤粺鐘舵��:</label>
+ <label class="layui-form-label">宸℃浜哄憳:</label>
<div class="layui-input-block">
- <select name="status">
- <option value="1">鍚敤</option>
- <option value="0">绂佺敤</option>
+ <input name="discoverer" placeholder="鏈煡" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡:</label>
+ <div class="layui-input-block">
+ <input name="tel" placeholder="鏈煡" class="layui-input" disabled />
+ </div>
+ </div>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">鍙戠敓鏃ユ湡:</label>
+ <div class="layui-input-block">
+ <input name="startTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off" disabled/>
+ </div>
+ </div>
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+ <legend style="font-size: 13px">璇疯ˉ鍏�</legend>
+ </fieldset>
+ <div class="layui-inline layui-col-md4">
+ <label class="layui-form-label">瑙ｅ喅浜哄憳:</label>
+ <div class="layui-input-block">
+ <input name="dealer" 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 id="lastTime" name="lastTime$" 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">
+ <select name="settle">
+ <option value="2">鎻愪氦</option>
+ <option value="3">宸茶</option>
+ <option value="4">浣滀笟</option>
+ <option value="5">瀹屾垚</option>
+ <option value="6">鍙栨秷</option>
</select>
</div>
</div>
<div class="layui-inline layui-col-md4">
- <label class="layui-form-label">娣诲姞鏃堕棿:</label>
+ <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"/>
+ <input id="endTime" name="endTime$" placeholder="璇烽�夋嫨鏃堕棿" class="layui-input icon-date" autocomplete="off"/>
</div>
</div>
</div>
</div>
</div>
- <!-- 璁惧鍙傛暟 -->
+ <!-- 宸℃鏄庣粏 -->
<div class="layui-card">
- <div class="layui-card-header">璁惧鍙傛暟</div>
+ <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-inline layui-col-md12">
+ <label class="layui-form-label">闂姒傝堪:</label>
<div class="layui-input-block">
- <input name="topic" placeholder="璇疯緭鍏ヤ富棰�" class="layui-input"/>
+ <textarea name="title" placeholder="鏈煡" class="layui-textarea" disabled></textarea>
</div>
</div>
- <div class="layui-inline layui-col-md4">
- <label class="layui-form-label">鍦板潃-ip:</label>
+ <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+ <legend style="font-size: 13px">璇疯ˉ鍏�</legend>
+ </fieldset>
+ <div class="layui-inline layui-col-md12">
+ <label class="layui-form-label">鏁呴殰鍘熷洜:</label>
<div class="layui-input-block">
- <input name="ip" placeholder="璇疯緭鍏p鍦板潃" class="layui-input"/>
+ <textarea name="reason" placeholder="璇疯緭鍏�..." class="layui-textarea"></textarea>
</div>
</div>
- <div class="layui-inline layui-col-md4">
- <label class="layui-form-label">绔彛-port:</label>
+ <div class="layui-inline layui-col-md12">
+ <label class="layui-form-label">瑙ｅ喅鍔炴硶:</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"/>
+ <textarea name="deal" placeholder="璇疯緭鍏�..." class="layui-textarea"></textarea>
</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>
@@ -279,25 +212,28 @@
<span class="issue-label"></span>
</div>
<button class="layui-btn" lay-filter="refresh" lay-submit><i class="layui-icon"></i> 鍒锋柊 </button>
+ <button class="layui-btn layui-btn-normal" lay-filter="save" 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="../../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-layer-close').hide();
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
- }).use(['form', 'table', 'laydate', 'notice'], function () {
+ }).use(['form', 'table', 'laydate', 'notice', 'Player'], function () {
var $ = layui.jquery;
var form = layui.form;
var table = layui.table;
var laydate = layui.laydate;
var notice = layui.notice;
+ var Player = layui.Player;
form.render('select');
@@ -313,28 +249,19 @@
if (res.code === 200) {
let issue = res.data;
top.issueByDetl = 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);
- // 璁惧鍞竴鐮�
+ // 缂栫爜
$('.issue-label').text(issue.uuid);
// 璁惧鏄庣粏
form.val('formAdvForm', issue);
- // 鏃ュ織琛ㄦ牸
- initLogTable(issue.id);
// 鍥剧墖
initImgs(issue.id, issue.imgArr);
- // 鍦ㄧ嚎鎯呭喌
+ // 瑙嗛
+ if (!isEmpty(issue.videoArr) && issue.videoArr.length > 0) {
+ initVideo(issue.videoArr);
+ }
$('.online-info').attr("class", issue.online?"online-info online-success":"online-info online-fail");
- $('.online-info').text(issue.online?"宸插畬鎴�":"浣滀笟涓�");
+ $('.online-info').text(issue.settle$);
+ layDateRender();
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -344,64 +271,6 @@
})
}
- /* 娓叉煋琛ㄦ牸 */
- 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) {
@@ -455,17 +324,74 @@
});
}
+ /* 娓叉煋瑙嗛 */
+ function initVideo(videoSrc) {
+ new Player({
+ id: 'issueVideo',
+ url: videoSrc[0], // 瑙嗛鍦板潃
+ // poster: 'https://imgcache.qq.com/open_proj/proj_qcloud_v2/gateway/solution/general-video/css/img/scene/1.png', // 灏侀潰
+ fluid: true, // 瀹藉害100%
+ playbackRate: [0.5, 1, 1.5, 2], // 寮�鍚�嶉�熸挱鏀�
+ pip: false, // 寮�鍚敾涓敾
+ lang: 'zh-cn',
+ success: function () {
+ }
+ });
+ $('#issueVideo').css("width", "30%").css("padding-top", "20%");
+ }
+
/* 娓叉煋laydate */
- laydate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
+ function layDateRender() {
+ laydate.render({
+ elem: '#endTime',
+ type: 'datetime'
+ });
+
+ laydate.render({
+ elem: '#lastTime',
+ type: 'datetime'
+ });
+ }
+ layDateRender();
+
/* 鐩戝惉琛ㄥ崟鎻愪氦 */
form.on('submit(refresh)', function (data) {
init();
return false;
});
+ form.on('submit(save)', function (elem) {
+ let data = elem.field;
+ notice.msg('姝ｅ湪鎷煎懡淇敼鏁版嵁......', {icon: 4, position: "topRight"});
+ $.ajax({
+ url: baseUrl + "/issue/process/auth",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ data: JSON.stringify({
+ id: Number(data.id),
+ uuid: data.uuid,
+ dealer: data.dealer,
+ settle: Number(data.settle),
+ endTime: top.strToDate(data.endTime$),
+ // lastTime: data.lastTime,
+ reason: data.reason,
+ deal: data.deal,
+ }),
+ success: function (res) {
+ notice.destroy();
+ if (res.code === 200) {
+ notice.success({title: '娑堟伅閫氱煡', message: res.msg});
+ $('.layui-layer-close').click();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ notice.error({title: '娑堟伅閫氱煡', message: res.msg});
+ }
+ }
+ })
+ return false;
+ });
});
</script>
--
Gitblit v1.9.1