From 5309f0aae4dc789cee92a8d7de4985c22d6ce259 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:32:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 0dbff49..b314a67 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,11 +1,16 @@
<template>
<div class="wrapper-container">
+
<div class="wrapper-content">
<div class="left-container wrapper">
<screen-face></screen-face>
+ <screen-car></screen-car>
+ <screen-video></screen-video>
</div>
- <div class="center-container wrapper">
+ <div class="center-container center-wrapper">
+ <screen-map></screen-map>
<screen-detection></screen-detection>
+
</div>
<div class="right-container wrapper">
<screen-examine></screen-examine>
@@ -18,12 +23,18 @@
import ScreenFace from '../screen-face/index';
import ScreenDetection from '../screen-detection/index';
import ScreenExamine from '../screen-examine/index';
+import ScreenVideo from '../screen-video/index';
+import ScreenCar from '../screen-car/index';
+import ScreenMap from '../screen-map/index';
export default {
name: 'ScreenWrapper',
components: {
ScreenFace,
ScreenDetection,
ScreenExamine,
+ ScreenVideo,
+ ScreenCar,
+ ScreenMap
},
}
</script>
@@ -36,33 +47,44 @@
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;
}
}
.wrapper {
- width: 33.3%;
+ width: 27%;
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;
}
}
+.center-wrapper {
+ width: 46%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 0 10px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0