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/camera.ts |   91 +++++++++++++++++++++++++++------------------
 1 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/src/api/camera.ts b/src/api/camera.ts
index f7d7cc6..52c51f9 100644
--- a/src/api/camera.ts
+++ b/src/api/camera.ts
@@ -1,13 +1,6 @@
 import request from "@/scripts/httpRequest";
 import qs from "qs";
 
-export const checkCameraConnet = (query: any) => {
-  return request({
-    url: "/data/api-v/area/localmenu",
-    method: "get",
-    params: query
-  });
-};
 
 export const createCamera = (camera: any) => {
   return request({
@@ -27,37 +20,17 @@
 
 export const getCameraInfo = (id: string) => {
   return request({
-    url: "/data/api-v/camera/show/" + id,
-    method: "get"
+    url: "/data/api-v/camera/show",
+    method: "get",
+    params: { id: id }
   });
 };
 
 export const delCamera = (id: string) => {
   return request({
-    url: "/data/api-v/camera/del/" + id,
-    method: "delete"
-  });
-};
-
-export const fetchCameraTasks = (id: string) => {
-  return request({
-    url: "/data/api-v/camera/task/" + id,
-    method: "get"
-  });
-};
-
-export const fetchCameraRulesByTask = (query: any) => {
-  return request({
-    url: "/data/api-v/camera/getRulesByCameraAndTask",
+    url: "/data/api-v/camera/del",
     method: "get",
-    params: query
-  });
-};
-
-export const deleteCameraTask = (cameraId, taskId) => {
-  return request({
-    url: "/data/api-v/camera/delTask/" + cameraId + "/" + taskId,
-    method: "delete"
+    params: { id: id }
   });
 };
 
@@ -95,8 +68,9 @@
 
 export const updateSnapshot = (cameraId: string) => {
   return request({
-    url: "/data/api-v/camera/updateSnapshotUrl/" + cameraId,
-    method: "get"
+    url: "/data/api-v/camera/updateSnapshotUrl",
+    method: "get",
+    params: { cameraId: cameraId }
   });
 };
 
@@ -156,7 +130,7 @@
   })
 }
 //鍒犻櫎(灞曞尯)
-export const delArea = (data:any) => {
+export const delArea = (data: any) => {
   return request({
     url: "/data/api-v/acp/delete",
     method: "post",
@@ -165,10 +139,53 @@
 }
 
 //淇濆瓨鍖哄煙缂栬緫
-export const saveAreaInfo = (data:any) => {
+export const saveAreaInfo = (data: any) => {
   return request({
     url: "/data/api-v/acp/save",
     method: "post",
     data
   })
-}
\ No newline at end of file
+}
+
+//鑾峰彇鎽勫儚鏈虹殑鍧愭爣鏍囧畾淇℃伅
+export const getCameraMarks = (query: any) => {
+  return request({
+    url: '/data/api-v/camera/coord',
+    method: "get",
+    params: query
+  })
+}
+
+//鏇存柊鎽勫儚鏈虹殑鍧愭爣鏍囧畾淇℃伅
+export const updateCameraMarks = (data: any) => {
+  return request({
+    url: '/data/api-v/camera/updateCoord',
+    method: 'post',
+    data
+  })
+}
+
+//淇濆瓨鎽勫儚鏈哄垎缁�
+export const saveCameraGroupInfo = (data: any) => {
+  return request({
+    url: '/data/api-v/camera/group/save',
+    method: 'post',
+    data
+  })
+}
+
+//鏌ヨ鎽勫儚鏈哄垎缁勪俊鎭�
+export const findCameraGroups = () => {
+  return request({
+    url: '/data/api-v/camera/group/findAll',
+    method: 'get'
+  })
+}
+
+export const delCameraGroup = (groupId: string) => {
+  return request({
+    url: '/data/api-v/camera/group/del?groupId=' + groupId,
+    method: 'post'
+  })
+}
+

--
Gitblit v1.8.0