From 0c5642f72e942acd5ff918e3da7b31be75083c17 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 19 三月 2024 17:03:45 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/screen/components/screen-wrapper/index.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 14b259f..b314a67 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -4,10 +4,12 @@
<div class="wrapper-content">
<div class="left-container wrapper">
<screen-face></screen-face>
- </div>
- <div class="center-container wrapper">
- <screen-detection></screen-detection>
+ <screen-car></screen-car>
<screen-video></screen-video>
+ </div>
+ <div class="center-container center-wrapper">
+ <screen-map></screen-map>
+ <screen-detection></screen-detection>
</div>
<div class="right-container wrapper">
@@ -22,13 +24,17 @@
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
+ ScreenVideo,
+ ScreenCar,
+ ScreenMap
},
}
</script>
@@ -56,7 +62,7 @@
}
.wrapper {
- width: 33.3%;
+ width: 27%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -72,5 +78,13 @@
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