Browse Source

Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop

tags/v1.0.0^2
zhangtao 2 years ago
parent
commit
a0420c4808
2 changed files with 9 additions and 2 deletions
  1. +0
    -1
      src/components/DataTable/tools/useDataSource.js
  2. +9
    -1
      src/views/dashboard/components/VideoCard.vue

+ 0
- 1
src/components/DataTable/tools/useDataSource.js View File

@@ -48,7 +48,6 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL
// 处理数据结构
const resultInfo = res[listField] ? res[listField] : res
dataSourceRef.value = dataType === 'tree' ? dealTree(resultInfo.data) : resultInfo
console.log('currentPage', currentPage)
setPagination({
[pageField]: currentPage,
[totalField]: Math.ceil(resultTotal / pageSize),

+ 9
- 1
src/views/dashboard/components/VideoCard.vue View File

@@ -41,7 +41,7 @@ import { airportList } from '@/api/dashboard/index.js'
import { getTaskList } from '@/api/task/index.js'
import { missionLive } from '@/api/dashboard/index.js'
import VideoPlayer from '@/components/VideoPlayer/index.vue'
import { ref, reactive, computed, watch, toRefs, nextTick } from 'vue'
import { ref, reactive, onUnmounted, watch, toRefs, nextTick } from 'vue'

export default {
name: 'TaskCard',
@@ -318,6 +318,14 @@ export default {
}
}, { deep: true })

onUnmounted(() => {
clearTimeout(data.originDebounce)
data.originDebounce = null
originRef.value?.disposeVideo()
clearTimeout(data.analyseDebounce)
data.analyseDebounce = null
analyseRef.value?.disposeVideo()
})
return {
...toRefs(data),
originRef,

Loading…
Cancel
Save