Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/abilityStatistics/components/SharingSituation.vue

@@ -56,7 +56,7 @@
         </div>
 
         <div class="volume_box">
-          <div class="fugai"></div>
+          <!-- <div class="fugai"></div> -->
           <div
             v-for="(item, index) in dataLists"
             :key="item"
@@ -201,20 +201,20 @@
     })
   }
   let photoBg = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/yyzy-bg.png'),
-    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
+    require('../../../assets/abilityStatistics/kfzj-bg.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
+    require('../../../assets/abilityStatistics/ywzj-bg.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/tcfw-bg.png'),
-    require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
+    require('../../../assets/abilityStatistics/znsf-bg.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/hkt-bg.png'),
   ])
   let photo = ref([
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/yyzy.png'),
-    require('../../../assets/abilityStatistics/zhishiku.png'),
+    require('../../../assets/abilityStatistics/kfzj.png'),
-    require('../../../assets/abilityStatistics/zujianfuwu.png'),
+    require('../../../assets/abilityStatistics/ywzj.png'),
-    require('../../../assets/abilityStatistics/shujuziyuan.png'),
+    require('../../../assets/abilityStatistics/tcfw.png'),
-    require('../../../assets/abilityStatistics/jichujianshe.png'),
+    require('../../../assets/abilityStatistics/znsf.png'),
-    require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/hkt.png'),
   ])
   //申请量接口
   let dataLists = ref([])
@@ -379,12 +379,12 @@
         display: flex;
         margin-bottom: 20px;
         color: #fff;
-        .fugai {
+        // .fugai {
-          width: 40px;
+        //   width: 40px;
-          height: 390px;
+        //   height: 390px;
-          background: #0058e1;
+        //   background: #0058e1;
-          margin-top: 1px;
+        //   margin-top: 1px;
-        }
+        // }
         .volume_box-son {
           width: 120px;
           height: 390px;
@@ -417,6 +417,11 @@
             bottom: 44px;
           }
         }
+        .volume_box-son:nth-of-type(1) {
+          width: 140px;
+          padding-left: 28px;
+          background-position-x: 10px;
+        }
       }
     }
   }

front/src/views/home/AbilityToApplyFor.vue

@@ -289,6 +289,9 @@
       margin-bottom: 0.2rem;
       display: flex;
       justify-content: space-between;
+      background: url("~@/assets/newHome/biaoti.png") no-repeat;
+    background-position-y: 7px;
+    padding-left: 17px;
     }
 
     .ability-to-apply-for-content {
@@ -297,7 +300,7 @@
 
       .dep-name {
         color: #0558e1;
-        font-size: 0.22rem;
+        font-size: 0.18rem;
         display: flex;
         align-items: center;
         line-height: 0.22rem;
@@ -346,7 +349,7 @@
 
       .description {
         width: 8.8rem;
-        color: rgba(0, 0, 0, 0.45);
+        color: rgba(0, 0, 0, 0.70);
       }
 
       .remove {

front/src/views/home/algorithmCompare.vue

@@ -678,11 +678,21 @@
     height: 100vh;
     width: 100%;
   }
+  :deep .ant-anchor-link{
+    height: 50px !important;
+    line-height: 50px;
+    margin:0px !important;
+  }
+:deep .ant-anchor-link-active > .ant-anchor-link-title {
+    color: #fff;
+    width: 100%;
+    height: 100%;
+    background: #0058e1;
+}
+:deep .ant-anchor-link-title:only-child {
    
-  // @font-face {
+    padding-left: 14px;
-  //     font-family: 'num-typeface';
+}
-  //     src: url('~@/assets/newHome/font/num-typeface.otf');
-  // }
 
   .border {
     border: 1px solid #dddee1;
@@ -768,22 +778,22 @@
 
       .top {
         width: 100%;
-        height: 100px;
+        height: 137px;
         margin-bottom: 20px;
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        justify-content: flex-end;
 
         .td-name {
-          height: 100px;
+          height: 137px;
           display: flex;
           align-items: center;
           justify-content: center;
         }
 
         .td {
-          height: 100px;
+          height: 137px;
-          line-height: 100px;
+          line-height: 137px;
           position: relative;
           display: flex;
           justify-content: center;
@@ -877,9 +887,9 @@
   }
 
   .add-img {
-    height: 60px;
+    height: 40px;
-    width: 60px;
+    width: 40px;
-    background: url('~@/assets/newHome/add-on.png');
+    background: url('~@/assets/newHome/add-grey.png');
     background-size: 100% 100%;
     cursor: pointer;
   }

front/src/views/home/infrastructurePage.vue

@@ -117,11 +117,14 @@
           </div>
           <a-button
             style="
-              margin-left: 0.8rem;
+               width: 80px; 
-              background: #e1edfa;
+               height: 32px;
-              color: #0087ff;
+               text-align: center;
-              border: none;
+               background: #0558e1;
-              border-radius: 0.06rem;
+                color: #fff;
+                border: 1px solid #0558e1;
+                border-radius: 2px;
+                font-size: 14px;
             "
             @click="appointment(item)"
           >
@@ -2830,7 +2833,7 @@
       .rightContent {
         height: 1.75rem;
         width: 5.8rem;
-
+        margin-right:72px;
         .topContent {
           font-size: 0.2rem;
           color: #000;