From 58bf48cea61c6c5b4381a4b8ff5b4a39eb4671eb Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期五, 10 六月 2022 09:36:03 +0800
Subject: [PATCH] 国标摄像机信息接口
---
src/pages/desktop/index/App.vue | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 235097f..9540159 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -103,16 +103,11 @@
});
},
methods: {
-<<<<<<< HEAD
- quit(){
- this.$refs.tools.toLogout()
+ quit() {
+ this.$refs.tools.toLogout();
},
- onJumpToDock(name){
- this.$refs.dock_model.onJumpToDock(name)
-=======
onJumpToDock(name) {
this.$refs.dock_model.onJumpToDock(name);
->>>>>>> ca43456ba7e5a27fdeaebb8293ddda90962ac42e
},
onChangeBg(v) {
document.getElementById("app").style.backgroundImage = "url(" + v + ")";
--
Gitblit v1.8.0