From 27e8d88ed3fb019de4b46a9257d6ab71daa2638e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 09:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index b314a67..7bdc799 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -1,6 +1,9 @@
<template>
<div class="wrapper-container">
-
+ <select-item></select-item>
+ <div class="return-button">
+ <el-button type="primary">杩斿洖</el-button>
+ </div>
<div class="wrapper-content">
<div class="left-container wrapper">
<screen-face></screen-face>
@@ -20,6 +23,7 @@
</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';
@@ -29,6 +33,7 @@
export default {
name: 'ScreenWrapper',
components: {
+ SelectItem,
ScreenFace,
ScreenDetection,
ScreenExamine,
@@ -40,6 +45,11 @@
</script>
<style lang="scss" scoped>
+.return-button {
+ position: absolute;
+ right: 20px;
+ top: 30px;
+}
.wrapper-container {
width: 100%;
height: 100%;
--
Gitblit v1.8.0