Merge branch 'wyf-dev' into 'all-v4'

fix: nvr设备改为新版接口地址

See merge request skyeye/skyeye_frontend/skyeye-admin!248

src/api/camera/camera-nvr.ts

@@ -30,7 +30,7 @@ export interface NVRQueryItem {
 // 添加NVR
 export const addNVRListItem = (data: NVRListItem) => {
   return http.request({
-    url: '/nvrOption/saveNvr',
+    url: '/admin/nvr/saveNvr',
     method: 'post',
     data,
   });
@@ -39,7 +39,7 @@ export const addNVRListItem = (data: NVRListItem) => {
 // 删除NVR
 export const deleteNVRListItem = (nvrId: number) => {
   return http.request({
-    url: `/nvrOption/deleteNvr?nvrId=${nvrId}`,
+    url: `/admin/nvr/deleteNvr?nvrId=${nvrId}`,
     method: 'delete',
   });
 };
@@ -47,7 +47,7 @@ export const deleteNVRListItem = (nvrId: number) => {
 // 编辑NVR
 export const updateNVRListItem = (data: NVRListItem) => {
   return http.request({
-    url: '/nvrOption/updateNvr',
+    url: '/admin/nvr/updateNvr',
     method: 'post',
     data,
   });
@@ -56,7 +56,7 @@ export const updateNVRListItem = (data: NVRListItem) => {
 // 查询NVR
 export const getNVRList = (query: NVRQueryItem) => {
   return http.request({
-    url: `/nvrOption/getNvr?pageNumber=${query.pageNumber}&pageSize=${query.pageSize}`,
+    url: `/admin/nvr/queryNvrPage?pageNumber=${query.pageNumber}&pageSize=${query.pageSize}`,
     method: 'get',
   });
 };