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(); },