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
>
@@ -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();
+ },
};
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)' : ''
+ "
>
@@ -228,6 +237,12 @@ export default {
}
}
}
+ .timeGz {
+ line-height: 32px;
+ span {
+ margin: 0px 8px;
+ }
+ }
}
}
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 @@
@@ -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 @@
+ {{ val.startTime }} ~
+ {{ val.endTime }}
+ 间隔: