From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
index 354e850..1e7983c 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -24,7 +24,7 @@
count: typeof totalItems !== 'undefined' ? totalItems : 0,
limit: typeof pageSize !== 'undefined' ? pageSize : 6,
curr: typeof currentPage !== 'undefined' ? currentPage : 1,
- layout: ['count', 'prev', 'page', 'next', 'refresh', 'skip'],
+ layout: [ 'prev', 'page', 'next', 'refresh', 'skip'],
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
@@ -45,7 +45,7 @@
count: totalCount,
limit: pageSize,
curr: currentPage,
- layout: ['count', 'prev', 'page', 'next', 'refresh', 'skip'],
+ layout: ['prev', 'page', 'next', 'refresh', 'skip'],
jump: function (obj, first) {
if (!first) {
searchRecord(obj.curr, obj.limit)
@@ -143,28 +143,38 @@
class="gallery-img" onclick="showSnapRecordPreview(this.getAttribute('data-url'))">
<div class="gallery-info">
<div class="gallery-header">
- <h3 class="gallery-title">${record.id}</h3>
+<!-- <h3 class="gallery-title">${record.id}</h3>-->
+ <div class="gallery-tags">
+ <span class="tag-person">
+ <i class="layui-icon layui-icon-note"></i>
+ <span>姹借溅</span>
+ </span>
+ <span class="tag-person">
+ <i class="layui-icon layui-icon-note"></i>
+ <span>鍗¤溅</span>
+ </span>
+ <span class="tag-person">
+ <i class="layui-icon layui-icon-note"></i>
+ <span>缈绘枟杞�</span>
+ </span>
+ </div>
</div>
<div class="gallery-meta">
+ <div style="display: flex; align-items: center; gap: 15px;width: 100%">
+ <div class="meta-item" style="width: 50%">
+ <i class="layui-icon layui-icon-video"></i>
+ <span>${record.cameraId || ''}</span>
+ </div>
+ <div class="meta-item" style="width: 50%">
+ <i class="layui-icon layui-icon-date"></i>
+ <span>${formatDate(record.snapTime)}</span>
+ </div>
+ </div>
<div class="meta-item">
<i class="layui-icon layui-icon-home"></i>
<span>${record.deptId || ''}</span>
- </div>
- <div class="meta-item">
- <i class="layui-icon layui-icon-video"></i>
- <span>${record.cameraId || ''}</span>
- </div>
- <div class="meta-item">
- <i class="layui-icon layui-icon-date"></i>
- <span>${formatDate(record.snapTime)}</span>
- </div>
- </div>
- <div class="gallery-tags">
- <span class="tag-person">
- <i class="layui-icon layui-icon-face-smile"></i>
- <span>娴嬭瘯鏍囩</span>
- </span>
- </div>
+ </div>
+ </div>
</div>
</div>
`;
@@ -184,8 +194,9 @@
String(d.getMonth() + 1).padStart(2, '0') + '-' +
String(d.getDate()).padStart(2, '0') + ' ' +
String(d.getHours()).padStart(2, '0') + ':' +
- String(d.getMinutes()).padStart(2, '0') + ':' +
- String(d.getSeconds()).padStart(2, '0');
+ String(d.getMinutes()).padStart(2, '0')
+ // + ':' +
+ // String(d.getSeconds()).padStart(2, '0');
}
/**
@@ -278,5 +289,13 @@
}
function openConf() {
var url = ctx + "com.fzzy.igds.SnapConf.d";
- $.modal.openTab("鎶撴媿閰嶇疆", url);
+ var options = {
+ title: "鎶撴媿閰嶇疆",
+ url: url,
+ btn: 0,
+ yes: function (index, layero) {
+ $.modal.close(index);
+ }
+ };
+ $.modal.openOptions(options);
}
--
Gitblit v1.9.3