From 3565269c046b9aed7346f8c6c74a231dd1218ec7 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 19 三月 2024 13:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/screen/components/screen-wrapper/index.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index c8e55ed..14b259f 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,14 +1,17 @@
<template>
<div class="wrapper-container">
+
<div class="wrapper-content">
<div class="left-container wrapper">
<screen-face></screen-face>
</div>
<div class="center-container wrapper">
+ <screen-detection></screen-detection>
+ <screen-video></screen-video>
</div>
<div class="right-container wrapper">
-
+ <screen-examine></screen-examine>
</div>
</div>
</div>
@@ -16,10 +19,16 @@
<script>
import ScreenFace from '../screen-face/index';
+import ScreenDetection from '../screen-detection/index';
+import ScreenExamine from '../screen-examine/index';
+import ScreenVideo from '../screen-video/index';
export default {
name: 'ScreenWrapper',
components: {
- ScreenFace
+ ScreenFace,
+ ScreenDetection,
+ ScreenExamine,
+ ScreenVideo
},
}
</script>
@@ -32,16 +41,17 @@
top: 0;
left: 0;
z-index: 1;
+
.wrapper-content {
width: 100%;
height: calc(100% - 100px);
margin-top: 100px;
- border: 1px solid red;
position: relative;
box-sizing: border-box;
padding: 20px;
display: flex;
align-items: center;
+ justify-content: space-between;
}
}
@@ -50,15 +60,17 @@
height: 100%;
box-sizing: border-box;
padding: 0 10px;
- border: 1px solid red;
display: flex;
flex-direction: column;
justify-content: space-between;
+
&:first-of-type {
padding-left: 0;
}
+
&:last-of-type {
padding-right: 0;
}
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0