From 9726a6095105d7a1d9c541117e44c42fd5d7f0aa Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 10 八月 2020 10:36:47 +0800
Subject: [PATCH] 应用窗口初始化宽高更新
---
src/pages/ai/index/App.vue | 1 +
src/pages/cameraAccess/index/App.vue | 2 +-
src/pages/desktop/index/components/ToolsEntry.vue | 1 -
src/pages/desktop/index/components/DFrame.vue | 1 -
src/pages/cameraVideo/index/Video.vue | 2 +-
src/pages/desktop/index/mock/userData.json | 32 ++++++++++++++++----------------
src/pages/search/index/App.vue | 2 +-
7 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index c01d1f3..a346f5b 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -1866,6 +1866,7 @@
transform: translate(-50%, -50%);
}
.baseImg {
+ width: 80%;
position: absolute;
top: 50%;
left: 50%;
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index d320c13..5021d75 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -43,7 +43,7 @@
this.screenHeight = document.documentElement.clientHeight;
})();
};
- debugger
+
this.leftWith = this.$refs['left'].offsetWidth;
},
methods: {
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 789a470..51785be 100644
--- a/src/pages/cameraVideo/index/Video.vue
+++ b/src/pages/cameraVideo/index/Video.vue
@@ -555,7 +555,7 @@
.monitoring-right {
width: 100%;
height: 100%;
- min-width: 1243px;
+ min-width: 981px;
//float: right;
box-sizing: border-box;
padding: 10px;
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 66e5497..fe7257e 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -101,7 +101,6 @@
this.fullScreen = !this.fullScreen;
},
frameClick(e) {
- debugger
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index b343653..a18dc4f 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -60,7 +60,6 @@
title: dock.title,
url: dock.url
});
- debugger
this.$store.commit('desktop/addMinDock', {
id: dock.id,
src: dock.src,
diff --git a/src/pages/desktop/index/mock/userData.json b/src/pages/desktop/index/mock/userData.json
index 0f11644..733ef60 100644
--- a/src/pages/desktop/index/mock/userData.json
+++ b/src/pages/desktop/index/mock/userData.json
@@ -12,7 +12,7 @@
"url": "/view/gb28181",
"title": "GB28181閰嶇疆",
"width": 600,
- "height": 700
+ "height": 670
},
{
"id": "12",
@@ -22,8 +22,8 @@
"type": "2",
"url": "/view/cameraVideo",
"title": "瀹炴椂鐩戞帶",
- "width": 1465,
- "height": 763
+ "width": 1328,
+ "height": 670
},
{
"id": "9",
@@ -34,7 +34,7 @@
"url": "/view/ai",
"title": "搴旂敤涓績",
"width": 1243,
- "height": 766
+ "height": 670
},
{
"id": "1",
@@ -44,8 +44,8 @@
"type": "2",
"url": "/view/cameraAccess",
"title": "鎽勫儚鏈洪厤缃�",
- "width": 1300,
- "height": 770
+ "width": 1200,
+ "height": 670
},
{
"id": "2",
@@ -55,8 +55,8 @@
"type": "2",
"url": "/view/cameraAccess?dataStack=1",
"title": "鏁版嵁鏍堥厤缃�",
- "width": 1300,
- "height": 770
+ "width": 1200,
+ "height": 670
},
{
"id": "4",
@@ -77,8 +77,8 @@
"type": "2",
"url": "/view/library",
"title": "姣斿搴撶鐞�",
- "width": 1542,
- "height": 750
+ "width": 1200,
+ "height": 670
},
{
"id": "11",
@@ -88,8 +88,8 @@
"type": "2",
"url": "/view/analysisPower",
"title": "绠楀姏绠＄悊",
- "width": 1669,
- "height": 800
+ "width": 1200,
+ "height": 670
},
{
"id": "13",
@@ -99,7 +99,7 @@
"type": "2",
"url": "/view/search",
"title": "缁熻鏌ヨ",
- "width": 1410,
+ "width": 1344,
"height": 675
},
{
@@ -110,7 +110,7 @@
"type": "2",
"url": "/view/syslog",
"title": "鏃ュ織绠＄悊",
- "width": 1246,
+ "width": 1200,
"height": 590
},
{
@@ -121,8 +121,8 @@
"type": "2",
"url": "/view/settings",
"title": "绯荤粺璁剧疆",
- "width": 1450,
- "height": 808
+ "width": 1200,
+ "height": 650
},
{
"id": "18",
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index 13ae06d..28355b2 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -67,7 +67,7 @@
<style lang="scss" scoped>
.column {
overflow: hidden;
- min-width: 1402px;
+ min-width: 1399px;
}
.column-left {
height: 100vh;
--
Gitblit v1.8.0