From 8b509057eec54827c2d1ba050cae31a65d5dd0e2 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Fri, 8 Dec 2023 16:56:12 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8-=E5=9C=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=B7=AF=E7=94=B1=E4=B8=A2=E5=A4=B1=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1041851769913344]=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8-=E5=9C=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=B7=AF=E7=94=B1=E4=B8=A2=E5=A4=B1=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?=
 =?UTF-8?q?3057/1041851769913344?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/cientity/cientity-view.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/cmdb/cientity/cientity-view.vue b/src/views/pages/cmdb/cientity/cientity-view.vue
index d9ea6dc21..29960e8b7 100644
--- a/src/views/pages/cmdb/cientity/cientity-view.vue
+++ b/src/views/pages/cmdb/cientity/cientity-view.vue
@@ -8,6 +8,7 @@
     >
       <template v-slot:navigation>
         <span v-if="$hasBack()" class="tsfont-left text-action" @click="$back()">{{ $getFromPage() }}</span>
+        <span v-else-if="fromFullPath" class="tsfont-left text-action" @click="back()">{{ $t('router.cmdb.cidetail') }}</span>
       </template>
       <template v-slot:topLeft>
         <div class="action-group">
@@ -284,9 +285,15 @@ export default {
       isHistoryShow: true, //修改历史是否显示,默认显示
       isSiderHide: false,
       unCommitTransactionCount: 0, //未提交事务数量
-      isTransactionDialogShow: false
+      isTransactionDialogShow: false,
+      fromFullPath: '' // 上一个页面地址
     };
   },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.fromFullPath = from?.fullPath || '';
+    });
+  },
   beforeCreate() {},
   created() {},
   beforeMount() {},
@@ -308,6 +315,13 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    back() {
+      // 下榻页面返回
+      this.$router.push({
+        path: this.fromFullPath,
+        query: {isBack: true}
+      });
+    },
     showCustomViewData(customView) {
       if (customView._type === 'data') {
         if (customView.type === 'scene') {
-- 
Gitee