时间表下发

src/views/components/carouselChart.vue

@@ -653,9 +653,10 @@ export default {
       background: rgba(0, 0, 0, 0.5);
       border: none;
       right: 8px;
-      bottom: 16px;
+      bottom: 28px;
       color: #fff;
       z-index: 5;
+      opacity: 0;
       &:hover {
         background: rgba(0, 0, 0, 0.9);
         color: #169e8c;
@@ -666,6 +667,10 @@ export default {
         opacity: 1;
         transition: all 0.5s ease-in;
       }
+      .downBtn {
+        opacity: 1;
+        transition: all 0.5s ease-in;
+      }
     }
     .bigimg {
       width: 100%;

src/views/devicePhotoSchedule/components/setdevice.vue

@@ -57,7 +57,11 @@
           </el-radio-group>
         </div>
       </div>
-      <div class="flexnr" v-loading="loading" v-if="newzzList.length !== 0">
+      <div
+        class="flexnr"
+        v-loading="loading"
+        v-if="newzzList.length !== 0 || loading"
+      >
         <el-tree
           :data="newzzList"
           show-checkbox
@@ -93,7 +97,7 @@
             >
               <!-- <el-tag type="success">下发成功</el-tag> -->
               <el-tag type=""><i class="el-icon-loading"></i>下发中</el-tag>
-              <!-- <el-tag type="danger">下发失败</el-tag> -->
+              <!-- <el-tag type="danger" v-if="zzerror">下发失败</el-tag> -->
             </div>
           </div>
           <span v-else class="custom-tree-node" slot-scope="{ data }">
@@ -139,6 +143,7 @@ export default {
       defaultProps: {
         children: "list",
         label: "name",
+        disabled: this.disabledFn,
       },
       termidArr: [],
       ruleid: "",
@@ -206,7 +211,6 @@ export default {
           console.log(res);
           this.newzzList = res.data.list;
           console.log(this.newzzList);
-
           //console.log(a);
           this.newzzList = this.getChildren(this.newzzList);
           console.log(this.newzzList);
@@ -214,11 +218,21 @@ export default {
         })
         .catch((err) => {});
     },
+    disabledFn(data, node) {
+      if (node.level == 3) {
+        if (!data.onlinestatus) {
+          // 根据自己的节点数据条件设置判断，我只提供了个参考
+          return true;
+        } else {
+          return false;
+        }
+      }
+    },
     // 给数组里的每一个对象都添加一个isEdit属性
     getChildren(data) {
-      console.log(data);
+      //console.log(data);
       return data.map((item) => {
-        console.log(item);
+        //console.log(item);
         item = Object.assign({}, item);
         item.offsetNum = Math.floor(Math.random() * 10);
 
@@ -412,34 +426,37 @@ export default {
 
               // // 将结束日期的天放进数组
               if (!moment().isSame(moment(endDay), "day")) {
-                dayArr.push(
+                // console.log("dayArr最后一天啊");
-                  this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm")
+                // console.log(dayArr);
-                );
+                // console.log(
-              }
+                //   this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm")
-
+                // );
-              console.log(dayArr);
+                // dayArr.push(
-              for (var k = 0; k < dayArr.length; k++) {
+                //   this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm")
-                //console.log(moment(dayArr[k]).hour());
+                // );
-                timearr.push({
-                  hour: moment(dayArr[k]).hour(),
-                  minute: moment(dayArr[k]).minute(),
-                  preset: 255,
-                });
               }
-              // return dayArr;
             }
           }
-
+          //console.log(dayArr);
+          for (var k = 0; k < dayArr.length; k++) {
+            //console.log(moment(dayArr[k]).hour());
+            timearr.push({
+              hour: moment(dayArr[k]).hour(),
+              minute: moment(dayArr[k]).minute(),
+              preset: 255,
+            });
+          }
+          // return dayArr;
           var parmsobj = {
             termid: this.allCheckNode[i].id,
             channelid: this.checkedAisle,
             offset: this.allCheckNode[i].offsetNum,
             list: timearr,
           };
-          console.log(parmsobj);
+          //console.log(parmsobj);
           ruleBox.push(parmsobj);
         }
-        console.log(ruleBox);
+        //console.log(ruleBox);
       }
       setScheduleRulel({
         list: ruleBox,
@@ -490,7 +507,7 @@ export default {
             this.$message.success("下发成功");
             clearInterval(this.timer);
             this.timer = null;
-            this.isShow = false;
+            //this.isShow = false;
             this.sureloading = false;
             this.showtag = false;
           } else if (this.i > 9) {
@@ -499,7 +516,7 @@ export default {
             this.$message.warning("下发失败，请稍后再试！");
             clearInterval(this.timer);
             this.timer = null;
-            this.isShow = false;
+            // this.isShow = false;
             this.showtag = false;
             this.sureloading = false;
           }

src/views/realTimeMonitor/components/setschedule.vue

@@ -1083,7 +1083,11 @@ export default {
               if (
                 this.deviceListData.zzprotocol == "65286" ||
                 this.deviceListData.zzprotocol == "65282" ||
-                this.deviceListData.zzprotocol == "65281"
+                this.deviceListData.zzprotocol == "65280" ||
+                this.deviceListData.zzprotocol == "65296" ||
+                this.deviceListData.zzprotocol == "65281" ||
+                this.deviceListData.zzprotocol == "65284" ||
+                this.deviceListData.zzprotocol == "65285"
               ) {
                 console.log("河南规约");
                 //偏移时间
@@ -1108,9 +1112,15 @@ export default {
 
                 // // 将结束日期的天放进数组
                 if (!moment().isSame(moment(endDay), "day")) {
-                  dayArr.push(
+                  console.log("dayArr最后一天啊");
+                  console.log(dayArr);
+                  console.log(
+                    lastETime,
                     this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm")
                   );
+                  // dayArr.push(
+                  //   this.$moment(new Date(lastETime)).format("YYYY-MM-DD HH:mm")
+                  // );
                 }
 
                 // return dayArr;

vue.config.js

@@ -29,11 +29,11 @@ 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
+        target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },