From 18dbbfc42d63f6b085931e9299a91227b0cd41e8 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 16 Dec 2022 14:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/components/CanAssignCase.vue   |   1 +
 front/src/views/home/components/header.vue    |   1 +
 .../home/components/searchResultList.vue      |   1 +
 front/src/views/home/detailBack.vue           | 105 ++++++++++--------
 front/src/views/home/integrationServices.vue  |  17 ++-
 .../views/home/integrationServicesDetails.vue |   3 +-
 .../personalCenter/components/Collection.vue  |   1 +
 7 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue
index 9070763f..a3b8676d 100644
--- a/front/src/views/home/components/CanAssignCase.vue
+++ b/front/src/views/home/components/CanAssignCase.vue
@@ -58,6 +58,7 @@ function toView(item) {
     path: '/integrationServicesDetails',
     query: {
       id: item.id,
+      type:'典型赋能场景'
     },
   })
 }
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 851592a9..2b51a89d 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -557,6 +557,7 @@
       justify-content: center;
 
       .img {
+        cursor: pointer;
         width: 0.3rem;
         height: 0.3rem;
         border-radius: 0.1rem;
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index e5f91849..75ae67f6 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -627,6 +627,7 @@
             path: '/integrationServicesDetails',
             query: {
               id: item.id,
+              type:'打包模式'
             },
           })
         } else {
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
index ffb21602..6caeb975 100644
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@@ -17,66 +17,79 @@
 </template>
 
 <script setup>
-  import { reactive, ref, watch, defineProps } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  import mybus from '@/myplugins/mybus'
-  const router = useRouter()
-  const oldValue1 = ref('')
-  const props = defineProps({
-    textColor: { type: String, default: '' },
-  })
-
-  const previousPage = () => {
+import { reactive, ref, watch, defineProps } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import mybus from '@/myplugins/mybus'
+const router = useRouter()
+const oldValue1 = ref('')
+const props = defineProps({
+  textColor: { type: String, default: '' },
+  returnType: { type: String, default: '' },
+})
+const returnType = props.returnType
+const previousPage = () => {
+  if (returnType =='典型赋能场景'|| returnType =='打包模式') {
+    router.push({
+      path: '/integrationServices',
+      query: {
+        returnType: returnType,
+            },
+    })
+  } else {
     if (window.history.state.back) {
       window.history.go(-1)
     } else {
+      debugger
       router.push({
         path: '/integrationServices',
       })
     }
   }
+}
 
-  const detailName = ref('应用资源1')
+const detailName = ref('应用资源1')
 
-  const goToDetailsPageconetent = () => {
-    let pathData = {
-      path: '/DetailsPageconetent',
-    }
-    mybus.emit('changeMenuStyle', pathData)
+const goToDetailsPageconetent = () => {
+  let pathData = {
+    path: '/DetailsPageconetent',
   }
+  mybus.emit('changeMenuStyle', pathData)
+}
 </script>
 
 <style scoped lang="less">
-  .detail-back {
-    position: absolute;
-    top: 1rem;
-    left: 100px;
-    font-size: 0.18rem;
-    color: #fff;
+.detail-back {
+  position: absolute;
+  top: 1rem;
+  left: 100px;
+  font-size: 0.18rem;
+  color: #fff;
+  cursor: pointer;
+  width: 50px;
+  height: 50px;
+  background-image: url('~@/assets/detailsAll/back.png');
+  background-size: 100% 100%;
+}
+
+.nav-box {
+  position: absolute;
+  top: 0.6rem;
+  left: 100px;
+  font-size: 0.18rem;
+  color: #fff;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  background: rgba(244, 245, 248, 0.8);
+  padding-left: 145px;
+  padding-top: 5px;
+
+  .bread-crumb-span {
     cursor: pointer;
-    width: 50px;
-    height: 50px;
-    background-image: url('~@/assets/detailsAll/back.png');
-    background-size: 100% 100%;
-  }
-  .nav-box {
-    position: absolute;
-    top: 0.6rem;
-    left: 100px;
-    font-size: 0.18rem;
-    color: #fff;
-    height: 30px;
-    line-height: 30px;
-    width: 100%;
-    font-size: 14px;
-    display: flex;
-    align-items: center;
-    background: rgba(244, 245, 248, 0.8);
-    padding-left: 145px;
-    padding-top: 5px;
-    .bread-crumb-span {
-      cursor: pointer;
-    }
   }
+}
 </style>
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index f0d84e89..b9f8efb6 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -121,6 +121,7 @@
       const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
       const router = useRouter()
       const select = router.currentRoute.value.query.select
+      const returnType = router.currentRoute.value.query.returnType
       const searchValue = ref('')
       const Cardsname = ref(select)
       const resourceList = reactive({ data: [] })
@@ -290,11 +291,22 @@
       }
 
       onMounted(() => {
-        if (storageSearchInfo) {
+        if(returnType=='典型赋能场景'){
+          changeCards(0)
+        }else if(returnType=='打包模式'){
+          changeCards(1)
+        }else{
+            if (storageSearchInfo) {
           handleSetSearchData()
         } else {
           getIntegrationList()
         }
+        }
+        // if (storageSearchInfo) {
+        //   handleSetSearchData()
+        // } else {
+        //   getIntegrationList()
+        // }
       })
 
       return {
@@ -312,6 +324,7 @@
         loading,
         titleName,
         changeCards,
+        returnType,
         number,
         loadingData,
         onShowSizeChange,
@@ -366,7 +379,7 @@
       height: 17px;
      background: url('~@/assets/home/searchInner.png');
       position: absolute;
-      top: 139px;
+      top: 119px;
     left: 500px;
       }
     }
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index e331b162..8ca335e1 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
-    <detail-back v-show="!hiddenBackFlag"></detail-back>
+    <detail-back v-show="!hiddenBackFlag" :returnType="returnType"></detail-back>
     <!-- 头部基本信息 -->
     <application-top-details
       :dataList="detailInfoObj"
@@ -190,6 +190,7 @@
   const infrastructureCount = ref(0)
   const componentCount = ref(0)
   const id = router.currentRoute.value.query.id
+  const returnType = router.currentRoute.value.query.type
   const hiddenBackFlag = router.currentRoute.value.query.hiddenBackFlag
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue
index 166365f1..bcdf6ca7 100644
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@@ -368,6 +368,7 @@
       })
       window.open(detailPage.href, '_blank')
     } else if (delFlag === undefined) {
+
       // 融合服务
       // mybus.emit('tabsChange', { flag: item.resourceId })
       mybus.emit('tabsChange', { flag: id })