From 98e7690b6bd6bbc456cca73f37421bd2686d8779 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 10 四月 2024 18:17:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index d375a26..dbc3d1b 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,8 +1,8 @@
<template>
<div class="wrapper-container">
<select-item></select-item>
- <div class="return-button">
- <el-button type="primary" @click="returnPath">绠＄悊绯荤粺</el-button>
+ <div class="return-button" @click="returnPath">
+ 杩斿洖
</div>
<div class="wrapper-content">
<div class="left-container wrapper">
@@ -18,6 +18,7 @@
</div>
<div class="right-container wrapper">
<screen-examine class="animate-enter-x enter-right"></screen-examine>
+ <screen-data></screen-data>
</div>
</div>
</div>
@@ -25,22 +26,24 @@
<script>
import SelectItem from '../select-item/index';
-import ScreenFace from '../screen-face/index';
import ScreenExamine from '../screen-examine/index';
+import ScreenFace from '../screen-face/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';
+import ScreenData from '../screen-data/index';
export default {
name: 'ScreenWrapper',
components: {
SelectItem,
- ScreenFace,
ScreenExamine,
+ ScreenMap,
+ ScreenTable,
+ ScreenFace,
ScreenVideo,
ScreenCar,
- ScreenMap,
- ScreenTable
+ ScreenData
},
methods: {
returnPath() {
@@ -54,7 +57,13 @@
.return-button {
position: absolute;
right: 20px;
- top: 40px;
+ top: 10px;
+ border-radius: 4px;
+ border: 1px solid #4481DD;
+ background-color: rgba(67, 102, 155, 0.4);
+ color: #4481DD;
+ padding: 5px 20px;
+ cursor: pointer;
}
.wrapper-container {
@@ -67,8 +76,8 @@
.wrapper-content {
width: 100%;
- height: calc(100% - 100px);
- margin-top: 100px;
+ height: calc(100% - 60px);
+ margin-top: 60px;
position: relative;
box-sizing: border-box;
padding: 20px;
@@ -79,7 +88,7 @@
}
.wrapper {
- width: 20%;
+ width: 25%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -97,7 +106,7 @@
}
.center-wrapper {
- width: 60%;
+ width: 50%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
--
Gitblit v1.8.0