From b57c0847de2f70784436e9c1e40d02497bdbb366 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 21 Mar 2024 13:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                          | 13 ++++++++-----
 .../realTimeMonitor/components/parameterArea.vue    |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a83ae54..cb9c69e 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -106,10 +106,6 @@ export default {
               index: "/devicePhotoSchedule",
               title: "拍照时间表设置",
             },
-            {
-              index: "/waterMark",
-              title: "水印下发",
-            },
           ],
         },
         {
@@ -138,6 +134,10 @@ export default {
               index: "/globalTools",
               title: "全局设置",
             },
+            {
+              index: "/waterMark",
+              title: "水印下发",
+            },
           ],
         },
       ],
@@ -316,13 +316,16 @@ export default {
     //   this.items = this.items1;
     // }
     if (this.role == 0) {
+      console.log("ssssssssssssssssssssssssssssssssssssssss");
       this.items = this.items;
     } else if (this.role == 1) {
       this.items = this.items1;
-    } else if (this.role !== 0 && this.role !== 1) {
+    } else if (this.role == 2) {
       this.items = this.items2;
     } else if (this.role == 4) {
+      console.log("ssssssssssssssssssssssssssssssssssssssss");
       this.items = this.hnjcitems;
+      console.log("ssssssssssssssssssssssssssssssssssssssss", this.items);
     }
 
     console.log(this.items);
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue
index 213d978..6ed1004 100644
--- a/src/views/realTimeMonitor/components/parameterArea.vue
+++ b/src/views/realTimeMonitor/components/parameterArea.vue
@@ -329,6 +329,7 @@ export default {
     //选择时间
     changedate() {
       console.log(this.dateValue.getTime());
+      this.dateValue = this.dateValue.getTime();
       this.$parent.getPhotoList(
         this.selectChannelValue,
         this.dateValue,