diff --git a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
index 362f6c7..264daee 100644
--- a/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
+++ b/src/views/realTimeMonitor/components/ptzDevice/components/setTime.vue
@@ -58,7 +58,14 @@
           <ul>
             <li v-for="(time, index) in timeList" :key="index">
               {{ formatTime(time) }}
+
               <el-input
+                v-if="
+                  deviceData.protocol == '65283' &&
+                  deviceData.protocol == '65285' &&
+                  deviceData.protocol == '65290' &&
+                  deviceData.protocol == '65298'
+                "
                 v-model="selectedValues[index]"
                 placeholder="请输入"
               ></el-input>
@@ -67,7 +74,7 @@
           <div class="tagsBox" v-if="deviceTimeList.length !== 0">
             <el-tag v-for="(item, index) in deviceTimeList" :key="index"
               >时间点：{{ $moment(item).format("HH:mm") }} + 预置位:
-              {{ item.preset }}</el-tag
+              {{ item.preset || 255 }}</el-tag
             >
           </div>
         </div>
@@ -196,51 +203,113 @@ export default {
               value: this.channelVal,
             },
           ];
-          let group = this.timeparams.length;
-          params.push({
-            name: "group",
-            value: group,
-          });
-          for (let m = 0; m < this.timeparams.length; m++) {
-            console.log(this.timeparams[m].time);
-            let time = this.$moment(this.timeparams[m].time, "HH:mm"); // 使用 moment 库解析时间点
-            console.log(time);
-            params.push(
-              {
-                name: "hour" + (m + 1),
-                value: time.hour(),
-              },
-              {
-                name: "min" + (m + 1),
-                value: time.minute(),
-              },
-              {
-                name: "preset" + (m + 1),
-                value: this.timeparams[m].preset,
-              }
+
+          if (
+            this.deviceData.protocol == "65283" ||
+            this.deviceData.protocol == "65285" ||
+            this.deviceData.protocol == "65290" ||
+            this.deviceData.protocol == "65298"
+          ) {
+            //我是时间间隔
+            let timeArr = [];
+            console.log("我是其它，时间间隔");
+            console.log(this.timeValue);
+            console.log(this.timeNum);
+            var Stime = this.$moment(this.timeValue[0], "HH:mm").format(
+              "YYYY-MM-DD HH:mm:ss"
             );
-          }
-          console.log(params);
-          let timeArrList = [];
-          for (var k = 0; k < this.timeparams.length; k++) {
-            //console.log(moment(dayArr[k]).hour());
-            console.log(this.timeparams[k].time);
-            let time = this.$moment(this.timeparams[k].time, "HH:mm"); // 使用 moment 库解析时间点
-            console.log(time);
-            timeArrList.push({
-              hour: time.hour(),
-              minute: time.minute(),
-              preset: this.timeparams[k].preset,
+            //结束时间不添加偏移量
+            var Etime = this.$moment(this.timeValue[1], "HH:mm").format(
+              "YYYY-MM-DD HH:mm:ss"
+            );
+            var spanTime = this.timeNum;
+            let fistSpan = this.$moment(new Date())
+              .startOf("day")
+              .minutes(spanTime)
+              .format("YYYY-MM-DD HH:mm:ss");
+            timeArr.push(fistSpan, Stime, Etime);
+            console.log(timeArr);
+            let group = timeArr.length;
+            params.push({
+              name: "group",
+              value: group,
+            });
+            let timeArrList = [];
+            for (var k = 0; k < timeArr.length; k++) {
+              //console.log(moment(dayArr[k]).hour());
+              timeArrList.push({
+                hour: this.$moment(timeArr[k]).hour(),
+                minute: this.$moment(timeArr[k]).minute(),
+                preset: 255,
+              });
+            }
+            console.log(timeArrList);
+            for (let m = 0; m < timeArrList.length; m++) {
+              console.log(timeArrList[m]);
+              params.push(
+                {
+                  name: "hour" + (m + 1),
+                  value: timeArrList[m].hour,
+                },
+                {
+                  name: "min" + (m + 1),
+                  value: timeArrList[m].minute,
+                },
+                {
+                  name: "preset" + (m + 1),
+                  value: timeArrList[m].preset,
+                }
+              );
+            }
+          } else {
+            let group = this.timeparams.length;
+            params.push({
+              name: "group",
+              value: group,
             });
+            //时间点下发拍照时间表
+            for (let m = 0; m < this.timeparams.length; m++) {
+              console.log(this.timeparams[m].time);
+              let time = this.$moment(this.timeparams[m].time, "HH:mm"); // 使用 moment 库解析时间点
+              console.log(time);
+              params.push(
+                {
+                  name: "hour" + (m + 1),
+                  value: time.hour(),
+                },
+                {
+                  name: "min" + (m + 1),
+                  value: time.minute(),
+                },
+                {
+                  name: "preset" + (m + 1),
+                  value: this.timeparams[m].preset,
+                }
+              );
+            }
+            console.log(params);
+            let timeArrList = [];
+            for (var k = 0; k < this.timeparams.length; k++) {
+              //console.log(moment(dayArr[k]).hour());
+              console.log(this.timeparams[k].time);
+              let time = this.$moment(this.timeparams[k].time, "HH:mm"); // 使用 moment 库解析时间点
+              console.log(time);
+              timeArrList.push({
+                hour: time.hour(),
+                minute: time.minute(),
+                preset: this.timeparams[k].preset,
+              });
+            }
+            console.log(timeArrList);
+            var parmsobj = {
+              termid: this.deviceData.id,
+              channelid: this.channelVal,
+              list: timeArrList,
+            };
           }
-          console.log(timeArrList);
-          var parmsobj = {
-            termid: this.deviceData.id,
-            channelid: this.channelVal,
-            list: timeArrList,
-          };
-          console.log(parmsobj);
-          //this.setTimeRuleJava(parmsobj); //使用java接口调用下发时间表
+
+          console.log(params);
+
           this.setTermFnRule(params);
         } else {
           this.sureloading = false;
@@ -365,6 +434,7 @@ export default {
           }
         });
     },
+    //获取时间表
     getinfo() {
       getTermCameraRequest({ requestid: this.requestid })
         .then((res) => {
@@ -374,8 +444,8 @@ export default {
             this.deviceTimer = null;
             this.attemptCount = 0; // 重置尝试次数计数器
             console.log(JSON.parse(res.data.data));
-            this.deviceTimeList = JSON.parse(res.data.data).groupData;
-            //this.processingData(JSON.parse(res.data.data).groupData); //执行数据转化
+            //this.deviceTimeList = JSON.parse(res.data.data).groupData;
+            this.processingData(JSON.parse(res.data.data).groupData); //执行数据转化
 
             this.$message({
               duration: 1500,
@@ -401,6 +471,97 @@ export default {
         })
         .catch((err) => {});
     },
+    //根据规约处理时间表数据
+    processingData(val) {
+      console.log(this.deviceData.protocol);
+      if (
+        this.deviceData.protocol == "65283" ||
+        this.deviceData.protocol == "65285" ||
+        this.deviceData.protocol == "65290" ||
+        this.deviceData.protocol == "65298"
+      ) {
+        //湖南规约
+        console.log("湖南");
+        console.log(val);
+        var hnarr = [];
+        for (var i = 0; i < val.length; i++) {
+          if (i % 3 == 0) {
+            var hnobj = {};
+            hnobj.span = val[i].hour * 60 + val[i].minute;
+            console.log("时间间隔");
+          } else if (i % 3 == 1) {
+            console.log("开始时间");
+            console.log("a");
+            hnobj.startTime = this.$moment(val[i]).format("HH:mm");
+          } else if (i % 3 == 2) {
+            console.log("结束时间");
+            hnobj.endTime = this.$moment(val[i]).format("HH:mm");
+            hnarr.push(hnobj);
+          }
+        }
+        console.log("222222222222222222");
+        console.log(hnarr);
+        console.log("22222222222222222222222");
+        let dayArr = [];
+        //根据开始时间结束时间生产数组
+        for (let k = 0; k < hnarr.length; k++) {
+          console.log(hnarr[k].startTime);
+          console.log(hnarr[k].endTime);
+          console.log(hnarr[k].span);
+          let Stime = this.$moment(hnarr[k].startTime, "HH:mm").format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+
+          let Etime = this.$moment(hnarr[k].endTime, "HH:mm").format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+          let spanTime = hnarr[k].span;
+          if (this.$moment(Etime).isBefore(this.$moment(Stime))) {
+            let zeroEnd = this.$moment("23:59", "HH:mm").format(
+              "YYYY-MM-DD HH:mm:ss"
+            );
+            let zeroStart = this.$moment("00:00", "HH:mm").format(
+              "YYYY-MM-DD HH:mm:ss"
+            );
+            while (
+              this.$moment(Stime).isBefore(this.$moment(zeroEnd)) ||
+              this.$moment(Stime).isSame(this.$moment(zeroEnd))
+            ) {
+              dayArr.push(Stime);
+              Stime = this.$moment(Stime)
+                .add(spanTime, "minute")
+                .format("YYYY-MM-DD HH:mm:ss");
+            }
+            while (
+              this.$moment(zeroStart).isBefore(this.$moment(Etime)) ||
+              this.$moment(zeroStart).isSame(this.$moment(Etime))
+            ) {
+              dayArr.push(zeroStart);
+              zeroStart = this.$moment(zeroStart)
+                .add(spanTime, "minute")
+                .format("YYYY-MM-DD HH:mm:ss");
+            }
+          } else {
+            while (
+              this.$moment(Stime).isBefore(this.$moment(Etime)) ||
+              this.$moment(Stime).isSame(this.$moment(Etime))
+            ) {
+              dayArr.push(Stime);
+              Stime = this.$moment(Stime)
+                .add(spanTime, "minute")
+                .format("YYYY-MM-DD HH:mm:ss");
+            }
+          }
+
+          // // 将结束日期的天放进数组
+          console.log(dayArr);
+        }
+        this.deviceTimeList = [...new Set(dayArr)];
+      } else {
+        //其他规约
+        this.deviceTimeList = val;
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 57e75b6..86ddede 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -796,8 +796,8 @@ export default {
             list: timeArrList,
           };
           console.log(parmsobj);
-          this.setTimeRuleJava(parmsobj); //使用java接口调用下发时间表
-          //this.setTermFnRule(params);
+          //this.setTimeRuleJava(parmsobj); //使用java接口调用下发时间表
+          this.setTermFnRule(params);
         } else {
           this.sureloading = false;
           this.$message({