0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改bug

This commit is contained in:
100011797 2023-07-14 13:51:26 +08:00
parent a8c1bfb0ff
commit 82089fb0a6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/media/playback.ts
View File

@ -43,7 +43,7 @@ export default {
server.post<recordsItemType[]>(`/media/device/${deviceId}/${channelId}/records/in-server/files`, data), server.post<recordsItemType[]>(`/media/device/${deviceId}/${channelId}/records/in-server/files`, data),
// 播放云端回放 // 播放云端回放
playbackStart: (recordId: string) => `${BASE_API_PATH}/record/${recordId}.mp4?:X_Access_Token=${LocalStore.get(TOKEN_KEY)}`, playbackStart: (recordId: string) => `${BASE_API_PATH}/media/record/${recordId}.mp4?:X_Access_Token=${LocalStore.get(TOKEN_KEY)}`,
downLoadFile: (recordId: string) => `${BASE_API_PATH}/record/${recordId}.mp4?download=true&:X_Access_Token=${LocalStore.get(TOKEN_KEY)}` downLoadFile: (recordId: string) => `${BASE_API_PATH}/media/record/${recordId}.mp4?download=true&:X_Access_Token=${LocalStore.get(TOKEN_KEY)}`
} }

2
src/views/link/Type/Detail/index.vue
View File

@ -112,7 +112,7 @@
collapsible="header" collapsible="header"
> >
<j-collapse-panel <j-collapse-panel
:key="(cluster.serverId || '') + index" :key="index + 1"
:show-arrow="!formData.shareCluster" :show-arrow="!formData.shareCluster"
> >
<template #header v-if="!shareCluster"> <template #header v-if="!shareCluster">

14
src/views/system/NoticeRule/components/Save/index.vue
View File

@ -191,20 +191,26 @@ const formModel = reactive<{
const variableRef = ref(); const variableRef = ref();
const formRef = ref(); const formRef = ref();
const _getType = computed(() => {
if(['notifier-dingTalk'].includes(props.data?.channelProvider)) {
return ['user', 'tag']
} else {
return ['user', 'org', 'tag']
}
})
const _variableDefinitions = computed(() => { const _variableDefinitions = computed(() => {
const arr = ['user', 'org', 'tag'];
return variable.value.filter((item: any) => { return variable.value.filter((item: any) => {
const _type = item.expands?.businessType || item.type || ''; const _type = item.expands?.businessType || item.type || '';
return !arr.includes(_type); return !['user', 'org', 'tag'].includes(_type);
}); });
}); });
const handleVariable = (obj: any) => { const handleVariable = (obj: any) => {
const arr = ['user', 'org', 'tag'];
const _array = variable.value const _array = variable.value
.filter((item: any) => { .filter((item: any) => {
const _type = item.expands?.businessType || item.type || ''; const _type = item.expands?.businessType || item.type || '';
return arr.includes(_type); return _getType.value.includes(_type);
}) })
.map((i: any) => i?.id); .map((i: any) => i?.id);
const _variable = variableMap.get(formModel.channelProvider); const _variable = variableMap.get(formModel.channelProvider);