From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突
---
src/api/area.ts | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/api/area.ts b/src/api/area.ts
index 8b5b2bb..17f5043 100644
--- a/src/api/area.ts
+++ b/src/api/area.ts
@@ -11,7 +11,7 @@
export const getGB28181CameraTree = (query: any) => {
return request({
- url: "/data/api-v/area/gb28181Tree",
+ url: "/data/api-v/gb28181/tree",
method: "get",
params: query
});
@@ -49,9 +49,24 @@
});
};
+export const getCameraBaseImage = (query: any) => {
+ return request({
+ url: "/data/api-v/gb28181/camera/capture",
+ method: "get",
+ params: query
+ });
+};
+
+export const getGb28181Pool = () => {
+ return request({
+ url: "/data/api-v/gb28181/treeSelected",
+ method: "get"
+ });
+};
+
export const refreshGB28181Tree = () => {
return request({
- url: "/data/api-v/area/gb28181TreeRefresh",
+ url: "/data/api-v/gb28181/treeRefresh",
method: "post",
});
};
--
Gitblit v1.8.0