From ddf5b860fc5877004c9ed00be3c6b428e75d3627 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Fri, 22 Dec 2023 16:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8C=BB=E6=8A=A4=E9=9A=8F?=
 =?UTF-8?q?=E8=BA=AB=E6=8A=A5=E8=AD=A6=E8=A7=86=E9=A2=91=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=92=8C=E5=88=86=E5=B1=8F=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/login/userlogin.vue            |  4 ++--
 src/views/alarmcenter/sosAlarm/list.vue | 13 +++++++++++--
 src/views/h5Player/player.vue           | 12 +++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index bb4efd7..d5649d0 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -88,9 +88,9 @@
           //角色ID
           roleId: "",
           //用户名
-          username: "admin",
+          username: "",
           //密码
-          password: "admin",
+          password: "",
           //账号类型
           type: "account",
           //验证码的值
diff --git a/src/views/alarmcenter/sosAlarm/list.vue b/src/views/alarmcenter/sosAlarm/list.vue
index b8c6e55..4349c00 100644
--- a/src/views/alarmcenter/sosAlarm/list.vue
+++ b/src/views/alarmcenter/sosAlarm/list.vue
@@ -256,6 +256,15 @@ export default {
     
     // 视频联动按钮
     linkVideo(row) {
+      // const routeData = this.$router.resolve({
+      //                     path: '/videoPlayer', // 跳转的路径
+      //                     query: {
+      //                       list: JSON.stringify([{name:'',code:'dbf18d6e8b524c3d8864ee10cda0d97b'},{name:'',code:'20d08356435647ac8b557876d80d991f'}]), // 携带的的参数信息
+      //                       showLeft:false
+      //                     }
+      //                   })
+      // window.open(routeData.href, '_blank')
+      // return
       let token = window.sessionStorage.getItem('bizToken');
       if (token == 'undefined' || !token) {
         bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
@@ -287,7 +296,7 @@ export default {
                           path: '/videoPlayer', // 跳转的路径
                           query: {
                             list: JSON.stringify(this.carmeraCode), // 携带的的参数信息
-                            showLeft:true
+                            showLeft:false
                           }
                         })
                         console.log('href ===>',routeData.href)
@@ -431,7 +440,7 @@ export default {
                     path: '/videoPlayer', // 跳转的路径
                     query: {
                       list: JSON.stringify(this.carmeraCode), // 携带的的参数信息
-                      showLeft:true
+                      showLeft:false
                     }
                   })
                   console.log('href ===>',routeData.href)
diff --git a/src/views/h5Player/player.vue b/src/views/h5Player/player.vue
index 99ade46..238c238 100644
--- a/src/views/h5Player/player.vue
+++ b/src/views/h5Player/player.vue
@@ -174,7 +174,8 @@ export default {
     // // console.log('list ===============>',JSON.parse(this.$route.query.list), this.$route.query.showLeft)
     // // console.log('list ===>',this.list)
     this.showLeft = this.$route.query.showLeft
-    if(this.showLeft){
+    console.log(this.showLeft)
+    if(this.showLeft == 'true'){
       this.code = JSON.parse(this.$route.query.list);
       this.cameraList = []
       if(this.code != ''){
@@ -379,14 +380,7 @@ export default {
       });
       //   _this.realplay();
       console.log('length ===>',this.cameraList.length)
-      this.splitNum =
-        this.cameraList.length > 1
-        ? 2
-        : this.cameraList.length > 4
-        ? 3
-        : this.cameraList.length > 9
-        ? 4
-        : 2;
+      this.splitNum = this.cameraList.length > 9 ? 4 : this.cameraList.length > 4 ? 3 : this.cameraList.length > 1 ? 2 : 1;
       this.arrangeWindow()
       this.queryLive();
     },