Przeglądaj źródła

fix: 修复监控接口错误处理及代码格式

调整 getPreset 与 startPlayback 接口的错误提示逻辑,禁止自动弹出错误Toast并改用自定义提示;统一条件判断运算符间距及结尾换行符
yusheng 3 tygodni temu
rodzic
commit
b27afcb92b

+ 17 - 16
src/api/isp/ispRealtime/monitor/index.js

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  */
 export async function playControl(params) {
   const res = await request.get(`/mms/camera/playControl`, { params });
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -16,7 +16,7 @@ export async function playControl(params) {
  */
 export async function getTask(id) {
   const res = await request.get(`/mms/task/get?id=` + id);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -27,7 +27,7 @@ export async function getTask(id) {
  */
 export async function listByType() {
   const res = await request.get(`/main/camera-info/listByType`);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -38,7 +38,7 @@ export async function listByType() {
  */
 export async function getCameraUrl(data) {
   const res = await request.post(`/mms/camera/batchAddStreamProxy`, data);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -50,7 +50,7 @@ export async function delStreamProxy(cameraCode) {
   const res = await request.get(
     `/mms/camera/delStreamProxy?cameraCode=` + cameraCode
   );
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -61,12 +61,13 @@ export async function delStreamProxy(cameraCode) {
  */
 export async function getPreset(cameraCode) {
   const res = await request.get(
-    `/mms/camera/getPreset?cameraCode=` + cameraCode
+    `/mms/camera/getPreset?cameraCode=` + cameraCode,
+    { showErrorToast: false }
   );
   if (res.data.code == 200) {
     return res.data.data;
   }
-  return Promise.reject(new Error(res.data.message));
+  // return Promise.reject(new Error(res.data.message));
 }
 
 /**
@@ -74,7 +75,7 @@ export async function getPreset(cameraCode) {
  */
 export async function getPresetPosList(data) {
   const res = await request.post(`/mms/robot/Check/GetPresetPosList`, data);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -85,7 +86,7 @@ export async function getPresetPosList(data) {
  */
 export async function callPresetPos(data) {
   const res = await request.post(`/mms/robot/Command/CallPresetPos`, data);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -96,7 +97,7 @@ export async function callPresetPos(data) {
  */
 export async function savePresetPos(data) {
   const res = await request.post(`/mms/robot/Command/SavePresetPos`, data);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -107,7 +108,7 @@ export async function savePresetPos(data) {
  */
 export async function savePresetPosName(data) {
   const res = await request.post(`/mms/robot/Command/SavePresetPosName`, data);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -118,7 +119,7 @@ export async function savePresetPosName(data) {
  */
 export async function setPreset(params) {
   const res = await request.get(`/mms/camera/setPreset`, { params });
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -129,7 +130,7 @@ export async function setPreset(params) {
  */
 export async function oprPreset(params) {
   const res = await request.get(`/mms/camera/oprPreset`, { params });
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -140,7 +141,7 @@ export async function oprPreset(params) {
  */
 export async function getCode(params) {
   const res = await request.get(`/basic/code/getCode?prefix=` + params);
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
@@ -150,8 +151,8 @@ export async function getCode(params) {
  */
 export async function getCameraInfo(params) {
   const res = await request.get(`/mms/camera/getCameraInfo`, { params });
-  if (res.data.code == 0||res.data.code == 200) {
+  if (res.data.code == 0 || res.data.code == 200) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

+ 8 - 5
src/api/surveillance/monitor.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-
+import { MessageBox, Message } from 'element-ui';
 /**
  * 云台控制
  */
@@ -38,12 +38,15 @@ export async function deviceListAPI(params) {
  */
 export async function startPlayback(params) {
   const res = await request.get(`/mms/camera/playback/startPlayback`, {
-    params
+    params,
+    showErrorToast: false
   });
   if (res.data.code == 0) {
     return res.data.data;
+  } else {
+    Message.error('当前摄像头离线!');
   }
-  return Promise.reject(new Error(res.data.message));
+  // return Promise.reject(new Error(res.data.message));
 }
 /**
  * 停止回放
@@ -104,9 +107,9 @@ export async function pushMainStreamAPI(params) {
 }
 //告警录像列表
 export async function recordList(params) {
-  const res = await request.get(`/mms/alarm/record/list`, {params});
+  const res = await request.get(`/mms/alarm/record/list`, { params });
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}