From 1a44254b6198d145cb05e3b0eb480d9b8050edc8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 19 三月 2024 10:45:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 6c44f8e..0dbff49 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -8,7 +8,7 @@
<screen-detection></screen-detection>
</div>
<div class="right-container wrapper">
-
+ <screen-examine></screen-examine>
</div>
</div>
</div>
@@ -17,11 +17,13 @@
<script>
import ScreenFace from '../screen-face/index';
import ScreenDetection from '../screen-detection/index';
+import ScreenExamine from '../screen-examine/index';
export default {
name: 'ScreenWrapper',
components: {
ScreenFace,
- ScreenDetection
+ ScreenDetection,
+ ScreenExamine,
},
}
</script>
--
Gitblit v1.8.0