From 142767fca3d4bc47cb56e39e9e8f6f9bbd591cfa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 18 三月 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index c8e55ed..0dbff49 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -5,10 +5,10 @@
<screen-face></screen-face>
</div>
<div class="center-container wrapper">
-
+ <screen-detection></screen-detection>
</div>
<div class="right-container wrapper">
-
+ <screen-examine></screen-examine>
</div>
</div>
</div>
@@ -16,10 +16,14 @@
<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
+ ScreenFace,
+ ScreenDetection,
+ ScreenExamine,
},
}
</script>
--
Gitblit v1.8.0