From e4280e3874c85838c0cab98fa11902ab2f819612 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Thu, 14 Jul 2022 10:56:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E7=94=B3=E8=AF=B7=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=20=E5=B8=B8=E8=A7=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/ApplicationTopDetails.vue     | 368 ++++++++++--------
 .../views/home/integrationServicesDetails.vue |   4 +-
 2 files changed, 216 insertions(+), 156 deletions(-)

diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 6a5816ae..94557648 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -52,6 +52,13 @@
           <template #icon><shopping-cart-outlined /></template>
           加入购物车
         </a-button> -->
+        <!-- 融合服务 存在fuseResourceList -->
+        <a-button type="primary" @click="handleAKeyApplication()" v-if="dataList.fuseResourceList">
+          <template #icon>
+            <form-outlined />
+          </template>
+          申请使用
+        </a-button>
         <a-button type="primary" @click="goTOCollection()">收藏</a-button>
       </div>
     </div>
@@ -59,168 +66,223 @@
   </div>
 </template>
 <script setup>
-  // import { ShoppingCartOutlined } from '@ant-design/icons-vue'
-  import { defineProps, ref, watch } from 'vue'
-  import { scInsert } from '@/api/personalCenter'
-  // import { sgcInsert } from '@/api/home'
-  // import { useRouter } from 'vue-router'
-  // import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
-  const props = defineProps({
-    dataList: { type: Object, default: null },
-  })
-  // const router = useRouter()
-  const applicationArea = ref('')
-  // // 加入申购车
-  // const addShoppingCart = () => {
-  //   console.log('加入申购车==================>', props.dataList)
-  //   sgcInsert({
-  //     delFlag: '0',
-  //     resourceId: props.dataList.id,
-  //     // userId: userId.value,
-  //   }).then((res) => {
-  //     console.log(res)
-  //     message.success('添加申购车成功！')
-  //     mybus.emit('getSgcNum')
-  //   })
-  // }
-  // // 立即申请
-  // function toView() {
-  //   // window.open(newpage.href, '_blank')
-  //   router.push({
-  //     path: '/apply',
-  //     query: {
-  //       name: props.dataList.name,
-  //       resourceId: [props.dataList.id],
-  //     },
-  //   })
-  // }
-  // 收藏
-  const goTOCollection = () => {
-    console.log('收藏===================》', props.dataList)
-    scInsert([{ resourceId: props.dataList.id }]).then((res) => {
-      console.log(res)
-      message.success('收藏成功')
-    })
-  }
-  if (props.dataList.infoList) {
-    applicationArea.value = props.dataList.infoList.filter(
-      (val) => val.attrType === '应用领域'
-    )[0].attrValue
-  }
-  watch(
-    () => props.dataList,
-    (val) => {
-      if (val) {
-        applicationArea.value = props.dataList.infoList.filter(
-          (val) => val.attrType === '应用领域'
-        )[0].attrValue
-      }
+// import { ShoppingCartOutlined } from '@ant-design/icons-vue'
+import { defineProps, ref, watch } from 'vue'
+import { scInsert } from '@/api/personalCenter'
+// import { sgcInsert } from '@/api/home'
+// import { useRouter } from 'vue-router'
+// import mybus from '@/myplugins/mybus'
+import { message } from 'ant-design-vue'
+import { useRouter } from 'vue-router'
+// 获取当前路由地址
+const router = useRouter()
+
+const props = defineProps({
+  dataList: { type: Object, default: null },
+})
+
+console.log('dataList------------>', props.dataList);
+
+// const router = useRouter()
+const applicationArea = ref('')
+// // 加入申购车
+// const addShoppingCart = () => {
+//   console.log('加入申购车==================>', props.dataList)
+//   sgcInsert({
+//     delFlag: '0',
+//     resourceId: props.dataList.id,
+//     // userId: userId.value,
+//   }).then((res) => {
+//     console.log(res)
+//     message.success('添加申购车成功！')
+//     mybus.emit('getSgcNum')
+//   })
+// }
+// // 立即申请
+// function toView() {
+//   // window.open(newpage.href, '_blank')
+//   router.push({
+//     path: '/apply',
+//     query: {
+//       name: props.dataList.name,
+//       resourceId: [props.dataList.id],
+//     },
+//   })
+// }
+// 融合服务--一键申请
+const handleAKeyApplication = () => {
+  let _applyList = [];
+  (props.dataList.fuseResourceList || []).map(v => {
+    let resource = v.resource || {}
+    let obj = {
+      arr: [
+        {
+          delFlag: resource.delFlag,
+          description: resource.description,
+          resourceId: resource.id,
+          resourceName: resource.name,
+          time: resource.createDate,
+          type: resource.type,
+        },
+      ],
+      deptId: resource.deptId,
+      deptName: resource.deptName,
     }
+    _applyList.push(obj)
+  })
+
+  localStorage.setItem(
+    'applyList',
+    JSON.stringify(_applyList)
   )
+  router.push({
+    path: '/apply',
+  })
+}
+
+// 收藏
+const goTOCollection = () => {
+  console.log('收藏===================》', props.dataList)
+  scInsert([{ resourceId: props.dataList.id }]).then((res) => {
+    console.log(res)
+    message.success('收藏成功')
+  })
+}
+if (props.dataList.infoList) {
+  applicationArea.value = props.dataList.infoList.filter(
+    (val) => val.attrType === '应用领域'
+  )[0].attrValue
+}
+watch(
+  () => props.dataList,
+  (val) => {
+    if (val) {
+      console.log('props.dataList-----watch------->', val);
+
+      applicationArea.value = props.dataList.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0].attrValue
+    }
+  }
+)
 </script>
 <style lang="less" scoped>
-  .algorithm-top-details {
-    height: 6rem;
-    padding: 1.8rem 0 0;
-    background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
-    background-size: 100%;
-    display: flex;
-    justify-content: center;
-    .left {
-      max-width: 7.2rem;
-      color: #fff;
-      margin-right: 0.8rem;
+.algorithm-top-details {
+  height: 6rem;
+  padding: 1.8rem 0 0;
+  background: url('~@/assets/detailsAll/sf_top_bg.png') no-repeat;
+  background-size: 100%;
+  display: flex;
+  justify-content: center;
 
-      .top {
-        display: flex;
-        align-items: center;
-        span {
-          font-size: 0.14rem;
-        }
-        .name {
-          // max-width: 3.3rem;
-          // overflow: hidden;
-          // text-overflow: ellipsis;
-          // white-space: nowrap;
-          font-size: 0.4rem;
-          margin-right: 0.2rem;
-          font-size: 0.4rem;
-          margin-right: 0.2rem;
-          max-width: 7rem;
-          text-overflow: -o-ellipsis-lastline;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 1;
-          -webkit-box-orient: vertical;
-        }
-        .label-content {
-          position: relative;
-        }
-        .lable-father {
-          position: absolute;
-          min-width: 3.5rem;
-          right: -3.5rem;
-          top: 0;
-        }
-        .label {
-          padding: 0.01rem 0.1rem;
-          margin-right: 0.1rem;
-          border-radius: 0.13rem;
-          background: rgba(255, 255, 255, 0.4);
-        }
+  .left {
+    max-width: 7.2rem;
+    color: #fff;
+    margin-right: 0.8rem;
+
+    .top {
+      display: flex;
+      align-items: center;
+
+      span {
+        font-size: 0.14rem;
       }
-      .main {
-        margin-top: 0.2rem;
-        font-size: 0.18rem;
-        line-height: 0.34rem;
-        & > div:nth-of-type(1) {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-        & > div:nth-of-type(2) {
-          max-height: 1rem;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 3;
-          -webkit-box-orient: vertical;
-        }
+
+      .name {
+        // max-width: 3.3rem;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
+        // white-space: nowrap;
+        font-size: 0.4rem;
+        margin-right: 0.2rem;
+        font-size: 0.4rem;
+        margin-right: 0.2rem;
+        max-width: 7rem;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
       }
-      .bottom {
-        margin-top: 0.4rem;
-        display: flex;
-        .ant-btn {
-          height: 0.5rem;
-          margin-right: 0.2rem;
-          background: #ff8b55;
-          border-radius: 0.06rem;
-          font-size: 0.2rem;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        }
-        .ant-btn:nth-of-type(1) {
-          width: 1.8rem;
-        }
-        .ant-btn:nth-of-type(2) {
-          width: 2.2rem;
-        }
-        .ant-btn:nth-of-type(3) {
-          width: 1.45rem;
-          background: #fff;
-          color: #526aff;
-        }
+
+      .label-content {
+        position: relative;
+      }
+
+      .lable-father {
+        position: absolute;
+        min-width: 3.5rem;
+        right: -3.5rem;
+        top: 0;
+      }
+
+      .label {
+        padding: 0.01rem 0.1rem;
+        margin-right: 0.1rem;
+        border-radius: 0.13rem;
+        background: rgba(255, 255, 255, 0.4);
       }
     }
-    .right {
-      width: 5.8rem;
-      height: 4rem;
-      background: url('~@/assets/detailsAll/sf_right_bg.png') no-repeat;
-      background-size: 100%;
-      margin-top: -0.4rem;
+
+    .main {
+      margin-top: 0.2rem;
+      font-size: 0.18rem;
+      line-height: 0.34rem;
+
+      &>div:nth-of-type(1) {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      &>div:nth-of-type(2) {
+        max-height: 1rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 3;
+        -webkit-box-orient: vertical;
+      }
+    }
+
+    .bottom {
+      margin-top: 0.4rem;
+      display: flex;
+
+      .ant-btn {
+        height: 0.5rem;
+        margin-right: 0.2rem;
+        background: #ff8b55;
+        border-radius: 0.06rem;
+        font-size: 0.2rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .ant-btn:nth-of-type(1) {
+        width: 1.8rem;
+      }
+
+      .ant-btn:nth-of-type(2) {
+        width: 2.2rem;
+      }
+
+      .ant-btn:nth-of-type(3) {
+        width: 1.45rem;
+        background: #fff;
+        color: #526aff;
+      }
     }
   }
+
+  .right {
+    width: 5.8rem;
+    height: 4rem;
+    background: url('~@/assets/detailsAll/sf_right_bg.png') no-repeat;
+    background-size: 100%;
+    margin-top: -0.4rem;
+  }
+}
 </style>
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index e4faf4a4..b42ce15f 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -187,14 +187,12 @@ const getIntegrationServicesDeatil = (id) => {
     let questionValue = fuseAttrList.find(v => v.attrType === '常见问题') || {}
     let questionObj = {
       attrType: '常见问题',
-      attrValue: JSON.stringify(questionValue.attrValue || [])
+      attrValue: questionValue.attrValue || "[]"
     }
     let areaObj = {
       attrType: '应用领域',
       attrValue: detailInfoObj.value.applicationArea
     }
-    console.log('areaObj------------>', areaObj);
-    
     combineList.value.map(item => {
       let arr = (fuseResourceList.filter(v => v.resource && v.resource.type == item.title) || []).map(d => d.resource.name)
       item.list = arr;