From 60af3d61004000ea589f5e6c3e17ca7ab450b795 Mon Sep 17 00:00:00 2001 From: hanbaoshan <hanbaoshan@aiotlink.com> Date: 星期四, 03 九月 2020 18:01:52 +0800 Subject: [PATCH] 统计查询查找此人第二次查找同一条数据无响应的问题修复,应用最大化后不显示横向滚动条的bug修复 --- src/pages/desktop/index/store/modules/desktop.js | 2 +- vue.config.js | 4 ++-- src/pages/cameraAccess/index/App.vue | 1 - src/pages/desktop/index/components/DFrame.vue | 5 +++-- src/components/subComponents/CardItem.vue | 7 ++++--- src/pages/cameraAccess/index/VideoManage.vue | 2 +- src/components/searching/UploadImg.vue | 6 +++++- src/pages/cameraAccess/components/DataStackInfo.vue | 1 + 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/searching/UploadImg.vue b/src/components/searching/UploadImg.vue index 669c582..04ce4a3 100644 --- a/src/components/searching/UploadImg.vue +++ b/src/components/searching/UploadImg.vue @@ -6,7 +6,7 @@ <i class="iconfont iconchushaixuanxiang close" style="margin-left:200px;cursor:pointer;color:#ccc" - @click="VideoPhotoData.uploadDiaplay = false" + @click="closeUploadImg" ></i> </h2> <p class="compearValue"> @@ -171,6 +171,10 @@ }) }, methods: { + closeUploadImg() { + console.log(location.href) + this.VideoPhotoData.uploadDiaplay = false + }, selectChange() { if (!this.compareTabs.includes("esData") && this.compareTabs.length > 0) { for (let i = 0; i < this.VideoPhotoData.tabsForUploadImg.length; i++) { diff --git a/src/components/subComponents/CardItem.vue b/src/components/subComponents/CardItem.vue index d57617e..ea7c753 100644 --- a/src/components/subComponents/CardItem.vue +++ b/src/components/subComponents/CardItem.vue @@ -564,15 +564,16 @@ }, tosearch(item) { console.log('search') + console.log(location.href) let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id let imgUrl = item.targetInfo ? item.targetInfo[0].picSmUrl : item.baseInfo[0].targetPicUrl let compType = 1 // 鏁版嵁鏉ヨ嚜浜巈s if (!item.id || item.id == "") { compType = 0 // 鏁版嵁鏉ヨ嚜浜庡簳搴� } - // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType) - - let message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType; + + let message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType + '×tamp=' + new Date().getTime(); + //let message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType; window.parent.postMessage({ msg: message }, "*") diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue index af2cfef..fe622ac 100644 --- a/src/pages/cameraAccess/components/DataStackInfo.vue +++ b/src/pages/cameraAccess/components/DataStackInfo.vue @@ -396,6 +396,7 @@ }, mounted() { this.initFormData(); + console.log(this.PollData.barCharts) }, beforeDestroy() { this.taskUid = 0; diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue index bf4b566..6a5120d 100644 --- a/src/pages/cameraAccess/index/App.vue +++ b/src/pages/cameraAccess/index/App.vue @@ -77,7 +77,6 @@ background-color: #fff; box-sizing: border-box; overflow-y: hidden; - height: 100%; min-width: 1433px; } diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue index 2cba6b9..8e26bfc 100644 --- a/src/pages/cameraAccess/index/VideoManage.vue +++ b/src/pages/cameraAccess/index/VideoManage.vue @@ -288,7 +288,7 @@ .video-tab > .el-tabs__content { width: 100%; //margin-top: 52px; - height: calc(100% - 78px); + height: calc(100% - 36px); box-sizing: border-box; overflow-y: auto; padding: 0; diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue index a2b3021..316ba97 100644 --- a/src/pages/desktop/index/components/DFrame.vue +++ b/src/pages/desktop/index/components/DFrame.vue @@ -365,9 +365,10 @@ height: calc(100% - 30px); border-radius: 0 0 4px 4px; background-color: #fff; - } - +.d-frame-full .d-frame-content{ + height: calc(100% - 71px); +} .d-frame-content iframe { width: 100%; height: 100%; diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js index 75911bc..6ab8f37 100644 --- a/src/pages/desktop/index/store/modules/desktop.js +++ b/src/pages/desktop/index/store/modules/desktop.js @@ -105,7 +105,7 @@ let ratio = curDframe.width/curDframe.height; if(curDframe.name == 'cameraAccess' || curDframe.name == 'dataStack' || curDframe.name == 'library' || curDframe.name == 'analysisPower' || curDframe.name == 'cameraVideo'){ //澶勭悊瀵屼綑楂樺害澶т簬140鐨勭獥鍙� - if(window.screen.availHeight - curDframe.height > 120){ + if(window.screen.availHeight - curDframe.height > 140){ dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height - 50; dframe.width = dframe.height*ratio; } diff --git a/vue.config.js b/vue.config.js index 8450c82..5bb12ea 100644 --- a/vue.config.js +++ b/vue.config.js @@ -50,8 +50,8 @@ }, "/api-v": { //target: 'http://192.168.20.145:8000', - target: 'http://192.168.5.22:30102', - //target: 'http://192.168.20.10:8000', + //target: 'http://192.168.5.22:30102', + target: 'http://192.168.20.10:8000', changeOrigin: true }, "/api-f": { -- Gitblit v1.8.0