From 448166fbb6a638cb93c142a4922175ea3b677ae0 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 25 三月 2024 18:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-wrapper/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 35e0763..0f67a02 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -12,7 +12,8 @@
</div>
<div class="center-container center-wrapper">
<screen-map></screen-map>
- <screen-detection></screen-detection>
+ <screen-table></screen-table>
+ <!-- <screen-detection></screen-detection> -->
</div>
<div class="right-container wrapper">
@@ -25,21 +26,21 @@
<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() {
--
Gitblit v1.8.0