From 0d2c3d97a5c587b0cda7ac695722381261147a17 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 28 Aug 2025 18:43:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 750ce3df..eadc6f65 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -21,7 +21,9 @@ jobs: run: npm i pnpm -g - name: 安装依赖 - run: pnpm install + run: | + git config --global url."https://".insteadOf git:// + pnpm install continue-on-error: false # 依赖安装失败则终止工作流 - name: 构建项目 From 7fc74b88b8ef4e2bc002be4682a04928c77a7b1e Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Thu, 28 Aug 2025 19:53:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A=E5=8F=96=E6=B6=88=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/sis/acAdmin/index.vue | 3 ++- .../src/views/sis/accessControl/device/accessControlModal.vue | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/views/sis/acAdmin/index.vue b/apps/web-antd/src/views/sis/acAdmin/index.vue index 8957c42a..589ec097 100644 --- a/apps/web-antd/src/views/sis/acAdmin/index.vue +++ b/apps/web-antd/src/views/sis/acAdmin/index.vue @@ -180,7 +180,8 @@ function doPlayer(nodeData: any, index: number = 0) { console.log('index=', index); if (mpegts.isSupported()) { streamProxy(nodeData, (res: AddStreamProxyResult) => { - const url = res.flv; + const host = window.location.host; + const url = `http://${host}/${res.app}/${res.streamId}.live.flv`; // 将url 绑定到 nodeData nodeData.url = url; closePlayer(index); diff --git a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue index c0e783f3..fcfc0741 100644 --- a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue +++ b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue @@ -144,12 +144,14 @@ async function setupCommunitySelect() { { componentProps: () => ({ options: arr, + allowClear: true, }), fieldName: 'bindDeviceId', }, { componentProps: () => ({ options: arr, + allowClear: true, mode: 'multiple', // 关键属性,启用多选模式 }), fieldName: 'devicePoint',