From b92db2963ccf31b5ff66735f664fffc4ae14f0bc Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Sun, 14 May 2023 15:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Sidebar.vue             | 36 +++++++++----------
 src/views/components/carouselChart.vue        |  3 ++
 src/views/devicePhotoSchedule/index.vue       | 21 +++++++++--
 src/views/pictureRotation/index.vue           |  8 +++--
 .../components/setschedule.vue                | 21 +++++++++--
 src/views/realTimeMonitor/index.vue           |  8 +++--
 src/views/realTimeSearch/index.vue            |  7 +++-
 7 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 0ba890c..e9a3c2f 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -4,7 +4,6 @@
       :default-active="activeIndex"
       class="sidebar-el-menu"
       mode="horizontal"
-      @select="handleSelect"
       router
     >
       <template v-for="item in items">
@@ -61,13 +60,13 @@ export default {
         // },
         {
           icon: "el-icon-camera",
-          index: "realTimeMonitor",
+          index: "/realTimeMonitor",
           title: "实时监控",
         },
 
         {
           icon: "el-icon-film",
-          index: "pictureRotation",
+          index: "/pictureRotation",
           title: "图片轮巡",
         },
         // {
@@ -78,35 +77,34 @@ export default {
 
         {
           icon: "el-icon-search",
-          index: "realTimeSearch",
+          index: "/realTimeSearch",
           title: "实时查询",
         },
         {
           icon: "el-icon-files",
-          index: "property",
+          index: "/property",
           title: "资产管理",
           subs: [
             {
-              index: "lineInformation",
+              index: "/lineInformation",
               title: "线路信息管理",
             },
             {
-              index: "towerInformation",
+              index: "/towerInformation",
               title: "杆塔信息管理",
             },
             {
-              index: "photographicDevice",
+              index: "/photographicDevice",
               title: "拍照装置管理",
             },
 
             {
-              icon: "el-icon-coin",
-              index: "cameraChannel",
+              index: "/cameraChannel",
               title: "通道管理",
             },
             {
               icon: "el-icon-setting",
-              index: "devicePhotoSchedule",
+              index: "/devicePhotoSchedule",
               title: "拍照时间表设置",
             },
             // {
@@ -130,21 +128,19 @@ export default {
       ],
     };
   },
-  mounted() {
-    this.activeIndex = sessionStorage.getItem("keyPath") || "/realTimeMonitor";
-  },
   watch: {
-    activeIndex(newValue) {
-      if (newValuer != this.$route.path) {
-        this.activeIndex = this.$route.path;
-      }
+    $route() {
+      this.setCurrentRoute();
     },
   },
   methods: {
-    handleSelect(keyPath) {
-      sessionStorage.setItem("keyPath", keyPath);
+    setCurrentRoute() {
+      this.activeIndex = this.$route.path; // 通过他就可以监听到当前路由状态并激活当前菜单
     },
   },
+  created() {
+    this.setCurrentRoute();
+  },
 };
 </script>
 
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index c69bd72..cd485dd 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -7,6 +7,9 @@
           bigPicPath.indexOf('nopic') == -1 &&
           bigPicPath.indexOf('videos') == -1
         "
+        :style="
+          bigPicPath ? 'backgroundImage:url(' + bigPicPath + '!128x72)' : ''
+        "
       >
         <img class="animImg" :src="bigPicPath + '!1280x720'" />
         <!-- <p class="mark">
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 2287c50..8e7f968 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -29,9 +29,18 @@
           <el-table-column label="时间表类型" show-overflow-tooltip>
             <template>时间表类型</template>
           </el-table-column>
-          <el-table-column label="时间表规则" width="600">
+          <el-table-column label="时间表规则" width="300">
             <template slot-scope="scope">
-              <ul
+              <p
+                class="timeGz"
+                v-for="(val, index) in scope.row.list"
+                :key="index"
+              >
+                <span>{{ val.startTime }}</span> ~
+                <span>{{ val.endTime }}</span>
+                间隔：<el-tag>{{ val.span }}分钟</el-tag>
+              </p>
+              <!-- <ul
                 class="rulesBox"
                 v-for="(item, value) in scope.row.list"
                 :key="value"
@@ -42,7 +51,7 @@
                   <span>时间间隔（分）:</span>
                   <el-tag>{{ item.span }}</el-tag>
                 </li>
-              </ul>
+              </ul> -->
             </template>
           </el-table-column>
 
@@ -228,6 +237,12 @@ export default {
         }
       }
     }
+    .timeGz {
+      line-height: 32px;
+      span {
+        margin: 0px 8px;
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 7928205..31f6f9a 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -37,7 +37,9 @@
         <viewer
           class="bigpic"
           v-if="!item.path.includes('mp4')"
-          :style="{ backgroundImage: 'url(' + item.path + '!180x160)' }"
+          :style="
+            item.path ? 'backgroundImage:url(' + item.path + '!128x72)' : ''
+          "
         >
           <img :src="item.path + '!1280x720'" />
           <!-- <el-image :src="item.path + '!1280x720'" lazy></el-image> -->
@@ -156,13 +158,13 @@ export default {
         },
       ],
       value: "选项1",
-      page: 0, // 当前页数
+      page: 1, // 当前页数
       pageSize: 4, // 每页数量
       totalPage: 0, //总页数
       total: 0, //总条数
       picList: [], //图片列表数据
       basUrl: "",
-      remainingTime: 0, //剩余时间
+      remainingTime: 15, //剩余时间
       isRuning: false,
       timer: null,
       loading: false,
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index 75b9586..233fad3 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -50,9 +50,18 @@
             <el-table-column label="时间表类型" show-overflow-tooltip>
               <template>时间表类型</template>
             </el-table-column>
-            <el-table-column label="时间表规则" width="600">
+            <el-table-column label="时间表规则" width="300">
               <template slot-scope="scope">
-                <ul
+                <p
+                  class="timeGz"
+                  v-for="(val, index) in scope.row.list"
+                  :key="index"
+                >
+                  <span>{{ val.startTime }}</span> ~
+                  <span>{{ val.endTime }}</span>
+                  间隔：<el-tag>{{ val.span }}分钟</el-tag>
+                </p>
+                <!-- <ul
                   class="rulesBox"
                   v-for="(item, value) in scope.row.list"
                   :key="value"
@@ -63,7 +72,7 @@
                     <span>时间间隔（分）:</span>
                     <el-tag>{{ item.span }}</el-tag>
                   </li>
-                </ul>
+                </ul> -->
               </template>
             </el-table-column>
 
@@ -445,6 +454,12 @@ export default {
         }
       }
     }
+    .timeGz {
+      line-height: 32px;
+      span {
+        margin: 0px 8px;
+      }
+    }
   }
 }
 .setRoadDialog {
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index b47630e..4340329 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -77,7 +77,7 @@
             <h3>操作项</h3>
             <div class="buttonGroup">
               <el-button type="primary" @click.native.stop="handleSetSchedule()"
-                >时间表设置</el-button
+                >拍照时间表设置</el-button
               >
               <!-- <el-button type="primary" v-debounce="handleShowPic"
                 >手动拍照</el-button
@@ -90,6 +90,7 @@
                   <el-dropdown-item
                     :command="item.value"
                     v-for="(item, index) in channelOption"
+                    :key="index"
                     >{{ item.label }}</el-dropdown-item
                   >
                 </el-dropdown-menu>
@@ -102,6 +103,7 @@
                   <el-dropdown-item
                     :command="item.value"
                     v-for="(item, index) in channelOption"
+                    :key="index"
                     >{{ item.label }}</el-dropdown-item
                   >
                 </el-dropdown-menu>
@@ -445,7 +447,7 @@ export default {
       })
         .then((res) => {
           this.$message({
-            message: "自动拍照请求成功！",
+            message: "手动拍照请求成功！",
             type: "success",
           });
           console.log(res);
@@ -473,7 +475,7 @@ export default {
       })
         .then((res) => {
           this.$message({
-            message: "自动拍视频请求成功！",
+            message: "手动拍视频请求成功！",
             type: "success",
           });
           console.log(res);
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index dfaa884..01e24b4 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -283,10 +283,15 @@ export default {
       .el-card__body {
         padding: 0px;
       }
+      .bigpic {
+        width: 100%;
+        height: 100%;
+        background-size: 100% 100%;
+      }
       img {
         cursor: pointer;
         width: 100%;
-        //height: 100%;
+        height: 100%;
       }
 
       .caption {