From f40e9b69d5236912522ac36f4a2b57dac5028c9e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 26 三月 2024 17:36:02 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/screen/components/screen-wrapper/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/screen/components/screen-wrapper/index.vue b/src/views/screen/components/screen-wrapper/index.vue
index 6cbb50e..2d1ba35 100644
--- a/src/views/screen/components/screen-wrapper/index.vue
+++ b/src/views/screen/components/screen-wrapper/index.vue
@@ -2,7 +2,7 @@
<div class="wrapper-container">
<select-item></select-item>
<div class="return-button">
- <el-button type="primary" @click="returnPath">杩斿洖</el-button>
+ <el-button type="primary" @click="returnPath">绠＄悊绯荤粺</el-button>
</div>
<div class="wrapper-content">
<div class="left-container wrapper">
@@ -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,25 +26,25 @@
<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() {
- this.$router.go(-1);
+ this.$router.push('/index');
}
}
}
@@ -77,7 +78,7 @@
}
.wrapper {
- width: 27%;
+ width: 25%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
@@ -94,7 +95,7 @@
}
}
.center-wrapper {
- width: 46%;
+ width: 50%;
height: 100%;
box-sizing: border-box;
padding: 0 10px;
--
Gitblit v1.8.0