Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
This commit is contained in:
@@ -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: 构建项目
|
||||
|
@@ -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);
|
||||
|
@@ -144,12 +144,14 @@ async function setupCommunitySelect() {
|
||||
{
|
||||
componentProps: () => ({
|
||||
options: arr,
|
||||
allowClear: true,
|
||||
}),
|
||||
fieldName: 'bindDeviceId',
|
||||
},
|
||||
{
|
||||
componentProps: () => ({
|
||||
options: arr,
|
||||
allowClear: true,
|
||||
mode: 'multiple', // 关键属性,启用多选模式
|
||||
}),
|
||||
fieldName: 'devicePoint',
|
||||
|
Reference in New Issue
Block a user