" +
+ let filePath = imgUrl + item.image + "?token=" + sessionStorage.getItem("zhgd_token");
+ htmlArr.push("
" +
"
\n" +
"
![](" + filePath + ")
" +
"
" +
"
" +
- "
" + item.warnTime + "
" +
- "
" + (item.status === '0' ? '未确认' : '已确认') + "
" +
+ "
" + item.createTime + "
" +
+ "
" + (item.isSure === '0' ? '未确认' : item.isSure === '1' ? '已确认' : '系统误判') + "
" +
"
" +
"
" +
- "
" + item.content + "
" +
+ "
今日无作业票
" +
"
" +
"
" +
- "
" + item.warnContent + "
" +
+ "
现场有人员逗留，请确认！
" +
"
" +
"
");
})
@@ -140,18 +118,26 @@ function initImgData(list) {
}
function handleData(that, obj) {
- let isShow = $(that).attr('isShow');
- if (isShow === 'true') {
- hidPlugin();
- _this = that;
- openIframeByParamObj("handleData", "无计划预警信息", "./handleWarnInfo.html", "72%", "95%", obj, 1);
+ hidPlugin();
+ _this = that;
+ let isSure = $(that).attr('isSure');
+ let remark = $(that).attr('remark');
+ if (isSure) {
+ obj.isSure = isSure;
}
+ if (remark) {
+ obj.remark = remark;
+ }
+ openIframeByParamObj("handleData", "无计划预警信息", "./handleWarnInfo.html", "72%", "95%", obj, 1);
}
-function changeData() {
- $(_this).attr('isShow', 'false');
- $(_this).find('.imgData2').find('p').eq(1).html('已确认');
- $(_this).find('.imgData2').find('p').eq(1).attr('class', 'img-color1');
+function changeData(str) {
+ let obj = JSON.parse(str);
+ console.error(obj);
+ $(_this).attr('isSure', obj.isSure);
+ $(_this).attr('remark', obj.remark);
+ $(_this).find('.imgData2').find('p').eq(1).html(obj.isSure === '1' ? '已确认' : '系统误判');
+ $(_this).find('.imgData2').find('p').eq(1).attr('class', obj.isSure === '1' ? 'img-color1' : 'img-color2');
}
// 查看更多
diff --git a/js/pages/video/handleWarnInfo.js b/js/pages/video/handleWarnInfo.js
index 4bc1b26..04a2995 100644
--- a/js/pages/video/handleWarnInfo.js
+++ b/js/pages/video/handleWarnInfo.js
@@ -2,6 +2,8 @@ let form, laydate, layer;
let objParams = {};
function setParams(obj) {
objParams = JSON.parse(obj);
+ console.log(objParams);
+
layui.use(["form", 'layer'], function () {
form = layui.form;
layer = layui.layer;
@@ -19,10 +21,22 @@ function setParams(obj) {
});
layui.form.render();
});
- $('.content-info').eq(0).append('
' + objParams.warnTime + '
');
- $('.content-info').eq(1).append('
' + objParams.content + '
');
- $('.content-info').eq(2).append('
' + objParams.warnContent + '
');
- $('#img-show').find('img').attr('src', objParams.path);
+ $('.content-info').eq(0).append('
' + objParams.createTime + '
');
+ $('.content-info').eq(1).append('
今日无作业票
');
+ $('.content-info').eq(2).append('
现场有人员逗留，请确认！
');
+ if (objParams.isSure === '1') {
+ $('#statusItem').remove();
+ $('#measures').remove();
+ $('#save').remove();
+ $('#lastContent-info').after('
处置措施：' + objParams.remark + '
');
+ } else if (objParams.isSure === '2') {
+ $('#statusItem').remove();
+ $('#measures').remove();
+ $('#save').remove();
+ $('#lastContent-info').after('
');
+ }
+ let filePath = imgUrl + objParams.image + "?token=" + sessionStorage.getItem("zhgd_token");
+ $('#img-show').find('img').attr('src', filePath);
}
function setMeasures() {
@@ -41,8 +55,9 @@ function saveData2() {
// 保存数据
function submitApply(data) {
- /* let field = data.field; // 获取表单字段值
- const url = commonUrl + "screen/largeScreen/personnelControl/addNewFence";
+ let field = data.field; // 获取表单字段值
+ field.id = objParams.id;
+ const url = commonUrl + "screen/largeScreen/constrDisplay/updateImage";
let encryptStr = encryptCBC(JSON.stringify(field));
let loadingMsg = layer.msg('正在提交保存,请稍等...', {
icon: 16,
@@ -54,6 +69,7 @@ function submitApply(data) {
layer.close(loadingMsg); // 关闭提示层
if (result.code === 200) {
parent.layer.msg(result.msg, { icon: 1, offset: 't' });
+ closePage(1);
} else if (result.code === 500) {
layer.msg(result.msg, { icon: 2 });
} else if (result.code === 401) {
@@ -62,15 +78,16 @@ function submitApply(data) {
}, function (xhr) {
layer.close(loadingMsg); // 关闭提示层
error(xhr)
- }, "application/json", aqEnnable); */
- closePage(1);
+ }, "application/json", aqEnnable);
}
// 关闭页面
function closePage(type) {
let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引
if (type == 1) {
- window.parent.changeData();
+ objParams.remark = $('#remark').val();
+ objParams.isSure = $('input[name="isSure"]:checked').val();
+ window.parent.changeData(JSON.stringify(objParams));
}
parent.layer.close(index); // 再执行关闭
}
\ No newline at end of file
diff --git a/js/pages/video/moreData.js b/js/pages/video/moreData.js
index f99a541..399f396 100644
--- a/js/pages/video/moreData.js
+++ b/js/pages/video/moreData.js
@@ -19,38 +19,85 @@ function setParams(obj) {
});
}
+// 重载表格
+function reloadTable(pageNum) {
+ table.reload("currentTableId", {
+ page: {
+ curr: pageNum ? pageNum : 1,
+ },
+ where: {
+ bidCode: parent.$('#bidPro').val(),
+ startTime: $('#startDate').val(),
+ endTime: $('#endDate').val(),
+ },
+ },
+ );
+}
+
function initTable(bidCode) {
- const url = commonUrl + "screen/largeScreen/dataAnalysis/getListByType";
+ const url = commonUrl + "screen/largeScreen/constrDisplay/getCameraImage";
table.render({
elem: '#demo2',
+ id: 'currentTableId',
url: url,
skin: 'line',
page: true,
- height: 'full-200',
+ height: 'full-180',
headers: {
"decrypt": "decrypt",
"Authorization": token
},
where: {
bidCode: bidCode,
+ startTime: $('#startDate').val(),
+ endTime: $('#endDate').val()
},
cols: [[
{ type: 'numbers', title: '序号', width: '10%' }, // 添加序号列
- { field: 'date', title: '日期', align: 'center', width: '20%' },
- { field: 'warnContent', title: '预警内容', align: 'center', width: '20%' },
- { field: 'photo', title: '照片', align: 'center', width: '25%' },
- { field: 'status', title: '状态', align: 'center', width: '25%' }
+ { field: 'createTime', title: '日期', align: 'center', width: '20%' },
+ {
+ field: 'warnContent', title: '预警内容', align: 'center', width: '20%',
+ templet: function (d) {
+ return '现场有人员逗留，请确认！';
+ }
+ },
+ {
+ field: 'photo', title: '照片', align: 'center', width: '20%',
+ templet: function (d) {
+ let html = "", filePath = imgUrl + d.image + "?token=" + sessionStorage.getItem("zhgd_token");
+ html += "
";
+ return html;
+ }
+ },
+ {
+ field: 'status', title: '状态', align: 'center', width: '10%',
+ templet: function (d) {
+ return (d.isSure === '0' ? '未确认' : d.isSure === '1' ? '已确认' : '系统误判');
+ },
+ },
+ {
+ field: 'remark', title: '处置措施', align: 'center', width: '20%'
+ }
]],
- initComplete: function () {
- // 在表格渲染完成后，重新渲染序号列
- var that = this.elem.next();
- var tool = that.children('.layui-table-box').children('.layui-table-fixed').children('.layui-table-body').children('.layui-table');
- tool.find("tr").each(function (index, item) {
- $(this).find('td[data-field="LAY_TABLE_INDEX"]').text(index + 1);
- });
- },
done: function (res, curr, count, origin) {
// console.log(res);
}
})
+}
+function viewImg(item) {
+ let filePath = imgUrl + item.image + "?token=" + sessionStorage.getItem("zhgd_token");
+ layer.photos({
+ shade: 0.5,
+ footer: false,
+ photos: {
+ "title": "图片预览",
+ "start": 0,
+ "data": [
+ {
+ "pid": 1,
+ "src": filePath,
+ }
+ ]
+ },
+ });
}
\ No newline at end of file
diff --git a/pages/constrDisplay/constrDisplay.html b/pages/constrDisplay/constrDisplay.html
index f7410a0..7068c1b 100644
--- a/pages/constrDisplay/constrDisplay.html
+++ b/pages/constrDisplay/constrDisplay.html
@@ -47,9 +47,7 @@