From 7f356bf22e4fe731e2b79ca3877e7c702eaf0704 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 四月 2024 14:25:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 6cbb50e..d375a26 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -2,21 +2,22 @@
<div class="wrapper-container">
<select-item></select-item>
<div class="return-button">
- <el-button type="primary" @click="returnPath">杩斿洖</el-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>
+ <screen-face class="animate-enter-x enter-left"></screen-face>
+ <screen-car class="animate-enter-x enter-left animate-delay-1"></screen-car>
+ <screen-video class="animate-enter-x enter-left animate-delay-2"></screen-video>
</div>
<div class="center-container center-wrapper">
<screen-map></screen-map>
- <screen-detection></screen-detection>
+ <screen-table class="animate-enter-y enter-top"></screen-table>
+ <!-- <screen-detection></screen-detection> -->
</div>
<div class="right-container wrapper">
- <screen-examine></screen-examine>
+ <screen-examine class="animate-enter-x enter-right"></screen-examine>
</div>
</div>
</div>
@@ -25,25 +26,25 @@
<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';
+import ScreenTable from '../screen-table/index';
export default {
name: 'ScreenWrapper',
components: {
SelectItem,
ScreenFace,
- ScreenDetection,
ScreenExamine,
ScreenVideo,
ScreenCar,
- ScreenMap
+ ScreenMap,
+ ScreenTable
},
methods: {
returnPath() {
- this.$router.go(-1);
+ this.$router.push('/index');
}
}
}
@@ -55,6 +56,7 @@
right: 20px;
top: 40px;
}
+
.wrapper-container {
width: 100%;
height: 100%;
@@ -77,7 +79,7 @@
}
.wrapper {
- width: 27%;
+ width: 20%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -93,8 +95,9 @@
padding-right: 0;
}
}
+
.center-wrapper {
- width: 46%;
+ width: 60%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -102,4 +105,47 @@
flex-direction: column;
justify-content: space-between;
}
+.animate-enter-x {
+ animation: enter-x 0.4s ease forwards;
+}
+.animate-enter-y {
+ animation: enter-y 0.4s ease forwards;
+}
+.enter-left {
+ transform: translateX(-100px);
+ opacity: 0;
+}
+.enter-right {
+ transform: translateX(100px);
+ opacity: 0;
+}
+.enter-top {
+ transform: translateY(100px);
+ opacity: 0;
+}
+.animate-delay-1 {
+ animation-delay: 0.1s;
+}
+
+.animate-delay-2 {
+ animation-delay: 0.3s;
+}
+
+.animate-delay-3 {
+ animation-delay: 0.5s;
+}
+
+@keyframes enter-x {
+ 100% {
+ opacity: 1;
+ transform: translateX(0);
+ }
+}
+
+@keyframes enter-y {
+ 100% {
+ opacity: 1;
+ transform: translateY(0);
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0