From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 03 十一月 2021 17:35:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/search/index/App.vue | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index cda2cd0..9d5ea11 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -1,13 +1,13 @@
<template>
<div class="column">
- <div class="column-left" :style="`height:${screenHeight}px;`">
+ <div class="column-left">
<div class="resize-bar"></div>
<div class="resize-line"></div>
<div class="resize-save">
<left-nav :appName="'Search'" :height="screenHeight - 40"></left-nav>
</div>
</div>
- <div class="column-right" :style="`height:${screenHeight}px;`">
+ <div class="column-right">
<right-side />
</div>
<card-window></card-window>
@@ -18,7 +18,7 @@
import LeftNav from "@/components/LeftNav";
// import CameraVideo from "./components/Video.vue";
import RightSide from "./Searching"
-import CardWindow from "../components/cardWindow";
+import CardWindow from "@/components/cardWindow";
export default {
name: "SearchPage",
@@ -32,6 +32,10 @@
screenHeight: 0,
}
},
+ created() {
+ // this.parseUrl();
+
+ },
mounted() {
this.screenHeight = document.documentElement.clientHeight - 20;
window.onresize = () => {
@@ -39,23 +43,37 @@
this.screenHeight = document.documentElement.clientHeight - 20;
})();
};
+
},
+ methods: {
+ parseUrl() {
+
+ }
+ }
};
</script>
-<style lang="scss" scoped>
+<style lang="scss" >
+.left-tree-box .local-vedio-area .dev-vedio-list{
+ height: calc(100vh - 130px);
+}
+.left-tree-box .el-tabs--border-card .el-tabs__header{
+ display: block!important;
+ margin-bottom: 10px;
+}
.column {
overflow: hidden;
+ min-width: 1399px;
+ height: 100%;
}
.column-left {
- height: inherit;
background-color: #fff;
position: relative;
float: left;
+ height: 100vh;
}
.column-right {
- height: 100%;
- padding: 16px;
+ height: 100vh;
background-color: #eee;
box-sizing: border-box;
overflow: hidden;
@@ -74,17 +92,18 @@
bottom: 0;
left: 0;
padding: 16px;
+ padding-top: 8px;
overflow-x: hidden;
}
.resize-bar {
- width: 310px;
+ width: 338px;
height: inherit;
resize: horizontal;
cursor: ew-resize;
opacity: 0;
overflow: scroll;
max-width: 500px; //璁惧畾鏈�澶ф媺浼搁暱搴�
- min-width: 310px; //璁惧畾鏈�灏忓搴�
+ min-width: 33px; //璁惧畾鏈�灏忓搴�
}
/* 鎷栨嫿绾� */
.resize-line {
@@ -92,8 +111,8 @@
right: 0;
top: 0;
bottom: 0;
- border-right: 2px solid #eee;
- border-left: 1px solid #bbb;
+ border-right: 2px solid #efefef;
+ border-left: 1px solid #e0e0e0;
pointer-events: none;
}
.resize-bar:hover ~ .resize-line,
--
Gitblit v1.8.0