合并冲突之后的文件

front/src/api/file.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-05-26 22:40:46
+ * @LastEditTime: 2022-06-19 17:32:12
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -50,7 +50,7 @@ export function paddleocr(params) {
 // 能力云图-数据资源
 export function count() {
   return axios.post(
-    'http://10.10.30.24:30058/share-portal/platform/index/abilityMarket/count',
+    'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
     config2
   )
 }

front/src/views/capabilityCloud/components/ApplicationResources.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:16:10
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 17:02:39
+ * @LastEditTime: 2022-06-19 17:52:19
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -277,9 +277,15 @@
     background: rgba(0, 108, 188, 0.1);
     border-radius: 2px;
     border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .top {
       font-size: 24px;
       background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
+      background-size: 100% 100%;
       text-align: center;
     }
     .bottom {
@@ -301,14 +307,31 @@
           );
           margin-top: 0.14rem;
           display: flex;
-          justify-content: center;
+          justify-content: space-between;
           align-items: center;
           .img {
             width: 0.66rem;
             height: 0.66rem;
+            margin-left: 0.26rem;
             margin-right: 0.26rem;
+            text-decoration: none;
+            outline: none;
+            -webkit-transition: all 800ms ease-out;
+            -moz-transition: all 800ms ease-out;
+            transition: all 800ms ease-out;
+          }
+          .img:hover {
+            width: 0.7rem;
+            height: 0.7rem;
+            -webkit-transform: rotateY(180deg);
+            -moz-transform: rotateY(180deg);
+            transform: rotateY(180deg);
+            -webkit-transition-delay: 0.2s;
+            -moz-transition-delay: 0.2s;
+            transition-delay: 0.2s;
           }
           .content {
+            width: 1.5rem;
             .name {
               font-size: 16px;
               color: #fff;
@@ -329,7 +352,6 @@
         .item:nth-of-type(2) .img {
           background: url('~@/assets/capabilityCloud/jszyys.png') no-repeat;
           background-size: 100% 100%;
-          margin-left: 0.2rem;
         }
         .item:nth-of-type(3) .img {
           background: url('~@/assets/capabilityCloud/tyyys.png') no-repeat;
@@ -380,4 +402,25 @@
       }
     }
   }
+  .application-resources:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 10:17:22
+ * @LastEditTime: 2022-06-19 18:04:28
  * @Description: 能力云图-组件服务
 -->
 <template>
@@ -312,6 +312,11 @@
     background: rgba(0, 108, 188, 0.1);
     border: 0.01rem rgba(0, 108, 188, 0.7) solid;
     border-radius: 0.03rem;
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .component-services-top {
       width: 7.84rem;
       height: 0.44rem;
@@ -558,4 +563,25 @@
       }
     }
   }
+  .component-services:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/components/DataResources.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 10:18:16
+ * @LastEditTime: 2022-06-19 18:08:39
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -57,28 +57,28 @@
   const assignRankings = ref([
     {
       index: '1',
-      name: '0',
+      name: ' ',
-      operation: '0',
+      operation: ' ',
     },
     {
       index: '2',
-      name: '0',
+      name: ' ',
-      operation: '0',
+      operation: ' ',
     },
     {
       index: '3',
-      name: '0',
+      name: ' ',
-      operation: '0',
+      operation: ' ',
     },
     {
       index: '4',
-      name: '0',
+      name: ' ',
-      operation: '0',
+      operation: ' ',
     },
     {
       index: '5',
-      name: '0',
+      name: ' ',
-      operation: '0',
+      operation: ' ',
     },
   ])
   const columns = ref([
@@ -131,56 +131,66 @@
   count().then((res) => {
     contentData.value = res.data.data
     console.log(contentData.value)
+    // 总申请次数
     resourcesLeft.value[1].num = contentData.value.requestCount || '0'
+    // 总满足率
     resourcesLeft.value[2].num =
-      contentData.value.satisfactionRate + '%' || '0' + '%'
+      contentData.value.satisfactionRate * 100 + '%' || '0' + '%'
     // 排行
     for (let i = 1; i < 6; i++) {
+      // TOP
       assignRankings.value[i - 1].index = i
+      //
       assignRankings.value[i - 1].name =
-        contentData.value.list[i - 1].resourceTop5.service_name || '0'
+        contentData.value.resourceTop5[i - 1].service_name || ''
       assignRankings.value[i - 1].opacity =
-        contentData.value.list[i - 1].resourceTop5.count || '0'
+        contentData.value.resourceTop5[i - 1].count || ' '
     }
   })
   // 请求右侧数据结束
 </script>
 <style lang="less" scoped>
   .data-resources {
-    width: 440px;
+    width: 4.4rem;
-    height: 465px;
+    height: 4.63rem;
     background: rgba(0, 108, 188, 0.1);
-    border-radius: 2px;
+    border-radius: 0.02rem;
-    border: 1px solid rgba(0, 108, 188, 0.7);
+    border: 0.01rem solid rgba(0, 108, 188, 0.7);
+    box-sizing: border-box;
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .resources-top {
-      height: 60px;
+      height: 0.6rem;
       background: url('~@/assets/capabilityCloud/resources-title.png') no-repeat;
       text-align: center;
-      font-size: 24px;
+      font-size: 0.24rem;
     }
     .resources-bottom {
       width: 100%;
       display: flex;
       .resources-left {
-        width: 156px;
+        width: 1.56rem;
-        height: 275px;
+        height: 2.75rem;
         background-image: linear-gradient(#214678, transparent);
         text-align: center;
-        margin-left: 18px;
+        margin-left: 0.18rem;
         position: relative;
         div {
-          margin: 0 10px;
+          margin: 0 0.1rem;
-          border-bottom: 1px solid #1f557c;
+          border-bottom: 0.01rem solid #1f557c;
           h3 {
-            font-size: 16px;
+            font-size: 0.16rem;
             color: #ffffff;
-            margin-bottom: 0px;
+            margin-bottom: 0rem;
-            padding-top: 16px;
+            padding-top: 0.16rem;
           }
           .num {
-            font-size: 28px;
+            font-size: 0.28rem;
             color: #1ef6f5;
-            margin-bottom: 0px;
+            margin-bottom: 0rem;
           }
         }
         div:last-of-type {
@@ -190,37 +200,46 @@
           width: 90%;
           position: absolute;
           left: 50%;
-          bottom: -138px;
+          bottom: -1.38rem;
           margin-left: -45%;
+          animation: move 5s linear 0s infinite;
+          @keyframes move {
+            from {
+              transform: rotateY(360deg);
+            }
+            to {
+              transform: rotateY(0deg);
+            }
+          }
         }
       }
       .resources-right {
-        margin-left: 18px;
+        margin-left: 0.18rem;
-        width: 235px;
+        width: 2.35rem;
         display: flex;
         flex-direction: column;
         align-items: center;
         .resources-right-title {
-          width: 224px;
+          width: 2.24rem;
-          height: 100px;
+          height: 1rem;
           text-align: center;
           background: url('~@/assets/capabilityCloud/resources-right.png')
             no-repeat center;
           display: flex;
           align-items: center;
           h3 {
-            font-size: 18px;
+            font-size: 0.18rem;
             color: #ffffff;
             width: 100%;
-            height: 38px;
+            height: 0.38rem;
-            line-height: 38px;
+            line-height: 0.38rem;
             background: linear-gradient(
               to right,
               rgba(0, 0, 0, 0) 0%,
               #1b76cc 50%,
               rgba(0, 0, 0, 0) 100%
             );
-            text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
+            text-shadow: 0rem 0rem 0.02rem rgba(0, 0, 0, 0.6);
           }
         }
         .resources-right-table {
@@ -229,24 +248,26 @@
             background-color: #1f557c;
             border: none;
             color: #1ef6f5;
-            height: 32px;
+            height: 0.32rem;
             padding: 0;
           }
           :deep(.ant-table-row) {
-            height: 45px;
+            height: 0.45rem;
           }
           :deep(.ant-table-cell) {
             text-align: center;
-            border-bottom: 1px solid #1f557c;
+            transition: all 0s;
-            border-right: 1px solid #1f557c;
+            background: transparent;
+            border-bottom: 0.01rem solid #1f557c;
+            border-right: 0.01rem solid #1f557c;
             padding: 0;
           }
           :deep(.ant-table-cell:nth-child(1)) {
-            border-left: 1px solid #1f557c;
+            border-left: 0.01rem solid #1f557c;
           }
           :deep(.ant-table-cell:nth-child(2)) {
             text-align: left;
-            padding-left: 10px;
+            padding-left: 0.1rem;
           }
           :deep(.ant-table-cell:nth-child(3)) {
             color: #1ef6f5;
@@ -265,11 +286,32 @@
             border: none;
           }
           :deep(.ant-table-cell-row-hover) {
-            background: transparent;
             transition: all 0s;
+            background: transparent;
           }
         }
       }
     }
   }
+  .data-resources:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/components/Infrastructure.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 10:17:47
+ * @LastEditTime: 2022-06-19 18:00:19
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -16,7 +16,10 @@
         v-for="(item, index) in dataList"
         :key="index"
       >
-        <div class="num-class" :style="`background:url(${item.img}) no-repeat`">
+        <div
+          class="num-class"
+          :style="`background:url(${item.img}) no-repeat;background-position:top left;background-size:40%`"
+        >
           <div>{{ item.title }}</div>
           <div>{{ item.snum }}</div>
         </div>
@@ -84,6 +87,11 @@
     border-radius: 0.03rem;
     padding: 0.2rem;
     padding-top: 0;
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .infrastructure-top {
       width: 4.4rem;
       height: 0.44rem;
@@ -112,14 +120,16 @@
         padding-left: 0.1rem;
       }
       .num-class {
-        width: 1.7rem;
+        width: 1.5rem;
-        padding-left: 0.1rem;
+        height: 1rem;
         text-align: center;
+        margin-right: 0.2rem;
         & > div:first-child {
           font-size: 0.18rem;
           color: #ffffff;
           margin-bottom: 0.1rem;
           line-height: 0.18rem;
+          margin-top: 0.3rem;
         }
         & > div:last-child {
           font-size: 0.36rem;
@@ -159,4 +169,25 @@
       }
     }
   }
+  .infrastructure:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/components/KnowledgeBase.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 10:18:49
+ * @LastEditTime: 2022-06-19 18:10:47
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -48,45 +48,72 @@
 </script>
 <style lang="less" scoped>
   .knowledge-base {
-    width: 152px;
+    width: 1.52rem;
-    height: 465px;
+    height: 4.63rem;
     background: rgba(0, 108, 188, 0.1);
-    border-radius: 2px;
+    border-radius: 0.02rem;
-    border: 1px solid rgba(0, 108, 188, 0.7);
+    border: 0.01rem solid rgba(0, 108, 188, 0.7);
+    box-sizing: border-box;
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .knowledge-top {
-      height: 60px;
+      height: 0.6rem;
       background: url('~@/assets/capabilityCloud/Knowledge-title.png') no-repeat;
       text-align: center;
-      font-size: 24px;
+      font-size: 0.24rem;
     }
     .knowledge-content {
       width: 100%;
 
       div {
-        width: 118px;
+        width: 1.18rem;
-        height: 176px;
+        height: 1.76rem;
         margin: 0 auto;
         display: flex;
         flex-direction: column;
         align-items: center;
         background-image: linear-gradient(#214678, transparent);
-        margin-bottom: 20px;
+        margin-bottom: 0.2rem;
         img {
-          margin: 27px 0 12px;
+          margin: 0.27rem 0 0.12rem;
         }
         h3 {
-          font-size: 16px;
+          font-size: 0.16rem;
           font-weight: normal;
           color: #ffffff;
-          margin-bottom: 0px;
+          margin-bottom: 0rem;
         }
         .num {
           font-weight: 300;
-          font-size: 28px;
+          font-size: 0.28rem;
           color: #1ef6f5;
-          margin-bottom: 27px;
+          margin-bottom: 0.27rem;
         }
       }
     }
   }
+  .knowledge-base:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/components/PlatformOverview.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 16:50:27
+ * @LastEditTime: 2022-06-19 17:52:04
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -10,17 +10,21 @@
     <div class="top"><span class="title">平台概览</span></div>
     <div class="bottom">
       <div class="left">
+        <div class="box">
           <div class="item">
             <div class="name">平台访问量</div>
             <div claSS="num">{{ num1 }}</div>
           </div>
+        </div>
+        <div class="box">
           <div class="item">
             <div class="name">用户量</div>
             <div claSS="num">{{ num2 }}</div>
           </div>
         </div>
+      </div>
       <div class="right" :key="showKey">
-        <div class="title">浏览趋势</div>
+        <div class="title_echarts">浏览趋势</div>
         <div class="echarts-box" id="echarts-box"></div>
       </div>
     </div>
@@ -108,7 +112,17 @@
   }
   var option = {
     tooltip: {
+      backgroundColor: 'rgba(17,61,116,0.8)',
+      borderWidth: 0,
       trigger: 'axis',
+      formatter: function (val) {
+        console.log(val)
+        let res = `<div style="background:rgba(17,61,116,0.8);border:1px soild rgba(28,119,205,0.8);color:#fff;padding:0">
+                      <span>日期 : ${val[0].name}</span>
+                      <div style="margin-left: 18px">浏览次数 : ${val[0].value}</div>
+                  </div>`
+        return res
+      },
     },
     legend: {
       data: charts.names,
@@ -183,9 +197,15 @@
     background: rgba(0, 108, 188, 0.1);
     border-radius: 2px;
     border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
     .top {
       font-size: 24px;
       background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
+      background-size: 100% 100%;
       text-align: center;
     }
     .bottom {
@@ -197,15 +217,20 @@
         display: flex;
         flex-direction: column;
         align-items: center;
-        .item {
+        .box {
           width: 1.94rem;
           height: 1.94rem;
           background: url('~@/assets/capabilityCloud/pt_bg.png') no-repeat;
           background-size: 100% 100%;
+          animation: turn 10s linear infinite;
+          .item {
+            width: 1.94rem;
+            height: 1.94rem;
             display: flex;
             flex-direction: column;
             justify-content: center;
             align-items: center;
+            animation: turn2 10s linear infinite;
             .name {
               font-size: 16px;
               color: #fff;
@@ -216,12 +241,20 @@
             }
           }
         }
+      }
       .right {
         width: 6.53rem;
         height: 3.54rem;
         position: relative;
-        .title {
+        .title_echarts {
-          font-size: 18px;
+          font-size: 0.18rem;
+          height: 0.21rem;
+          line-height: 0.18rem;
+          color: #ffffff;
+          background: url('~@/assets/capabilityCloud/Component_services_title_bg.png')
+            no-repeat;
+          background-size: 0.7rem 0.08rem;
+          background-position: bottom left;
           position: absolute;
           top: 0;
           left: 0.2rem;
@@ -233,4 +266,60 @@
       }
     }
   }
+
+  @keyframes turn {
+    0% {
+      -webkit-transform: rotate(0deg);
+    }
+    25% {
+      -webkit-transform: rotate(90deg);
+    }
+    50% {
+      -webkit-transform: rotate(180deg);
+    }
+    75% {
+      -webkit-transform: rotate(270deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+    }
+  }
+  @keyframes turn2 {
+    0% {
+      -webkit-transform: rotate(0deg);
+    }
+    25% {
+      -webkit-transform: rotate(-90deg);
+    }
+    50% {
+      -webkit-transform: rotate(-180deg);
+    }
+    75% {
+      -webkit-transform: rotate(-270deg);
+    }
+    100% {
+      -webkit-transform: rotate(-360deg);
+    }
+  }
+  .platform-overview:hover {
+    border: 2px solid;
+    animation: turn3 5s linear infinite;
+  }
+  @keyframes turn3 {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 </style>

front/src/views/capabilityCloud/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:11:03
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-19 11:41:32
+ * @LastEditTime: 2022-06-19 17:57:14
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -60,6 +60,7 @@
     height: 10.8rem;
     background: url('~@/assets/capabilityCloud/bg.png') no-repeat;
     background-size: 100% 100%;
+    overflow: hidden;
     & > .header {
       height: 1.04rem;
       text-align: center;
@@ -67,7 +68,7 @@
       font-size: 0.46rem;
     }
     & > .main {
-      margin-top: 0.24rem;
+      margin-top: 0.2rem;
       padding: 0 0.24rem;
       display: flex;
       justify-content: space-between;

front/src/views/newHome/components/Footer.vue

@@ -25,8 +25,10 @@
 </template>
 <script setup>
   import { ref } from 'vue'
+  // eslint-disable-next-line no-undef
   console.log('footerDataList', footerDataList)
   let dataList = ref({})
+  // eslint-disable-next-line no-undef
   dataList.value = footerDataList
 </script>
 <style lang="less" scoped>