Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/abilityStatistics/index.vue

@@ -10,7 +10,7 @@
     <new-home-header></new-home-header>
     <ability-total></ability-total>
     <resource-aggregation></resource-aggregation>
-    <atlas-resources></atlas-resources>
+    <!-- <atlas-resources></atlas-resources> -->
     <sharing-situation></sharing-situation>
     <ability-ranking></ability-ranking>
     <capability-requirements></capability-requirements>

front/src/views/home/integrationServicesDetails.vue

@@ -4,13 +4,20 @@
     <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>
@@ -29,11 +36,16 @@
         </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>
@@ -41,17 +53,26 @@
     </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>
@@ -63,20 +84,48 @@
       <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
-        <div class="top" style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem">
+        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 class="table-box">
-            <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
+            <el-table
-              <el-table-column prop="name" label="数据" align="center" width="200" show-overflow-tooltip="true">
+              class="table"
-              </el-table-column>
+              :data="item.list"
-              <el-table-column prop="dept" label="能力来源" align="center" width="300" show-overflow-tooltip="true">
+              stripe
-              </el-table-column>
+              :header-cell-style="{ 'text-align': 'center' }"
-              <el-table-column prop="platform" label="申请平台" align="center" width="100" show-overflow-tooltip="true">
+            >
-              </el-table-column>
+              <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>
@@ -90,7 +139,12 @@
       </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>
@@ -215,12 +269,10 @@ const selectNav = (key) => {
     mybus.emit('flyToView', selectNow.value)
   }
 
-const getAttrValue = (fuseAttrList, data, text) => {
+  const getAttrValue = (fuseAttrList, text) => {
-  let _obj = fuseAttrList.find((v) => v.attrType === text) || {};
+    let _obj = fuseAttrList.find((v) => v.attrType === text) || {}
-  data =
+    let data = JSON.parse(_obj.attrValue || '[]') || []
-    JSON.parse(
+    return data
-      _obj.attrValue || '[]'
-    ) || []
   }
 
   // 融合服务--详情
@@ -241,9 +293,9 @@ const getIntegrationServicesDeatil = (id) => {
           attrType: '常见问题',
           attrValue: questionValue.attrValue || '[]',
         }
-      getAttrValue(fuseAttrList, painPoint.value, '场景痛点');
+        painPoint.value = getAttrValue(fuseAttrList, '场景痛点')
-      getAttrValue(fuseAttrList, solution.value, '解决方案');
+        solution.value = getAttrValue(fuseAttrList, '解决方案')
-      getAttrValue(fuseAttrList, step.value, '使用步骤');
+        step.value = getAttrValue(fuseAttrList, '使用步骤')
         bgImg.value =
           fuseAttrList.find((v) => v.attrType === '服务图片').attrValue || ''
         let areaObj = {
@@ -447,9 +499,11 @@ onBeforeUnmount(() => {
         height: 1.5rem;
         width: 6.2rem;
         border-radius: 0.2rem;
-      background: linear-gradient(to right,
+        background: linear-gradient(
+          to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
+          rgba(148, 163, 252, 0.4)
+        );
         padding: 0 0.3rem;
         display: flex;
         justify-content: center;