From 27c87cc797f4fc9b0744ed8c44b58dbe4ff3a63c Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 21 三月 2024 18:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/screen/components/screen-wrapper/index.vue | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 532a79a..35e0763 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,13 +1,17 @@
<template>
<div class="wrapper-container">
-
+ <select-item></select-item>
+ <div class="return-button">
+ <el-button type="primary" @click="returnPath">绠＄悊绯荤粺</el-button>
+ </div>
<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>
@@ -19,24 +23,38 @@
</template>
<script>
+import SelectItem from '../select-item/index';
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: {
+ SelectItem,
ScreenFace,
ScreenDetection,
ScreenExamine,
ScreenVideo,
- ScreenCar
+ ScreenCar,
+ ScreenMap
},
+ methods: {
+ returnPath() {
+ this.$router.push('/index');
+ }
+ }
}
</script>
<style lang="scss" scoped>
+.return-button {
+ position: absolute;
+ right: 20px;
+ top: 40px;
+}
.wrapper-container {
width: 100%;
height: 100%;
@@ -59,7 +77,7 @@
}
.wrapper {
- width: 33.3%;
+ width: 27%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -75,4 +93,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