From c3383e096b5dd50de8f39a5e9707c736174bdd73 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 7 Aug 2023 08:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E8=8B=8F=E8=A7=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/setdevice.vue                  |  5 ++++-
 .../components/setschedule.vue                | 21 +++++++++++++------
 vue.config.js                                 |  6 +++---
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 495aaf2..cb1fc90 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -376,7 +376,10 @@ export default {
               console.log(timearr);
             }
             ////判断河南规约
-            if (this.allCheckNode[i].protocol == "65286") {
+            if (
+              this.allCheckNode[i].protocol == "65286" ||
+              this.allCheckNode[i].protocol == "65282"
+            ) {
               console.log("河南规约");
               //偏移时间
               //this.getDayArr(startDay, endDay);
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 6e5432f..c8f6793 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -58,7 +58,7 @@
                     >{{ val.substring(val.length - 5) }}</el-tag
                   >
                   <el-tag
-                    v-if="timeProtocol == '65286'"
+                    v-if="timeProtocol == '65286' || timeProtocol == '65282'"
                     class="mr10 mt10"
                     size="mini"
                     v-for="(val, index) in this.shedulenr"
@@ -85,7 +85,7 @@
                     >{{ val.substring(val.length - 5) }}</el-tag
                   >
                   <el-tag
-                    v-if="timeProtocol == '65286'"
+                    v-if="timeProtocol == '65286' || timeProtocol == '65282'"
                     class="mr10 mt10"
                     size="mini"
                     v-for="(val, index) in this.newshedulenr"
@@ -462,7 +462,10 @@ export default {
                 }
               }
               //河南规约
-              if (this.timeProtocol == "65286") {
+              if (
+                this.timeProtocol == "65286" ||
+                this.timeProtocol == "65282"
+              ) {
                 console.log("河南规约");
                 var hnarr = [];
                 for (var i = 0; i < this.shedulenr.length; i++) {
@@ -571,7 +574,7 @@ export default {
             }
           }
           //河南规约
-          if (this.timeProtocol == "65286") {
+          if (this.timeProtocol == "65286" || this.timeProtocol == "65282") {
             console.log("河南规约");
             var hnarr = [];
             for (var i = 0; i < this.shedulenr.length; i++) {
@@ -704,7 +707,10 @@ export default {
                 }
               }
               //河南规约
-              if (this.timeProtocol == "65286") {
+              if (
+                this.timeProtocol == "65286" ||
+                this.timeProtocol == "65282"
+              ) {
                 console.log("河南规约");
                 var hnarr = [];
                 for (var i = 0; i < this.newshedulenr.length; i++) {
@@ -1036,7 +1042,10 @@ export default {
             }
 
             ////判断河南规约
-            if (this.deviceListData.zzprotocol == "65286") {
+            if (
+              this.deviceListData.zzprotocol == "65286" ||
+              this.timeProtocol == "65282"
+            ) {
               console.log("河南规约");
               //偏移时间
               //this.getDayArr(startDay, endDay);
diff --git a/vue.config.js b/vue.config.js
index 31ee2c5..2d81f4c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,11 +29,11 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        target: "http://47.96.238.157:8093", //阿里云服务器环境
-        // target: "http://180.166.218.222:40080", //dell
+        //target: "http://47.96.238.157:8093", //阿里云服务器环境
+        target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },