From a59da005567ed5eed92f1fa8ed27391192b4063d Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 20 三月 2024 10:35:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/screen/components/screen-wrapper/index.vue | 17 ++++++++++++++++- 1 files changed, 16 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..6cbb50e 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" @click="returnPath">杩斿洖</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, @@ -36,10 +41,20 @@ ScreenCar, ScreenMap }, + methods: { + returnPath() { + this.$router.go(-1); + } + } } </script> <style lang="scss" scoped> +.return-button { + position: absolute; + right: 20px; + top: 40px; +} .wrapper-container { width: 100%; height: 100%; -- Gitblit v1.8.0