-
@@ -40,6 +48,12 @@ import ChannelTree from './channel-tree.vue';
import mpegts from 'mpegts.js';
import { message } from 'ant-design-vue';
import { addStreamProxy } from '#/api/sis/stream';
+import {
+ Svg16FrameIcon,
+ Svg1FrameIcon,
+ Svg4FrameIcon,
+ Svg9FrameIcon,
+} from '@vben/icons';
const selected = 'selected';
@@ -112,7 +126,6 @@ function onPlayerNumChanged(val: number) {
playerNum.value = changeNum;
// 缩小布局
if (changeBeforeNum > changeNum) {
- debugger;
const playerArr = [];
for (let i = 0; i < playerList.length; i++) {
const playerBox = playerList[i];
@@ -176,7 +189,6 @@ function onNodeChecked(
/**
* 如果当前页面有选择播放未知，并且播放视频只有一个，则播放到制定位置
*/
- debugger;
if (currentSelectPlayerIndex.value !== -1 && checkNode.length == 1) {
doPlayer(checkNode[0], currentSelectPlayerIndex.value - 1);
}
@@ -360,4 +372,10 @@ onUnmounted(() => {
.player.selected {
border: 2px solid deepskyblue;
}
+
+.player-area {
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+}
diff --git a/packages/icons/src/svg/index.ts b/packages/icons/src/svg/index.ts
index 3fda024f..d56e97c4 100644
--- a/packages/icons/src/svg/index.ts
+++ b/packages/icons/src/svg/index.ts
@@ -16,8 +16,20 @@ const SvgTopiamIcon = createIconifyIcon('svg:topiam');
const SvgWechatIcon = createIconifyIcon('svg:wechat');
const SvgQQIcon = createIconifyIcon('svg:qq');
const SvgSnailJobIcon = createIconifyIcon('svg:snail-job');
+/*---------------------------------sis 使用的icon------------------------------------------*/
+const Svg1FrameIcon = createIconifyIcon('svg:one-frame');
+const Svg4FrameIcon = createIconifyIcon('svg:four-frame');
+const Svg9FrameIcon = createIconifyIcon('svg:9-frame');
+const Svg16FrameIcon = createIconifyIcon('svg:16-frame');
+
+
+
export {
+ Svg1FrameIcon,
+ Svg4FrameIcon,
+ Svg9FrameIcon,
+ Svg16FrameIcon,
SvgAntdvLogoIcon,
SvgAvatar1Icon,
SvgAvatar2Icon,
From 4be281fd5f85eac64e61ca0d0dfc37c12fb440f4 Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Fri, 25 Jul 2025 21:31:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/icons/src/svg/icons/sis/16-frame.svg | 10 ++++++++++
packages/icons/src/svg/icons/sis/9-frame.svg | 8 ++++++++
packages/icons/src/svg/icons/sis/four-frame.svg | 9 +++++++++
packages/icons/src/svg/icons/sis/one-frame.svg | 8 ++++++++
4 files changed, 35 insertions(+)
create mode 100644 packages/icons/src/svg/icons/sis/16-frame.svg
create mode 100644 packages/icons/src/svg/icons/sis/9-frame.svg
create mode 100644 packages/icons/src/svg/icons/sis/four-frame.svg
create mode 100644 packages/icons/src/svg/icons/sis/one-frame.svg
diff --git a/packages/icons/src/svg/icons/sis/16-frame.svg b/packages/icons/src/svg/icons/sis/16-frame.svg
new file mode 100644
index 00000000..e9fb478c
--- /dev/null
+++ b/packages/icons/src/svg/icons/sis/16-frame.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/packages/icons/src/svg/icons/sis/9-frame.svg b/packages/icons/src/svg/icons/sis/9-frame.svg
new file mode 100644
index 00000000..c39889cc
--- /dev/null
+++ b/packages/icons/src/svg/icons/sis/9-frame.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/packages/icons/src/svg/icons/sis/four-frame.svg b/packages/icons/src/svg/icons/sis/four-frame.svg
new file mode 100644
index 00000000..0698dd71
--- /dev/null
+++ b/packages/icons/src/svg/icons/sis/four-frame.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/packages/icons/src/svg/icons/sis/one-frame.svg b/packages/icons/src/svg/icons/sis/one-frame.svg
new file mode 100644
index 00000000..1386b068
--- /dev/null
+++ b/packages/icons/src/svg/icons/sis/one-frame.svg
@@ -0,0 +1,8 @@
+
+
From 532869a4a365c59f97c551362fca2ca645c5432a Mon Sep 17 00:00:00 2001
From: zcxlsm
Date: Sat, 26 Jul 2025 02:39:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(property):=20=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E8=A1=A8=E5=8D=95=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/property/resident/person/model.d.ts | 4 +-
.../views/property/resident/person/data.ts | 22 +++--
.../property/resident/person/person-modal.vue | 80 +++++++++++--------
3 files changed, 65 insertions(+), 41 deletions(-)
diff --git a/apps/web-antd/src/api/property/resident/person/model.d.ts b/apps/web-antd/src/api/property/resident/person/model.d.ts
index 17413393..d748edb1 100644
--- a/apps/web-antd/src/api/property/resident/person/model.d.ts
+++ b/apps/web-antd/src/api/property/resident/person/model.d.ts
@@ -144,9 +144,9 @@ export interface PersonForm extends BaseEntity {
*/
authGroupId?: string | number
- begDate?: string
+ authBegDate?: string
- endDate?: string
+ authEndDate?: string
}
export interface PersonQuery extends PageQuery {
diff --git a/apps/web-antd/src/views/property/resident/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts
index b061b2d5..b344beef 100644
--- a/apps/web-antd/src/views/property/resident/person/data.ts
+++ b/apps/web-antd/src/views/property/resident/person/data.ts
@@ -5,6 +5,7 @@ import { renderDict } from "#/utils/render"
import { resident_unitList } from "#/api/property/resident/unit"
import { authGroupList } from '#/api/sis/authGroup'
import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model'
+import { toRaw } from 'vue'
export const querySchema: FormSchemaGetter = () => [
@@ -151,15 +152,16 @@ export const modalSchema: FormSchemaGetter = () => [
label: '性别',
fieldName: 'gender',
component: "Select",
- componentProps:{
+ componentProps: {
options: getDictOptions('sys_user_sex')
},
rules: 'required',
},
{
- label: '身份证号',
+ label: '证件号',
fieldName: 'idCard',
component: "Input",
+ rules: 'required',
},
{
label: '邮箱',
@@ -221,12 +223,23 @@ export const modalSchema: FormSchemaGetter = () => [
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
- rules: 'required',
+ dependencies: {
+ show: (values) => {
+ return typeof (values.id) !== 'undefined'
+ },
+ triggerFields: ['id'],
+ }
},
{
label: '通行权限组',
fieldName: 'authGroupId',
component: 'ApiSelect',
+ dependencies: {
+ show: (values) => {
+ return typeof (values.id) !== 'undefined'
+ },
+ triggerFields: ['id'],
+ },
componentProps: {
resultField: 'list', // 根据API返回结构调整
labelField: 'name',
@@ -244,8 +257,7 @@ export const modalSchema: FormSchemaGetter = () => [
}
return authGroupArr
},
- },
- rules: 'required',
+ }
},
{
label: '人脸图片',
diff --git a/apps/web-antd/src/views/property/resident/person/person-modal.vue b/apps/web-antd/src/views/property/resident/person/person-modal.vue
index 38ebe8ed..06d9678a 100644
--- a/apps/web-antd/src/views/property/resident/person/person-modal.vue
+++ b/apps/web-antd/src/views/property/resident/person/person-modal.vue
@@ -1,56 +1,60 @@