|
@@ -27,9 +27,9 @@
|
|
|
import useFenceStore from '@/views/cameras/preview/store/useFenceStore';
|
|
import useFenceStore from '@/views/cameras/preview/store/useFenceStore';
|
|
|
import useCameraAlgoStore from '@/views/cameras/preview/store/useCameraAlgoStore';
|
|
import useCameraAlgoStore from '@/views/cameras/preview/store/useCameraAlgoStore';
|
|
|
import { onMounted } from 'vue';
|
|
import { onMounted } from 'vue';
|
|
|
- import { IsPtz } from '@/types/camera/constant';
|
|
|
|
|
|
|
+ // import { IsPtz } from '@/types/camera/constant';
|
|
|
import { CameraDetailServer } from '@/types/camera/type';
|
|
import { CameraDetailServer } from '@/types/camera/type';
|
|
|
- import { CameraTree, getCameraTreeOldVersion } from '@/api/camera/camera-preview';
|
|
|
|
|
|
|
+ import { CameraTree, getFullCameraTree } from '@/api/camera/camera-preview';
|
|
|
import useCameraStatus from '@/views/cameras/preview/store/useCameraStatus';
|
|
import useCameraStatus from '@/views/cameras/preview/store/useCameraStatus';
|
|
|
|
|
|
|
|
const cameraStatus = useCameraStatus();
|
|
const cameraStatus = useCameraStatus();
|
|
@@ -89,7 +89,7 @@
|
|
|
if (cameraId) {
|
|
if (cameraId) {
|
|
|
if (cameraTree.value.length === 0) {
|
|
if (cameraTree.value.length === 0) {
|
|
|
/** 如果当前树为空,那么切换相机的时候,要重新请求树结构 */
|
|
/** 如果当前树为空,那么切换相机的时候,要重新请求树结构 */
|
|
|
- const tree = await getCameraTreeOldVersion();
|
|
|
|
|
|
|
+ const tree = await getFullCameraTree();
|
|
|
cameraTree.value = tree as unknown as CameraTree[];
|
|
cameraTree.value = tree as unknown as CameraTree[];
|
|
|
codeShowList.value = getCameraList(tree);
|
|
codeShowList.value = getCameraList(tree);
|
|
|
closeInterval();
|
|
closeInterval();
|
|
@@ -113,7 +113,7 @@
|
|
|
nvrCameraViewRef.value.clearNvrUrl();
|
|
nvrCameraViewRef.value.clearNvrUrl();
|
|
|
} else {
|
|
} else {
|
|
|
/** 没有相机的时候也要请求相机树 */
|
|
/** 没有相机的时候也要请求相机树 */
|
|
|
- const tree = await getCameraTreeOldVersion();
|
|
|
|
|
|
|
+ const tree = await getFullCameraTree();
|
|
|
cameraTree.value = tree as unknown as CameraTree[];
|
|
cameraTree.value = tree as unknown as CameraTree[];
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|