From 2f54c610a0d4b3e6572e8f5a9fc51641777ed2ea Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 21 Mar 2024 16:30:36 +0800
Subject: [PATCH] youhua

---
 .../components/parameterSetDialog.vue         | 35 ++++++----------
 .../components/setschedule.vue                | 41 ++++++++++---------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index 5166184..bad4234 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -839,20 +839,11 @@ export default {
     };
     let validateIPAddress = (rule, value, callback) => {
       let regexp =
-        /^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$/;
-      let valdata = value.split(",");
-      let isCorrect = true;
-      if (valdata.length) {
-        for (let i = 0; i < valdata.length; i++) {
-          if (regexp.test(valdata[i]) == false) {
-            isCorrect = false;
-          }
-        }
-      }
-      if (value == "") {
-        return callback(new Error("请输入iP地址"));
-      } else if (!isCorrect) {
-        callback(new Error("请输入正确对ip地址"));
+        /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+      if (value === "") {
+        return callback(new Error("请输入IP地址"));
+      } else if (!regexp.test(value)) {
+        return callback(new Error("请输入正确的IP地址"));
       } else {
         callback();
       }
@@ -915,14 +906,14 @@ export default {
         componentId: "",
       },
       zjidrules: {
-        // newCmdId: [
-        //   { required: true, message: "请输入CMD_ID", trigger: "blur" },
-        //   { validator: validCmid, trigger: "blur" },
-        // ],
-        // componentId: [
-        //   { required: true, message: "请输入杆塔ID", trigger: "blur" },
-        //   { validator: validCmid, trigger: "blur" },
-        // ],
+        newCmdId: [
+          { required: true, message: "请输入CMD_ID", trigger: "blur" },
+          { validator: validCmid, trigger: "blur" },
+        ],
+        componentId: [
+          { required: true, message: "请输入杆塔ID", trigger: "blur" },
+          { validator: validCmid, trigger: "blur" },
+        ],
       },
       //id参数
       idParameter: {
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index f3ea624..8002f66 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -327,7 +327,8 @@ export default {
           this.offsetNumTime = res.data.offset;
           if (
             this.areaData.protocol == "65283" ||
-            this.areaData.protocol == "65285"
+            this.areaData.protocol == "65285" ||
+            this.areaData.protocol == "65290"
           ) {
             //湖南规约
             console.log("湖南");
@@ -527,7 +528,8 @@ export default {
       console.log(this.areaData.protocol);
       if (
         this.areaData.protocol == "65283" ||
-        this.areaData.protocol == "65285"
+        this.areaData.protocol == "65285" ||
+        this.areaData.protocol == "65290"
       ) {
         //湖南规约
         console.log("湖南");
@@ -687,7 +689,8 @@ export default {
             console.log(Stime, Etime, spanTime);
             if (
               this.areaData.protocol == "65283" ||
-              this.areaData.protocol == "65285"
+              this.areaData.protocol == "65285" ||
+              this.areaData.protocol == "65290"
             ) {
               //湖南
               console.log("湖南", scheduleTimeList.length);
@@ -701,27 +704,27 @@ export default {
               console.log(timeArr);
             } else {
               //其他规约
-              if (this.$moment(Stime).isBefore(this.$moment(Etime))) {
-                timeArr.push(Stime);
-                Stime = this.$moment(Stime)
-                  .add(spanTime, "minute")
-                  .format("YYYY-MM-DD HH:mm:ss");
-              } else if (this.$moment(Stime).isSame(this.$moment(Etime))) {
-                // Stime = "";
-                timeArr = [];
-                // Stime = this.$moment(Stime)
-                //   .add(spanTime, "minute")
-                //   .format("YYYY-MM-DD HH:mm:ss");
-              }
-              // while (
-              //   this.$moment(Stime).isBefore(this.$moment(Etime)) ||
-              //   this.$moment(Stime).isSame(this.$moment(Etime))
-              // ) {
+              // if (this.$moment(Stime).isBefore(this.$moment(Etime))) {
               //   timeArr.push(Stime);
               //   Stime = this.$moment(Stime)
               //     .add(spanTime, "minute")
               //     .format("YYYY-MM-DD HH:mm:ss");
+              // } else if (this.$moment(Stime).isSame(this.$moment(Etime))) {
+              //   // Stime = "";
+              //   timeArr = [];
+              //   // Stime = this.$moment(Stime)
+              //   //   .add(spanTime, "minute")
+              //   //   .format("YYYY-MM-DD HH:mm:ss");
               // }
+              while (
+                this.$moment(Stime).isBefore(this.$moment(Etime)) ||
+                this.$moment(Stime).isSame(this.$moment(Etime))
+              ) {
+                timeArr.push(Stime);
+                Stime = this.$moment(Stime)
+                  .add(spanTime, "minute")
+                  .format("YYYY-MM-DD HH:mm:ss");
+              }
             }
           }
           console.log(timeArr);