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: 构建项目 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',