From 035a600a3cb58a7afb8aa74d0a1b2cb525da7939 Mon Sep 17 00:00:00 2001
From: lizhicheng2 <lizhicheng2@hisense.com>
Date: Mon, 1 Aug 2022 16:43:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/integrationServicesDetails.vue | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index 73c3f3cb..c792ace5 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -63,37 +63,38 @@
       <div class="title-1">
         <DetalsTitle title="使用能力" type="ABILITY"></DetalsTitle>
       </div>
-      <template v-for="(item, i) in combineList" :key="i">
-        <div class="flex-row-center combine-content" v-if="item.list.length>0">
-          <div class="title">{{item.title}}</div>
+        <div class="flex-row-center combine-content" v-for="(item, i) in combineList" :key="i">
+          <div class="title"></div>
           <div>
             <el-table
+              class="table"
               :data="item.list"
               stripe
-              style="width: 100%"
-              :header-cell-style="{'text-align': 'center'}"
-              @row-click="openResourceDetail">
+              :header-cell-style="{'text-align': 'center'}">
               <el-table-column
                 prop="name"
                 label="数据"
                 align="center"
-                width="100">
+                width="200"
+                show-overflow-tooltip="true">
               </el-table-column>
               <el-table-column
                 prop="dept"
                 label="能力来源"
                 align="center"
-                width="180">
+                width="300"
+                show-overflow-tooltip="true">
               </el-table-column>
               <el-table-column
                 prop="platform"
                 label="申请平台"
-                align="center">
+                align="center"
+                width="100"
+                show-overflow-tooltip="true">
               </el-table-column>
             </el-table>
           </div>
         </div>
-      </template>
     </div>
 
     <!-- 构建步骤 -->
@@ -105,14 +106,11 @@
         <DetalsTitle title="构建步骤" type="STEP"></DetalsTitle>
       </div>
       <div class="flex-row-center step-content">
-        <div style="height: 300px;">
-          <el-steps direction="vertical" :active="step.length">
-            <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
-          </el-steps>
-        </div>
+        <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-steps>
       </div>
     </div>
-
     <home-footer></home-footer>
   </div>
 </template>
@@ -271,7 +269,7 @@
               }))
             }else if(item.title==='数据资源'){
               arr=resource.map(res=>({
-                id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: 'UCS'
+                id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: '共享交换平台'
               }))
             }
           }
@@ -288,10 +286,6 @@
   }
   getIntegrationServicesDeatil(id)
 
-  function openResourceDetail(row, column, event){
-    console.log(row)
-  }
-
   function handleOpenUrl(type) {
     let obj =
       (detailInfoObj.value.fuseAttrList || []).find(
@@ -467,17 +461,20 @@
     padding: 0.8rem 0;
     background: rgb(247, 248, 250);
     .bg {
-        height: 2rem;
-        width: 2rem;
+        height: 3rem;
+        width: 3rem;
         background: url('~@/assets/home/rhfw_square.png') no-repeat;
         background-size: 100%;
         margin-top: 0.3rem;
     }
     .content {
-        height: 2rem;
+        overflow: auto;
+        height: 3rem;
         width: 6rem;
+        margin-top: 0.3rem;
         .content-item {
-          margin: 0.1rem;
+          font-size: 16px;
+          margin: 0rem 0rem 0.1rem 0.1rem;
         }
     }
   }
@@ -486,9 +483,9 @@
     padding: 0.8rem 0;
     background: rgb(247, 248, 250);
     .content {
-        height: 2rem;
-        width: 8rem;
+        width: 9rem;
         .content-item {
+          font-size: 16px;
           margin: 0.3rem;
         }
     }
@@ -499,6 +496,12 @@
     background: rgb(247, 248, 250);
     .step-content {
       margin-top: 0.3rem;
+      /deep/ .el-step__title {
+        font-size: 16px;
+      }
+      /deep/ .el-step__description {
+        font-size: 14px;
+      }
     }
   }
 
@@ -514,12 +517,16 @@
       margin-top: 0.3rem;
       align-items: flex-start;
       .title {
-        height: 2rem;
-        width: 2rem;
+        height: 3rem;
+        width: 3rem;
         margin-right: 0.5rem;
         background: url('~@/assets/home/rhfw_square.png') no-repeat;
         background-size: 100%;
       }
+      .table {
+        width: 100%;
+        font-size: 16px
+      }
     }
 
     .name-box {

From ae2e32376980cbf45181811a3204634fa07e5189 Mon Sep 17 00:00:00 2001
From: lizhicheng2 <lizhicheng2@hisense.com>
Date: Mon, 1 Aug 2022 17:05:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/searchResultList.vue      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index f755cb77..7e97ba24 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -10,7 +10,7 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul v-if="selectCardsname === '融合服务'">
+        <ul v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'">
           <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
             {{ item.name }}
             <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
@@ -42,7 +42,7 @@
         </div>
         <div class="left" style="display: flex;
           align-items: center"
-          v-else-if="selectCardsname === '融合服务' && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
+          v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
           <a-image :width="106" :preview="false"
             :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
         </div>
@@ -72,10 +72,10 @@
                         ? 'ywzj'
                         : ''
         " v-else-if="
-  selectCardsname !== '基础设施' && selectCardsname !== '融合服务'
+  selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景'
 "></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="selectCardsname === '融合服务'"></div>
+        <div class="left rhfw" v-else-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
@@ -95,7 +95,7 @@
               </svg>
             </span>
             <div class="header-right">
-              <div v-if="selectCardsname === '融合服务'" class="label-content">
+              <div v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'" class="label-content">
                 <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
                   <span class="label"
                     v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
@@ -132,7 +132,7 @@
               <span>{{ item.shareType || '--' }}</span>
             </div> -->
             <div v-if="
-              selectCardsname !== '融合服务' && selectCardsname !== '基础设施'
+              selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' && selectCardsname !== '基础设施'
             ">
               <span>{{ item.deptName || '--' }}</span>
             </div>
@@ -148,20 +148,23 @@
               <div>
                 <div v-if="
                   selectCardsname !== '数据资源' &&
-                  selectCardsname !== '融合服务'
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景'
                 ">
                   浏览量：{{ item.visits || 0 }}次
                 </div>
                 <div v-if="
                   selectCardsname !== '数据资源' &&
                   selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景' &&
                   (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
                 ">
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
                 <div v-if="
                   selectCardsname === '数据资源' &&
-                  selectCardsname !== '融合服务'
+                  selectCardsname !== '融合服务' &&
+                  selectCardsname !== '赋能场景'
                 ">
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
@@ -201,7 +204,7 @@
               <a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
                 查看详情
               </a-button>
-              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务'"
+              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"
                 @click="handleAKeyApplication(item)">
                 一键申请
               </a-button>
@@ -675,7 +678,7 @@ export default {
       if (!typeObj) {
         selData.value = 'total'
       }
-      if (typeObj && typeObj.type === '融合服务') {
+      if (typeObj && (typeObj.type === '融合服务' || typeObj.type === '赋能场景')) {
         orderList.value = [
           {
             value: 'collectCount',

From 9bb633e1e61d9286aa5be2ab59b64b82ac5d0191 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 1 Aug 2022 17:52:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/ApplicationPresentation.vue   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
index ccee9b56..b7d0e91a 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationPresentation.vue
@@ -1,12 +1,16 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 15:25:33
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 17:03:24
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-08-01 17:52:20
  * @Description: 应用展示  视频播放
 -->
 <template>
-  <div class="application-presentation" v-if="flag">
+  <div
+    class="application-presentation"
+    id="application-presentation"
+    v-if="flag"
+  >
     <detals-title title="应用展示" type="IMAGE&VIDEO"></detals-title>
     <div class="box">
       <div class="left" @click="chagneShow()"></div>
@@ -33,6 +37,7 @@
     </div>
     <a-modal
       v-model:visible="visible"
+      :getContainer="() => document.getElementById('application-presentation')"
       title="视频预览"
       :width="750"
       destroyOnClose
@@ -84,7 +89,19 @@
     }
   }
   const showModal = () => {
+    // console.log(
+    //   '点击视频==================>',
+    //   document.documentElement.scrollTop,
+    //   document.body.scrollTop
+    // )
     visible.value = true
+    // window.setTimeout(() => {
+    //   console.log(
+    //     '点击视频==================>',
+    //     document.documentElement.scrollTop,
+    //     document.body.scrollTop
+    //   )
+    // }, 1000)
   }
   const props = defineProps({
     dataList: { type: Object, default: null },