From b56114300f14c1031482d51375516e5f018565ce Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 24 Jul 2023 13:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8B=E5=8F=91=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realTimeMonitor/index.vue | 10 +++++++---
 vue.config.js                       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 51022f9..fe66711 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -641,7 +641,7 @@ export default {
               this.statusTimer = window.setInterval(() => {
                 this.getTakePicStatus(res.data);
                 this.statusNum++;
-              }, 2000);
+              }, 3000);
             })
             .catch((err) => {
               console.log(err); //代码错误、请求失败捕获
@@ -706,7 +706,11 @@ export default {
         .then((res) => {
           console.log(res);
           //res.data  0 状态未知  1 成功 2失败
-          if (res.data.cmaStatus == 0 && this.statusNum >= 5) {
+          if (
+            res.data.cmaStatus == 0 &&
+            res.data.picStatus == false &&
+            this.statusNum >= 5
+          ) {
             this.statusNum = 0;
             clearInterval(this.statusTimer);
             this.statusTimer = null;
@@ -718,7 +722,7 @@ export default {
               message: "下发指令超时，请重试！",
               type: "warning",
             });
-          } else if (res.data.cmaStatus == 1) {
+          } else if (res.data.cmaStatus == 1 || res.data.picStatus == true) {
             this.statusNum = 0;
             this.btnpicloading = false;
             this.btnvideoloading = false;
diff --git a/vue.config.js b/vue.config.js
index 0c32024..2d81f4c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        // target: "http://47.96.238.157:8093", //阿里云服务器环境
+        //target: "http://47.96.238.157:8093", //阿里云服务器环境
         target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {