diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue index 6762f4a..5465150 100644 --- a/src/components/common/Home.vue +++ b/src/components/common/Home.vue @@ -150,6 +150,14 @@ export default { .monitor-container { .sideBar { width: 200px; + .el-tree-node__content { + font-size: 10px !important; + } + .el-tree-node__children { + .el-tree-node__content { + padding-left: 8px !important; + } + } .radioFilter { .refresh { display: none; @@ -169,6 +177,9 @@ export default { } .thumb-example { height: calc(100% - 8px); + .radioBox { + top: -18px; + } .picTop { height: 70%; } diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index b906383..56e08f3 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -140,11 +140,11 @@ export default { }, ], }, - // { - // icon: "el-icon-setting", - // index: "/itOperation", - // title: "运维管理", - // }, + { + icon: "el-icon-setting", + index: "/itOperation", + title: "运维管理", + }, ], items1: [ { diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 917b7e3..9b34377 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -1235,9 +1235,13 @@ export default { this.newshedulenr = []; this.shedulenr = []; this.sureloading = false; - console.log("关闭轮询"); + this.compareloading = false; + + clearInterval(this.timer); clearInterval(this.timers); this.timers = null; + this.timer = null; + console.log("关闭轮询", "loading"); }, }, }; diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index aa27808..25e4f5a 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -306,7 +306,12 @@ title="配置参数" :visible.sync="videoVisible" > - + @@ -315,12 +320,13 @@ - - + +