From 4e3bfc986dad99d449b1d33ff506658e1dda1af4 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Sun, 14 May 2023 17:22:51 +0800
Subject: [PATCH] youhua

---
 src/views/components/carouselChart.vue        | 39 +++++++++++--------
 .../components/setschedule.vue                | 25 ++++++++++--
 src/views/realTimeMonitor/index.vue           | 36 +++++++++++++----
 3 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index cd485dd..3c708a5 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -319,31 +319,38 @@ export default {
           height: 100%;
         }
       }
-      .borderActive {
-        border: 3px solid #409eff;
-        &::after {
-          content: "";
-          position: absolute;
-          width: 0;
-          height: 0;
-          left: 50%;
-          top: -16px;
-          margin-left: -8px;
-          border-bottom: 13px solid #409eff;
-          border-left: 8px solid transparent;
-          border-right: 8px solid transparent;
-        }
-      }
       .timeInfo {
         position: absolute;
         bottom: 0px;
         width: 100%;
         background: #f0f0f0;
-        padding: 8px 0px;
+        padding: 6px 0px;
         font-size: 12px;
         text-align: center;
         color: #333;
       }
+      .borderActive {
+        .timeInfo {
+          //background: #409eff;
+          background: linear-gradient(180deg, #00eaff 10%, #409eff 100%);
+          color: #fff;
+        }
+      }
+      // .borderActive {
+      //   border: 3px solid #409eff;
+      //   &::after {
+      //     content: "";
+      //     position: absolute;
+      //     width: 0;
+      //     height: 0;
+      //     left: 50%;
+      //     top: -16px;
+      //     margin-left: -8px;
+      //     border-bottom: 13px solid #409eff;
+      //     border-left: 8px solid transparent;
+      //     border-right: 8px solid transparent;
+      //   }
+      // }
     }
     .arrow {
       position: absolute;
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 233fad3..b8b15d0 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -125,7 +125,16 @@
               </el-descriptions>
               <h3>时间表规则</h3>
               <p class="timename">时间表名称：{{ timeName }}</p>
-              <el-descriptions
+              <p
+                class="timeGz"
+                v-for="(val, index) in scheduleInfo"
+                :key="index"
+              >
+                <span>{{ val.startTime }}</span> ~
+                <span>{{ val.endTime }}</span>
+                间隔：<el-tag>{{ val.span }}分钟</el-tag>
+              </p>
+              <!-- <el-descriptions
                 title=""
                 :column="3"
                 border
@@ -141,7 +150,7 @@
                 <el-descriptions-item label="时间间隔（分）">
                   <el-tag size="small">{{ val.span }}</el-tag>
                 </el-descriptions-item>
-              </el-descriptions>
+              </el-descriptions> -->
 
               <h3>选择通道</h3>
               <div class="checkBox">
@@ -158,7 +167,7 @@
             </div>
           </div>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="isShowset = false">取 消</el-button>
+            <el-button @click="closebtn">取 消</el-button>
             <el-button type="primary" v-debounce="submitForm">确 定</el-button>
           </div>
         </el-dialog>
@@ -380,6 +389,10 @@ export default {
       //     this.$message.error("添加失败");
       //   });
     },
+    closebtn() {
+      this.isShowset = false;
+      this.deviceList();
+    },
     display() {
       this.isShow = true;
     },
@@ -479,6 +492,12 @@ export default {
       .timename {
         margin: 8px 0px;
       }
+      .timeGz {
+        line-height: 32px;
+        span {
+          margin: 0px 8px;
+        }
+      }
     }
   }
 }
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 4340329..72ff37b 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -56,6 +56,7 @@
           </div>
           <div class="monitorItemBox" v-if="channelOption.length !== 0">
             <h3>选择通道监拍点</h3>
+
             <el-select
               v-model="channelValue"
               placeholder="请选择"
@@ -71,6 +72,21 @@
               >
               </el-option>
             </el-select>
+            <!-- <el-select
+              v-model="channelValue"
+              placeholder="请选择"
+              @change="changeChannelId"
+              ref="multiSelect"
+            >
+              <el-option key="0" label="全部" value="0"></el-option>
+              <el-option
+                v-for="item in channelOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option> -->
+            </el-select>
           </div>
 
           <div class="setTimebtn">
@@ -82,11 +98,11 @@
               <!-- <el-button type="primary" v-debounce="handleShowPic"
                 >手动拍照</el-button
               > -->
-              <el-dropdown @command="handleCommandpic">
+              <el-dropdown trigger="click" @command="handleCommandpic">
                 <el-button type="primary">
                   手动拍照<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
+                <el-dropdown-menu slot="dropdown" class="picdropStyle">
                   <el-dropdown-item
                     :command="item.value"
                     v-for="(item, index) in channelOption"
@@ -95,11 +111,11 @@
                   >
                 </el-dropdown-menu>
               </el-dropdown>
-              <el-dropdown @command="handleCommandvideo">
+              <el-dropdown trigger="click" @command="handleCommandvideo">
                 <el-button type="primary">
                   手动拍视频<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
+                <el-dropdown-menu slot="dropdown" class="videodropStyle">
                   <el-dropdown-item
                     :command="item.value"
                     v-for="(item, index) in channelOption"
@@ -126,7 +142,7 @@
                 <el-button type="primary">
                   GPS开关<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
+                <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
                   <el-dropdown-item command="open">开启GPS</el-dropdown-item>
                   <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
                 </el-dropdown-menu>
@@ -583,8 +599,8 @@ export default {
 <style lang="less">
 .monitorBox {
   width: calc(100% - 0px);
-  height: calc(100% - 16px);
-  padding: 16px 0px 0px 0px;
+  height: calc(100% - 12px);
+  padding: 12px 0px 0px 0px;
   background: #ffffff;
   .monitor-container {
     display: flex;
@@ -705,4 +721,10 @@ export default {
 .el-loading-mask {
   z-index: 9999;
 }
+.picdropStyle,
+.videodropStyle,
+.gpsdropStyle {
+  width: 104px;
+  margin-top: 0px !important;
+}
 </style>