diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue
index 49d2567d..8a70cfea 100644
--- a/front/src/views/home/components/CanAssignCase.vue
+++ b/front/src/views/home/components/CanAssignCase.vue
@@ -1,19 +1,11 @@
 <template>
   <div class="box">
     <div class="CanCase">
-      <div
-        class="caseBox"
-        v-for="(item, index) in caseList"
-        :key="index"
-        @click="toView(item)"
-      >
-        <a-image
-          :preview="false"
-          :src="
-            item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
-              .attrValue
-          "
-        />
+      <div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
+        <a-image :preview="false" :src="
+          item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+            .attrValue
+        " />
         <h3>{{ item.name }}</h3>
         <p>发布时间 {{ item.updateDate }}</p>
       </div>
@@ -21,68 +13,83 @@
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, onBeforeUnmount } from 'vue'
-  import { defineProps } from 'vue'
+import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
 
-  import { useRouter } from 'vue-router'
-  const router = useRouter()
-  const props = defineProps({
-    resourceList: {
-      type: Object,
-      default: () => {},
-    },
-    selectCardsname: {
-      type: String,
-      default: '组件服务',
+import { useRouter } from 'vue-router'
+const router = useRouter()
+const props = defineProps({
+  resourceList: {
+    type: Object,
+    default: () => { },
+  },
+  selectCardsname: {
+    type: String,
+    default: '组件服务',
+  },
+})
+const emits = defineEmits(['saveSearchCodition'])
+
+const caseList = ref([])
+
+onMounted(() => {
+  caseList.value = props.resourceList.data
+  console.log('caseList.value------------>', caseList.value);
+})
+onBeforeUnmount(() => { })
+function toView(item) {
+  emits('saveSearchCodition', 1)
+  router.push({
+    path: '/integrationServicesDetails',
+    query: {
+      id: item.id,
     },
   })
-  const caseList = ref([])
+}
 
-  onMounted(() => {
-    caseList.value = props.resourceList.data
-    console.log(caseList.value, 'caseList.value')
-  })
-  onBeforeUnmount(() => {})
-  function toView(item) {
-    router.push({
-      path: '/integrationServicesDetails',
-      query: {
-        id: item.id,
-      },
-    })
+watch(
+  () => props.resourceList.data,
+  (val) => {
+    if (val) {
+      caseList.value = val
+    }
   }
+)
 </script>
 <style lang="less" scoped>
-  .box {
-    .CanCase {
-      margin-top: 0.2rem;
-      display: grid;
-      grid-template-columns: 33.33% 33.33% 33.33%;
-      align-items: center;
-      justify-items: center;
-      .caseBox {
-        width: 3.5rem;
-        height: 3rem;
-        box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
-        background: #ffffff;
-        border-radius: 0.05rem;
-        padding: 0.2rem;
-        margin-bottom: 0.2rem;
-        cursor: pointer;
-        img {
-          width: 3rem;
-          height: 1.8rem;
-        }
-        h3 {
-          font-size: 0.18rem;
-          font-weight: bold;
-          margin-top: 0.1rem;
-        }
-        p {
-          font-size: 0.16rem;
-          color: #797979;
-        }
+.box {
+  .CanCase {
+    margin-top: 0.2rem;
+    display: grid;
+    grid-template-columns: 33.33% 33.33% 33.33%;
+    align-items: center;
+    justify-items: center;
+
+    .caseBox {
+      width: 3.5rem;
+      height: 3rem;
+      box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
+      background: #ffffff;
+      border-radius: 0.05rem;
+      padding: 0.2rem;
+      margin-bottom: 0.2rem;
+      cursor: pointer;
+
+      img {
+        width: 3rem;
+        height: 1.8rem;
+      }
+
+      h3 {
+        font-size: 0.18rem;
+        font-weight: bold;
+        margin-top: 0.1rem;
+      }
+
+      p {
+        font-size: 0.16rem;
+        color: #797979;
       }
     }
   }
+}
 </style>
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index 089e3a69..d62b5a88 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -26,7 +26,8 @@
           :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
           ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
         <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-          :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
         <div class="pagination">
           <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
             v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
@@ -53,22 +54,11 @@ import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
 import { message } from 'ant-design-vue'
 
 export default defineComponent({
-  beforeRouteEnter(to, from, next) {
-    console.log('to---integrationServices--beforeRouteEnter------->', to)
-    console.log('from---integrationServices--beforeRouteEnter------->', from)
-    console.log('next---integrationServices--beforeRouteEnter------->', next)
-    // 返回按钮，刷新页面，所以from.name为undefined
-    // if (from.name || from.name !== 'details') {
-    //   console.log('清空------------>')
-    //   localStorage.removeItem('DetailsPageconetent')
-    // }
-    next()
-  },
   beforeRouteLeave(to, from, next) {
     console.log('to---integrationServices--beforeRouteLeave------->', to)
     console.log('from---integrationServices--beforeRouteLeave------->', from)
     console.log('next---integrationServices--beforeRouteLeave------->', next)
-    if (to.name !== 'packagingDetails') {
+    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
       localStorage.removeItem('integrationServices')
     }
     next()
@@ -78,7 +68,7 @@ export default defineComponent({
     const loading = ref(true)
     const currentPage = ref(1)
     const currentPageSize = ref(5)
-    const pageSizeOptions = ref(['2','5', '10', '20', '50'])
+    const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
     const router = useRouter()
     const select = router.currentRoute.value.query.select
     const searchValue = ref('')
@@ -95,7 +85,6 @@ export default defineComponent({
         name: '赋能场景',
       },
     ])
-    const searchData = null;
     const number = ref(0)
     // 查询参数
     const paramsGetResources = {
@@ -110,39 +99,35 @@ export default defineComponent({
     const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
     // 读取本地存储：表单赋值
     const handleSetSearchData = () => {
-      console.log('storageSearchInfo------------>', storageSearchInfo)
       if (storageSearchInfo) {
+        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
         // 搜索名称 
         searchValue.value = storageSearchInfo.name;
         currentPage.value = storageSearchInfo.page;
         currentPageSize.value = storageSearchInfo.limit;
-        titleName.value[number.value].name = storageSearchInfo.type;;
         paramsGetResources.limit = storageSearchInfo.limit;
         paramsGetResources.page = storageSearchInfo.page;
         paramsGetResources.type = storageSearchInfo.type;
-
         // 延迟使用，因为还没有返回跟挂载
         nextTick(() => {
-          searchResultListDom.value.changeCondition({
+          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
             value: storageSearchInfo.orderField,
             orderType: storageSearchInfo.orderType,
           }, true)
         })
-        console.log('paramsGetResources------------>', paramsGetResources);
-        return;
         getIntegrationList()
       }
     }
 
     const changeCards = (val) => {
-      console.log(val)
-      number.value = val
+      // 打包模式
+      number.value = val;
+      paramsGetResources.type = titleName.value[number.value].name;
       resetAction()
     }
 
     // 查询
     const onSearch = () => {
-      
       currentPage.value = 1
       getIntegrationList()
     }
@@ -168,9 +153,8 @@ export default defineComponent({
     // 获取融合服务列表
     const getIntegrationList = () => {
       loadingData.value = true
-      console.log('获取融合服务列表------------>')
       paramsGetResources.name = searchValue.value;
-      console.log('paramsGetResources------------>', paramsGetResources);
+      console.log('paramsGetResources------参数下发------>', paramsGetResources);
       getIntegrationServicesList(paramsGetResources).then(
         (res) => {
           loadingData.value = false
@@ -194,13 +178,11 @@ export default defineComponent({
         delete paramsGetResources.deptIds
       }
       getIntegrationList()
-      console.log('paramsGetResources-----paramsGetResources------->', paramsGetResources);
     })
 
     mybus.on('changePage', (page) => {
       paramsGetResources.page = page
-      console.log('paramsGetResources----changePage-------->', paramsGetResources);
-      getIntegrationList('分页查询')
+      getIntegrationList()
     })
 
     mybus.on('changeSelcted', () => {
@@ -213,19 +195,15 @@ export default defineComponent({
       getIntegrationList()
     })
     mybus.on('changeCondition', (condition) => {
-      console.log('changeCondition------>', condition)
       paramsGetResources.orderField = condition.orderField
       paramsGetResources.orderType = condition.orderType
       getIntegrationList()
     })
 
     const pageChange = (val) => {
-      console.log('val-----pageChange------->', val);
       currentPage.value = val
       paramsGetResources.page = val
       getIntegrationList() //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-      console.log('paramsGetResources----pageChange-------->', paramsGetResources);
-
     }
 
     // 分页
@@ -238,8 +216,8 @@ export default defineComponent({
     }
 
     // 存储查询条件到本地
-    const saveSearchCodition = () => {
-      console.log('融合服务------------>', searchData);
+    const saveSearchCodition = (n) => {
+      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
       localStorage.setItem(
         'integrationServices',
         JSON.stringify(paramsGetResources)
@@ -252,7 +230,6 @@ export default defineComponent({
       } else {
         getIntegrationList()
       }
-
     })
 
     return {
@@ -275,7 +252,6 @@ export default defineComponent({
       onShowSizeChange,
       saveSearchCodition,
       searchResultListDom,
-
     }
   },
   components: {
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 70b37fed..f0858373 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -2,21 +2,15 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
+    <detail-back></detail-back>
     <!-- 头部基本信息 -->
-    <application-top-details
-      :dataList="detailInfoObj"
-      :navList="navList"
-    ></application-top-details>
+    <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
 
     <!-- 导航 -->
     <div :class="{ fixed: scrollTop >= 600 }">
       <div class="application-navigation">
         <template v-for="nav in navList" :key="nav.key">
-          <div
-            class="nav"
-            :class="{ selectNow: nav.key == selectNow }"
-            @click="selectNav(nav.key)"
-          >
+          <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
             {{ nav.name }}
             <span class="line"></span>
           </div>
@@ -30,19 +24,16 @@
         <DetalsTitle title="场景痛点" type="PAIN POINT"></DetalsTitle>
       </div>
       <div class="flex-row-center">
-        <div class="bg cjtd"><a-image :preview="false" :src="bgImg" /></div>
+        <div class="bg cjtd">
+          <a-image :preview="false" :src="bgImg" />
+        </div>
 
         <div class="content" style="margin-left: 0.5rem">
-          <div
-            class="content-item"
-            v-for="(item, i) in painPoint"
-            :key="i"
-            style="
+          <div class="content-item" v-for="(item, i) in painPoint" :key="i" style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            "
-          >
+            ">
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -50,26 +41,17 @@
     </div>
 
     <!-- 解决方案 -->
-    <div
-      id="integration-solution"
-      class="solution scrollBox"
-      style="background: #eee"
-    >
+    <div id="integration-solution" class="solution scrollBox" style="background: #eee">
       <div class="title-1">
         <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
       </div>
       <div class="flex-row-center">
         <div class="content" style="background: #fff; margin-top: 0.2rem">
-          <div
-            class="content-item"
-            v-for="(item, i) in solution"
-            :key="i"
-            style="
+          <div class="content-item" v-for="(item, i) in solution" :key="i" style="
               margin-bottom: 0.2rem;
               font-size: 0.18rem;
               line-height: 0.3rem;
-            "
-          >
+            ">
             {{ i + 1 + '、' + item.description }}
           </div>
         </div>
@@ -81,48 +63,20 @@
       <div class="title-1">
         <DetalsTitle title="使用能力" type="ABILITY"></DetalsTitle>
       </div>
-      <div
-        class="flex-row-center combine-content"
-        v-for="(item, i) in combineList"
-        :key="i"
-        style="display: block"
-      >
-        <div
-          class="top"
-          style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem"
-        >
+      <div class="flex-row-center combine-content" v-for="(item, i) in combineList" :key="i" style="display: block">
+        <div class="top" style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem">
           {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
           <div class="title" :class="'title' + i"></div>
-          <div>
-            <el-table
-              class="table"
-              :data="item.list"
-              stripe
-              :header-cell-style="{ 'text-align': 'center' }"
-            >
-              <el-table-column
-                prop="name"
-                label="数据"
-                align="center"
-                width="200"
-                show-overflow-tooltip="true"
-              ></el-table-column>
-              <el-table-column
-                prop="dept"
-                label="能力来源"
-                align="center"
-                width="300"
-                show-overflow-tooltip="true"
-              ></el-table-column>
-              <el-table-column
-                prop="platform"
-                label="申请平台"
-                align="center"
-                width="100"
-                show-overflow-tooltip="true"
-              ></el-table-column>
+          <div class="table-box">
+            <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
+              <el-table-column prop="name" label="数据" align="center" width="200" show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="dept" label="能力来源" align="center" width="300" show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="platform" label="申请平台" align="center" width="100" show-overflow-tooltip="true">
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -136,12 +90,7 @@
       </div>
       <div class="flex-row-center step-content">
         <el-steps direction="vertical" :space="150" :active="step.length">
-          <el-step
-            v-for="(item, i) in step"
-            :key="i"
-            :title="item.question"
-            :description="item.answer"
-          ></el-step>
+          <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
         </el-steps>
       </div>
     </div>
@@ -150,523 +99,542 @@
 </template>
 
 <script setup>
-  import ApplicationTopDetails from './components/ApplicationTopDetails.vue'
-  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
-  import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
-  import HomeFooter from '@/views/newHome/components/Footer'
-  import HomeHeader from '@/views/home/components/header'
-  import { ref, onMounted, onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { getIntegrationDetail } from '@/api/home'
-  import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
-  const router = useRouter()
-  const scrollTop = ref(0)
-  const domArr = ref([])
-  const painPoint = ref([])
-  const solution = ref([])
-  const step = ref([])
-  const bgImg = ref('')
-  const id = router.currentRoute.value.query.id
-  document.documentElement.style.transition = 'all 0.3s ease'
-  document.documentElement.scrollTop = 0
-  document.body.style.transition = 'all 0.3s ease'
-  document.body.scrollTop = 0
-  mybus.on('flyToView', (id) => {
-    let top =
-      document.querySelector('#' + id) &&
-      document.querySelector('#' + id).offsetTop - 50
-    document.documentElement.scrollTop = top
-    document.body.scrollTop = top
-  })
+import ApplicationTopDetails from './components/ApplicationTopDetails.vue'
+import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
+import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
+import HomeFooter from '@/views/newHome/components/Footer'
+import HomeHeader from '@/views/home/components/header'
+import detailBack from '@/views/home/detailBack.vue'
+import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import { getIntegrationDetail } from '@/api/home'
+import mybus from '@/myplugins/mybus'
+import { message } from 'ant-design-vue'
+const router = useRouter()
+const scrollTop = ref(0)
+const domArr = ref([])
+const painPoint = ref([])
+const solution = ref([])
+const step = ref([])
+const bgImg = ref('')
+const id = router.currentRoute.value.query.id
+document.documentElement.style.transition = 'all 0.3s ease'
+document.documentElement.scrollTop = 0
+document.body.style.transition = 'all 0.3s ease'
+document.body.scrollTop = 0
+mybus.on('flyToView', (id) => {
+  let top =
+    document.querySelector('#' + id) &&
+    document.querySelector('#' + id).offsetTop - 50
+  document.documentElement.scrollTop = top
+  document.body.scrollTop = top
+})
 
-  const navList = ref([
-    {
-      name: '场景痛点',
-      key: 'integration-pain-point',
-    },
-    {
-      name: '解决方案',
-      key: 'integration-solution',
-    },
-    {
-      name: '使用能力',
-      key: 'integration-ability',
-    },
-    {
-      name: '构建步骤',
-      key: 'integration-step',
-    },
-  ])
+const navList = ref([
+  {
+    name: '场景痛点',
+    key: 'integration-pain-point',
+  },
+  {
+    name: '解决方案',
+    key: 'integration-solution',
+  },
+  {
+    name: '使用能力',
+    key: 'integration-ability',
+  },
+  {
+    name: '构建步骤',
+    key: 'integration-step',
+  },
+])
 
-  const selectNow = ref('integration-pain-point')
+const selectNow = ref('integration-pain-point')
 
-  const useWayShowList = ref([
-    {
-      title: '归属部门',
-      info: {
-        deptUser: '部门联系人',
-        mobile: '联系人电话',
-      },
+const useWayShowList = ref([
+  {
+    title: '归属部门',
+    info: {
+      deptUser: '部门联系人',
+      mobile: '联系人电话',
     },
-    {
-      title: '服务商',
-      info: {
-        providerUser: '服务商联系人',
-        providerMobile: '联系人电话',
-      },
+  },
+  {
+    title: '服务商',
+    info: {
+      providerUser: '服务商联系人',
+      providerMobile: '联系人电话',
     },
-  ])
+  },
+])
 
-  const combineList = ref([
-    {
-      title: '基础设施',
-      list: [],
-    },
-    {
-      title: '组件服务',
-      list: [],
-    },
-    {
-      title: '数据资源',
-      list: [],
-    },
-  ])
-  const detailInfoObj = ref({})
+const combineList = ref([
+  {
+    title: '基础设施',
+    list: [],
+  },
+  {
+    title: '组件服务',
+    list: [],
+  },
+  {
+    title: '数据资源',
+    list: [],
+  },
+])
+const detailInfoObj = ref({})
 
-  onMounted(() => {
-    window.addEventListener('scroll', () => {
-      domArr.value = document.querySelectorAll('.scrollBox')
-      scrollTop.value =
-        document.documentElement.scrollTop || document.body.scrollTop
-      for (let i = 0; i < domArr.value.length; i++) {
-        if (i === 0) {
-          if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
-            selectNow.value = domArr.value[i].id
-          }
-        } else if (i == domArr.value.length - 1) {
-          if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
-            selectNow.value = domArr.value[i].id
-          }
-        } else {
-          if (
-            scrollTop.value >= domArr.value[i].offsetTop - 50 &&
-            scrollTop.value <= domArr.value[i + 1].offsetTop - 50
-          ) {
-            selectNow.value = domArr.value[i].id
-          }
+onMounted(() => {
+  window.addEventListener('scroll', () => {
+    domArr.value = document.querySelectorAll('.scrollBox')
+    scrollTop.value =
+      document.documentElement.scrollTop || document.body.scrollTop
+    for (let i = 0; i < domArr.value.length; i++) {
+      if (i === 0) {
+        if (scrollTop.value <= domArr.value[i + 1].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else if (i == domArr.value.length - 1) {
+        if (scrollTop.value >= domArr.value[i].offsetTop - 50) {
+          selectNow.value = domArr.value[i].id
+        }
+      } else {
+        if (
+          scrollTop.value >= domArr.value[i].offsetTop - 50 &&
+          scrollTop.value <= domArr.value[i + 1].offsetTop - 50
+        ) {
+          selectNow.value = domArr.value[i].id
         }
       }
-    })
-  })
-
-  const selectNav = (key) => {
-    selectNow.value = key
-    mybus.emit('flyToView', selectNow.value)
-  }
-
-  // 融合服务--详情
-  const getIntegrationServicesDeatil = (id) => {
-    getIntegrationDetail(id).then(
-      (res) => {
-        if (res.data.code !== 0) {
-          return message.error(res.data.msg)
-        }
-        detailInfoObj.value = res.data.data || {}
-        // 资源属性
-        let fuseAttrList = res.data.data.fuseAttrList || []
-        // 融合关系
-        let fuseResourceList = res.data.data.fuseResourceList || []
-        let questionValue =
-          fuseAttrList.find((v) => v.attrType === '常见问题') || {}
-        let questionObj = {
-          attrType: '常见问题',
-          attrValue: questionValue.attrValue || '[]',
-        }
-        painPoint.value =
-          JSON.parse(
-            fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue
-          ) || []
-        solution.value =
-          JSON.parse(
-            fuseAttrList.find((v) => v.attrType === '解决方案').attrValue
-          ) || []
-        step.value =
-          JSON.parse(
-            fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue
-          ) || []
-        bgImg.value =
-          fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
-        let areaObj = {
-          attrType: '应用领域',
-          attrValue: '',
-        }
-        combineList.value.forEach((item) => {
-          let arr = []
-          let resource = fuseResourceList.filter(
-            (v) => v.resource && v.type == item.title
-          )
-          if (resource.length > 0) {
-            if (item.title === '基础设施') {
-              arr = resource.map((res) => ({
-                id: res.resource.idtCameraChannel,
-                name: res.resource.channelName,
-                dept: res.resource.nodeName,
-                platform: 'UCS',
-              }))
-            } else if (item.title === '组件服务') {
-              arr = resource.map((res) => ({
-                id: res.resource.id,
-                name: res.resource.name,
-                dept: res.resource.deptName,
-                platform: 'UCS',
-              }))
-            } else if (item.title === '数据资源') {
-              arr = resource.map((res) => ({
-                id: res.resource.zycode,
-                name: res.resource.zyname,
-                dept: res.resource.TGBM,
-                platform: '共享交换平台',
-              }))
-            }
-          }
-          if (item.title === '数据资源') {
-            item.list.push({
-              id: '数据资源1',
-              name: '城管案件数据',
-              dept: '市城管局',
-              platform: '政务信息共享交换网',
-            })
-            item.list.push({
-              id: '数据资源2',
-              name: '手机信令数据',
-              dept: '运营商（移动）',
-              platform: '政务信息共享交换网',
-            })
-            item.list.push({
-              id: '数据资源3',
-              name: '标准地址数据',
-              dept: '市自规局',
-              platform: '政务信息共享交换网',
-            })
-          } else {
-            item.list = arr
-          }
-        })
-        detailInfoObj.value.infoList = []
-        detailInfoObj.value.infoList.push(questionObj)
-        detailInfoObj.value.infoList.push(areaObj)
-      },
-      (err) => {
-        message.error(err)
-      }
-    )
-  }
-  getIntegrationServicesDeatil(id)
-
-  function handleOpenUrl(type) {
-    let obj =
-      (detailInfoObj.value.fuseAttrList || []).find(
-        (v) => v.attrType == type
-      ) || {}
-    let url = obj.attrValue || ''
-    if (!obj.attrValue) {
-      return message.error('错误的文档链接地址！')
     }
-    window.open(
-      window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(url))
-    )
-  }
-
-  onBeforeUnmount(() => {
-    mybus.off('flyToView')
   })
+})
+
+const selectNav = (key) => {
+  selectNow.value = key
+  mybus.emit('flyToView', selectNow.value)
+}
+
+const getAttrValue = (fuseAttrList, data, text) => {
+  let _obj = fuseAttrList.find((v) => v.attrType === text) || {};
+  data =
+    JSON.parse(
+      _obj.attrValue || '[]'
+    ) || []
+}
+
+// 融合服务--详情
+const getIntegrationServicesDeatil = (id) => {
+  getIntegrationDetail(id).then(
+    (res) => {
+      if (res.data.code !== 0) {
+        return message.error(res.data.msg)
+      }
+      detailInfoObj.value = res.data.data || {}
+      // 资源属性
+      let fuseAttrList = res.data.data.fuseAttrList || []
+      // 融合关系
+      let fuseResourceList = res.data.data.fuseResourceList || []
+      let questionValue =
+        fuseAttrList.find((v) => v.attrType === '常见问题') || {}
+      let questionObj = {
+        attrType: '常见问题',
+        attrValue: questionValue.attrValue || '[]',
+      }
+      getAttrValue(fuseAttrList, painPoint.value, '场景痛点');
+      getAttrValue(fuseAttrList, solution.value, '解决方案');
+      getAttrValue(fuseAttrList, step.value, '使用步骤');
+      bgImg.value =
+        fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
+      let areaObj = {
+        attrType: '应用领域',
+        attrValue: '',
+      }
+      combineList.value.forEach((item) => {
+        let arr = []
+        let resource = fuseResourceList.filter(
+          (v) => v.resource && v.type == item.title
+        )
+        if (resource.length > 0) {
+          if (item.title === '基础设施') {
+            arr = resource.map((res) => ({
+              id: res.resource.idtCameraChannel,
+              name: res.resource.channelName,
+              dept: res.resource.nodeName,
+              platform: 'UCS',
+            }))
+          } else if (item.title === '组件服务') {
+            arr = resource.map((res) => ({
+              id: res.resource.id,
+              name: res.resource.name,
+              dept: res.resource.deptName,
+              platform: 'UCS',
+            }))
+          } else if (item.title === '数据资源') {
+            arr = resource.map((res) => ({
+              id: res.resource.zycode,
+              name: res.resource.zyname,
+              dept: res.resource.TGBM,
+              platform: '共享交换平台',
+            }))
+          }
+        }
+        if (item.title === '数据资源') {
+          item.list.push({
+            id: '数据资源1',
+            name: '城管案件数据',
+            dept: '市城管局',
+            platform: '政务信息共享交换网',
+          })
+          item.list.push({
+            id: '数据资源2',
+            name: '手机信令数据',
+            dept: '运营商（移动）',
+            platform: '政务信息共享交换网',
+          })
+          item.list.push({
+            id: '数据资源3',
+            name: '标准地址数据',
+            dept: '市自规局',
+            platform: '政务信息共享交换网',
+          })
+        } else {
+          item.list = arr
+        }
+      })
+      detailInfoObj.value.infoList = []
+      detailInfoObj.value.infoList.push(questionObj)
+      detailInfoObj.value.infoList.push(areaObj)
+    },
+    (err) => {
+      message.error(err)
+    }
+  )
+}
+getIntegrationServicesDeatil(id)
+
+function handleOpenUrl(type) {
+  let obj =
+    (detailInfoObj.value.fuseAttrList || []).find(
+      (v) => v.attrType == type
+    ) || {}
+  let url = obj.attrValue || ''
+  if (!obj.attrValue) {
+    return message.error('错误的文档链接地址！')
+  }
+  window.open(
+    window.SITE_CONFIG.previewUrl +
+    'hisense_office/onlinePreview?url=' +
+    btoa(encodeURI(url))
+  )
+}
+
+onBeforeUnmount(() => {
+  mybus.off('flyToView')
+})
 </script>
 
 <style lang="less" scoped>
-  .flex-row-between {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
+.flex-row-between {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex-row-start {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.flex-row-center {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
+.IntegrationServicesDetails {
+  .fixed {
+    position: fixed !important;
+    z-index: 2000;
+    top: 0;
+    left: 0;
   }
 
-  .flex-row-start {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
+  .fixed2>div:nth-of-type(3) {
+    margin-top: 0.84rem;
   }
 
-  .flex-row-center {
+  .application-navigation {
+    width: 19.12rem;
+    height: 0.84rem;
+    line-height: 0.8rem;
     display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-  }
+    justify-content: space-around;
+    font-size: 0.24rem;
+    color: #666;
+    background: #fff;
+    padding: 0 3rem;
+    box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
+    position: relative;
 
-  .IntegrationServicesDetails {
-    .fixed {
-      position: fixed !important;
-      z-index: 2000;
-      top: 0;
-      left: 0;
-    }
-
-    .fixed2 > div:nth-of-type(3) {
-      margin-top: 0.84rem;
-    }
-
-    .application-navigation {
-      width: 19.12rem;
-      height: 0.84rem;
-      line-height: 0.8rem;
+    .nav {
+      cursor: pointer;
       display: flex;
-      justify-content: space-around;
-      font-size: 0.24rem;
-      color: #666;
-      background: #fff;
-      padding: 0 3rem;
-      box-shadow: 0rem 0.05rem 0.1rem #f2f3fb;
-      position: relative;
-
-      .nav {
-        cursor: pointer;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        align-items: center;
-
-        .line {
-          width: 0.4rem;
-          height: 0.04rem;
-        }
-      }
-
-      .selectNow {
-        color: #526aff;
-
-        .line {
-          background: #526aff;
-        }
-      }
-    }
-  }
-
-  .use-way {
-    padding: 0.8rem 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .title-1 {
-      margin-bottom: 0.3rem;
-    }
-
-    .left {
-      .btn {
-        padding: 10px 20px;
-        color: #526aff;
-        background: #fff;
-        border-radius: 50px;
-        margin: 10px;
-        font-size: 0.2rem;
-        width: 150px;
-        text-align: center;
-        cursor: pointer;
-      }
-
-      .btn-box {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-end;
-      }
-    }
-
-    .content {
-      display: flex;
-      width: 13rem;
+      flex-direction: column;
       justify-content: space-between;
+      align-items: center;
 
-      .word-bg {
-        background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+      .line {
+        width: 0.4rem;
+        height: 0.04rem;
+      }
+    }
+
+    .selectNow {
+      color: #526aff;
+
+      .line {
+        background: #526aff;
+      }
+    }
+  }
+}
+
+.use-way {
+  padding: 0.8rem 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .title-1 {
+    margin-bottom: 0.3rem;
+  }
+
+  .left {
+    .btn {
+      padding: 10px 20px;
+      color: #526aff;
+      background: #fff;
+      border-radius: 50px;
+      margin: 10px;
+      font-size: 0.2rem;
+      width: 150px;
+      text-align: center;
+      cursor: pointer;
+    }
+
+    .btn-box {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+    }
+  }
+
+  .content {
+    display: flex;
+    width: 13rem;
+    justify-content: space-between;
+
+    .word-bg {
+      background: linear-gradient(90deg, #7184fc, #94a3fc) !important;
+    }
+
+    .content-card {
+      height: 1.5rem;
+      width: 6.2rem;
+      border-radius: 0.2rem;
+      background: linear-gradient(to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4));
+      padding: 0 0.3rem;
+      display: flex;
+      justify-content: center;
+
+      .card-title {
+        font-size: 0.26rem;
+        color: #212956;
+        margin-bottom: 0.2rem;
+        line-height: 0.26rem;
       }
 
-      .content-card {
-        height: 1.5rem;
-        width: 6.2rem;
-        border-radius: 0.2rem;
-        background: linear-gradient(
-          to right,
-          rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
-        );
-        padding: 0 0.3rem;
-        display: flex;
-        justify-content: center;
+      .content-card-item {
+        width: 50%;
 
-        .card-title {
-          font-size: 0.26rem;
-          color: #212956;
-          margin-bottom: 0.2rem;
-          line-height: 0.26rem;
+        .card-text {
+          margin-right: 0.2rem;
+          color: rgba(33, 41, 86, 0.8);
+          font-size: 0.2rem;
+          max-width: 2.8rem;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
         }
 
-        .content-card-item {
-          width: 50%;
-
-          .card-text {
-            margin-right: 0.2rem;
-            color: rgba(33, 41, 86, 0.8);
-            font-size: 0.2rem;
-            max-width: 2.8rem;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-          }
-
-          div:first-child {
-            display: block;
-          }
+        div:first-child {
+          display: block;
         }
       }
     }
   }
+}
 
-  .pain-point {
-    padding: 0.8rem 0;
-    background: rgb(247, 248, 250);
-    .bg {
+.pain-point {
+  padding: 0.8rem 0;
+  background: rgb(247, 248, 250);
+
+  .bg {
+    height: 3rem;
+    width: 3rem;
+    // background: url('~@/assets/home/rhfw_square.png') no-repeat;
+    // background-size: 100%;
+    margin-top: 0.3rem;
+  }
+
+  .cjtd {
+    width: 5.75rem;
+    height: 3.4rem;
+    background: url('~@/assets/home/fn/cjtd.png') no-repeat;
+    background-size: 100%;
+  }
+
+  .content {
+    overflow: auto;
+    height: 3rem;
+    width: 7rem;
+    margin-top: 0.3rem;
+
+    .content-item {
+      font-size: 16px;
+      margin: 0rem 0rem 0.1rem 0.1rem;
+    }
+  }
+}
+
+.solution {
+  padding: 0.8rem 0;
+  background: rgb(247, 248, 250);
+
+  .content {
+    width: 11rem;
+
+    .content-item {
+      font-size: 16px;
+      margin: 0.3rem;
+    }
+  }
+}
+
+.step {
+  padding: 0.8rem 0;
+  background: rgb(247, 248, 250);
+
+  .step-content {
+    margin: 0.3rem 4.5rem;
+    padding: 0.3rem;
+    background: #fff;
+
+    :deep(.el-step__description.is-finish) {
+      color: #333;
+      line-height: 0.24rem;
+      margin-top: 0.05rem;
+    }
+
+    /deep/ .el-step__title {
+      font-size: 18px;
+    }
+
+    /deep/ .el-step__description {
+      font-size: 14px;
+    }
+  }
+}
+
+.ability {
+  padding: 0.8rem 0;
+  background: rgb(247, 248, 250);
+
+  .title-1 {
+    margin-bottom: 0.3rem;
+  }
+
+  .combine-content {
+    margin-top: 0.3rem;
+    align-items: flex-start;
+    border-bottom: 1px solid #ccc;
+    margin: 0.2rem 3.5rem 0;
+    padding: 0.2rem 0;
+
+    .title {
       height: 3rem;
       width: 3rem;
-      // background: url('~@/assets/home/rhfw_square.png') no-repeat;
-      // background-size: 100%;
-      margin-top: 0.3rem;
+      margin-right: 0.4rem;
+      background: url('~@/assets/home/rhfw_square.png') no-repeat;
+      background-size: 100% 100%;
     }
-    .cjtd {
-      width: 5.75rem;
-      height: 3.4rem;
-      background: url('~@/assets/home/fn/cjtd.png') no-repeat;
-      background-size: 100%;
+
+    .title0 {
+      width: 5.6rem;
+      height: 3.45rem;
+      background: url('~@/assets/home/fn/jcss.png') no-repeat;
+      background-size: 100% 100%;
     }
-    .content {
-      overflow: auto;
-      height: 3rem;
-      width: 7rem;
-      margin-top: 0.3rem;
-      .content-item {
-        font-size: 16px;
-        margin: 0rem 0rem 0.1rem 0.1rem;
-      }
+
+    .title1 {
+      width: 5.6rem;
+      height: 3.45rem;
+      background: url('~@/assets/home/fn/zjfw.png') no-repeat;
+      background-size: 100% 100%;
+    }
+
+    .title2 {
+      width: 5.6rem;
+      height: 3.45rem;
+      background: url('~@/assets/home/fn/sjzy.png') no-repeat;
+      background-size: 100% 100%;
+    }
+    .table-box {
+      height: 3.45rem;
+      flex: 1;
+      overflow-y: auto;
+    }
+
+    .table {
+      // width: 100%;
+      font-size: 16px;
     }
   }
 
-  .solution {
-    padding: 0.8rem 0;
-    background: rgb(247, 248, 250);
-    .content {
-      width: 11rem;
-      .content-item {
-        font-size: 16px;
-        margin: 0.3rem;
-      }
-    }
+  .name-box {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    width: 100%;
   }
 
-  .step {
-    padding: 0.8rem 0;
-    background: rgb(247, 248, 250);
-    .step-content {
-      margin: 0.3rem 4.5rem;
-      padding: 0.3rem;
-      background: #fff;
-      :deep(.el-step__description.is-finish) {
-        color: #333;
-        line-height: 0.24rem;
-        margin-top: 0.05rem;
-      }
-      /deep/ .el-step__title {
-        font-size: 18px;
-      }
-      /deep/ .el-step__description {
-        font-size: 14px;
-      }
-    }
+  .no-data {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.16rem;
+    color: #666;
+    text-align: center;
   }
 
-  .ability {
-    padding: 0.8rem 0;
-    background: rgb(247, 248, 250);
-
-    .title-1 {
-      margin-bottom: 0.3rem;
-    }
-
-    .combine-content {
-      margin-top: 0.3rem;
-      align-items: flex-start;
-      border-bottom: 1px solid #ccc;
-      margin: 0.2rem 4rem 0;
-      padding: 0.2rem 0;
-      .title {
-        height: 3rem;
-        width: 3rem;
-        margin-right: 0.5rem;
-        background: url('~@/assets/home/rhfw_square.png') no-repeat;
-        background-size: 100%;
-      }
-      .title0 {
-        width: 5.6rem;
-        height: 3.45rem;
-        background: url('~@/assets/home/fn/jcss.png') no-repeat;
-        background-size: 100%;
-      }
-      .title1 {
-        width: 5.6rem;
-        height: 3.45rem;
-        background: url('~@/assets/home/fn/zjfw.png') no-repeat;
-        background-size: 100%;
-      }
-      .title2 {
-        width: 5.6rem;
-        height: 3.45rem;
-        background: url('~@/assets/home/fn/sjzy.png') no-repeat;
-        background-size: 100%;
-      }
-      .table {
-        width: 100%;
-        font-size: 16px;
-      }
-    }
-    .name-box {
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-      width: 100%;
-    }
-
-    .no-data {
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      align-items: center;
-      justify-content: center;
-      font-size: 0.16rem;
-      color: #666;
-      text-align: center;
-    }
-
-    .name-text {
-      font-size: 0.16rem;
-      color: #212121;
-      line-height: 0.3rem;
-      height: 0.3rem;
-      text-align: center;
-      width: 50%;
-      box-sizing: border-box;
-    }
+  .name-text {
+    font-size: 0.16rem;
+    color: #212121;
+    line-height: 0.3rem;
+    height: 0.3rem;
+    text-align: center;
+    width: 50%;
+    box-sizing: border-box;
   }
+}
 </style>
diff --git a/front/src/views/instructionManual/components/abilityDocTree.vue b/front/src/views/instructionManual/components/abilityDocTree.vue
index 3523542d..a9bcbd1e 100644
--- a/front/src/views/instructionManual/components/abilityDocTree.vue
+++ b/front/src/views/instructionManual/components/abilityDocTree.vue
@@ -26,7 +26,7 @@ import {
   ref,
   watch,
   defineProps,
-  nextTick,
+  defineEmits,
 } from 'vue'
 import { getDevelopDocTree } from '@/api/home'
 import { message } from 'ant-design-vue'