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

front/public/static/config/location.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 13:09:17
+ * @LastEditTime: 2022-07-05 20:07:23
  * @Description: 数据资源参数配置
  */
 //const newLocation = 'qingdao'

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:52:19
+ * @LastEditTime: 2022-07-05 20:03:31
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -44,6 +44,7 @@
           <div
             :class="{ select: select == '区市应用资源排名' }"
             @click="selectNav('区市应用资源排名')"
+            v-if="!whoShow1.itShowXiHaiAn"
           >
             区市应用资源排名
             <i v-show="select == '区市应用资源排名'"></i>
@@ -67,6 +68,8 @@
   const num3 = ref(0)
   const select = ref('区市应用资源排名')
   let myChart = null
+  // eslint-disable-next-line no-undef
+  const whoShow1 = whoShow
   const selectNav = (val) => {
     select.value = val
     switch (val) {
@@ -365,11 +368,12 @@
         position: relative;
         .nav {
           position: absolute;
+          width: 7.5rem;
           z-index: 10;
           top: 0.3rem;
           left: 0;
           display: flex;
-          justify-content: space-between;
+          justify-content: space-around;
           padding: 0 1.5rem;
           & > div {
             cursor: pointer;

front/src/views/capabilityCloud/index.vue

@@ -1,13 +1,15 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:11:03
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-19 17:57:14
+ * @LastEditTime: 2022-07-05 19:47:07
  * @Description: 告诉大家这是什么
 -->
 <template>
   <div class="capability-cloud">
-    <div class="header"><span class="title">数字资源驾驶舱</span></div>
+    <div class="header">
+      <span class="title" @click="goHome">数字能力超市</span>
+    </div>
     <div class="main">
       <platform-overview></platform-overview>
       <application-resources></application-resources>
@@ -27,6 +29,11 @@
   import Infrastructure from '@/views/capabilityCloud/components/Infrastructure.vue'
   import DataResources from '@/views/capabilityCloud/components/DataResources.vue'
   import KnowledgeBase from '@/views/capabilityCloud/components/KnowledgeBase.vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const goHome = () => {
+    router.push('/home')
+  }
 </script>
 <style lang="less">
   @font-face {

front/src/views/home/components/searchResultList.vue

@@ -39,6 +39,9 @@
               ? 'yyzy'
               : !item.type
               ? 'sjzy'
+              : !item.infoList ||
+                !item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              ? 'znsf'
               : item.infoList &&
                 item.infoList.filter((val) => val.attrType == '组件类型')[0]
                   .attrValue == '智能算法'
@@ -617,340 +620,340 @@
   }
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
+#search-result-list-container {
-    width: 1088px;
+  width: 1088px;
-    padding: 0 20px;
+  padding: 0 20px;
-    background: #f3f5f9;
+  background: #f3f5f9;
 
-    .detail-content {
+  .detail-content {
-      // 超出
+    // 超出
-      white-space: nowrap;
+    white-space: nowrap;
-      overflow: hidden;
+    overflow: hidden;
-      text-overflow: ellipsis;
+    text-overflow: ellipsis;
-      width: 130px;
+    width: 130px;
-      display: inline-block;
+    display: inline-block;
+  }
+
+  .shai-xuan {
+    width: 1047px;
+    height: 36px;
+    // margin: 11px 0 20px;
+    // background: #e5f2ff;
+    // padding-left: 20px;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .circle {
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      background-color: #0087ff;
+      text-align: center;
+      color: #fff;
+      line-height: 16px;
+      margin-right: 21px;
     }
 
-    .shai-xuan {
+    .result {
-      width: 1047px;
+      font-size: 14px;
-      height: 36px;
+      font-weight: 500;
-      // margin: 11px 0 20px;
+      color: #212121;
-      // background: #e5f2ff;
-      // padding-left: 20px;
-      display: flex;
-      align-items: center;
-      position: relative;
 
-      .circle {
+      span {
-        width: 16px;
+        font-size: 18px;
-        height: 16px;
+        color: #0087ff;
-        border-radius: 50%;
-        background-color: #0087ff;
-        text-align: center;
-        color: #fff;
-        line-height: 16px;
-        margin-right: 21px;
-      }
-
-      .result {
-        font-size: 14px;
-        font-weight: 500;
-        color: #212121;
-
-        span {
-          font-size: 18px;
-          color: #0087ff;
-        }
-      }
-
-      .condition {
-        position: absolute;
-        right: 20px;
-        top: 10px;
-
-        ul li {
-          list-style-type: none;
-        }
-
-        ul {
-          display: flex;
-
-          li {
-            width: 90px;
-            height: 12px;
-            text-align: center;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .arrow {
-              display: inline-block;
-              width: 12px;
-              height: 12px;
-              background: url('~@/assets/newHome/arrow.png');
-              margin-left: 10px;
-            }
-
-            .down {
-              background: url('~@/assets/newHome/down.png');
-              margin-top: 6px;
-            }
-          }
-        }
       }
     }
 
-    .result-list {
+    .condition {
-      width: 1048px;
+      position: absolute;
-      display: flex;
+      right: 20px;
-      flex-direction: column;
+      top: 10px;
-      flex-wrap: wrap;
-      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-      border-top: 1px rgba(150, 144, 144, 0.3) solid;
-      padding: 10px 0;
 
-      .item {
+      ul li {
-        width: 100%;
+        list-style-type: none;
-        margin-top: 10px;
+      }
+
+      ul {
         display: flex;
-        align-items: center;
 
-        .left {
+        li {
-          display: inline-block;
+          width: 90px;
-          width: 120px;
+          height: 12px;
-          height: 110px;
+          text-align: center;
-          margin-right: 16px;
+          cursor: pointer;
-        }
-
-        .right {
-          width: 100%;
-        }
-
-        .yyzy {
-          background: url('~@/assets/home/yyzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .sjzy {
-          background: url('~@/assets/home/sjzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .znsf {
-          background: url('~@/assets/home/znsf_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .tcfw {
-          background: url('~@/assets/home/tcfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .kfzj {
-          background: url('~@/assets/home/kfzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-        .ywzj {
-          background: url('~@/assets/home/ywzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .header {
           display: flex;
-          justify-content: space-between;
+          justify-content: center;
-          align-items: center;
-          margin: 0 10px 0 0;
-
-          .header-right {
-            display: flex;
-            font-size: 14px;
-            color: #212121;
-
-            span {
-              font-size: 14px;
-              color: #212121;
-            }
-
-            div {
-              margin-right: 24px;
-            }
-          }
-
-          .header-right:last-child {
-            div {
-              margin-right: 16px;
-            }
-          }
-
-          span {
-            font-size: 20px;
-            font-weight: 600;
-            // color: #0087ff;
-          }
-        }
-
-        .dec {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // white-space: nowrap;
-          color: #0058e1;
-          display: flex;
-          margin-top: 10px;
-
-          div {
-            margin-right: 10px;
-            background: rgba(0, 88, 225, 0.1);
-            padding-left: 10px;
-            padding-right: 10px;
-          }
-
-          div:nth-child(3) {
-            max-width: 200px;
-            display: -webkit-box;
-            /*设置为弹性盒子*/
-            -webkit-line-clamp: 1;
-            /*最多显示3行*/
-            overflow: hidden;
-            /*超出隐藏*/
-            text-overflow: ellipsis;
-            /*超出显示为省略号*/
-            -webkit-box-orient: vertical;
-          }
-        }
-
-        .btn {
-          display: flex;
-          justify-content: space-between;
-          font-size: 14px;
-          margin: 5px 0;
-
-          // .left {
-          //   width: 600px;
-          //   display: flex;
-          //   justify-content: space-between;
-          //   flex-wrap: wrap;
-          //   & > div {
-          //     width: 300px;
-          //     & > span {
-          //       color: #0087ff;
-          //       font-weight: 600;
-          //     }
-          //   }
-          // }
-          .right {
-            flex: 1;
-            display: flex;
-            justify-content: flex-end;
-            margin: 0 10px;
-            align-items: center;
-
-            .shopping {
-              span {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 10px;
-                margin-top: 5px;
-              }
-
-              .shopping-on {
-                background: url('~@/assets/newHome/shopping-on.png');
-                cursor: pointer;
-              }
-
-              .shopping-down {
-                background: url('~@/assets/newHome/shopping-down.png');
-              }
-            }
-
-            .pk-on {
-              display: inline-block;
-              height: 32px;
-              width: 32px;
-              margin-left: 10px;
-              margin-right: 10px;
-              margin-top: 5px;
-              background: url('~@/assets/newHome/pk-on.png');
-              cursor: pointer;
-            }
-
-            .sc {
-              // margin-top: 4px;
-              cursor: pointer;
-              display: flex;
-              align-items: center;
-
-              .sc-down {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-down.png');
-              }
-
-              .sc-on {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-on.png');
-              }
-            }
-
-            .ant-btn {
-              background: transparent;
-              background: #0058e1;
-              color: white;
-              width: 80px;
-              height: 32px;
-              font-weight: 600;
-              border-radius: 2px;
-              text-align: center;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-left: 10px;
-            }
-
-            .ant-btn:last-child {
-              background: #0058e1;
-              color: white;
-            }
-          }
-        }
-
-        .bottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 10px;
           align-items: center;
 
-          & > div {
+          .arrow {
-            display: flex;
+            display: inline-block;
-            align-items: center;
+            width: 12px;
-
+            height: 12px;
-            & > div {
+            background: url('~@/assets/newHome/arrow.png');
-              margin: 0 10px;
+            margin-left: 10px;
-            }
           }
 
-          .pingfen {
+          .down {
-            :deep(span) {
+            background: url('~@/assets/newHome/down.png');
-              display: flex;
+            margin-top: 6px;
-              align-items: center;
-
-              :deep(ul) {
-                display: flex;
-                align-items: center;
-
-                :deep(.ant-rate-star:not(:last-child)) {
-                  margin-right: 4px;
-                }
-              }
-            }
           }
         }
       }
-
-      .item:nth-of-type(1) {
-        margin-top: 0;
-      }
     }
   }
+
+  .result-list {
+    width: 1048px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+    border-top: 1px rgba(150, 144, 144, 0.3) solid;
+    padding: 10px 0;
+
+    .item {
+      width: 100%;
+      margin-top: 10px;
+      display: flex;
+      align-items: center;
+
+      .left {
+        display: inline-block;
+        width: 120px;
+        height: 110px;
+        margin-right: 16px;
+      }
+
+      .right {
+        width: 100%;
+      }
+
+      .yyzy {
+        background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .sjzy {
+        background: url('~@/assets/home/sjzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+      .znsf {
+        background: url('~@/assets/home/znsf_square.png') no-repeat;
+        background-size: 100%;
+      }
+      .tcfw {
+        background: url('~@/assets/home/tcfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+      .kfzj {
+        background: url('~@/assets/home/kfzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+      .ywzj {
+        background: url('~@/assets/home/ywzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 0 10px 0 0;
+
+        .header-right {
+          display: flex;
+          font-size: 14px;
+          color: #212121;
+
+          span {
+            font-size: 14px;
+            color: #212121;
+          }
+
+          div {
+            margin-right: 24px;
+          }
+        }
+
+        .header-right:last-child {
+          div {
+            margin-right: 16px;
+          }
+        }
+
+        span {
+          font-size: 20px;
+          font-weight: 600;
+          // color: #0087ff;
+        }
+      }
+
+      .dec {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        // white-space: nowrap;
+        color: #0058e1;
+        display: flex;
+        margin-top: 10px;
+
+        div {
+          margin-right: 10px;
+          background: rgba(0, 88, 225, 0.1);
+          padding-left: 10px;
+          padding-right: 10px;
+        }
+
+        div:nth-child(3) {
+          max-width: 200px;
+          display: -webkit-box;
+          /*设置为弹性盒子*/
+          -webkit-line-clamp: 1;
+          /*最多显示3行*/
+          overflow: hidden;
+          /*超出隐藏*/
+          text-overflow: ellipsis;
+          /*超出显示为省略号*/
+          -webkit-box-orient: vertical;
+        }
+      }
+
+      .btn {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        margin: 5px 0;
+
+        // .left {
+        //   width: 600px;
+        //   display: flex;
+        //   justify-content: space-between;
+        //   flex-wrap: wrap;
+        //   & > div {
+        //     width: 300px;
+        //     & > span {
+        //       color: #0087ff;
+        //       font-weight: 600;
+        //     }
+        //   }
+        // }
+        .right {
+          flex: 1;
+          display: flex;
+          justify-content: flex-end;
+          margin: 0 10px;
+          align-items: center;
+
+          .shopping {
+            span {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              margin-right: 10px;
+              margin-top: 5px;
+            }
+
+            .shopping-on {
+              background: url('~@/assets/newHome/shopping-on.png');
+              cursor: pointer;
+            }
+
+            .shopping-down {
+              background: url('~@/assets/newHome/shopping-down.png');
+            }
+          }
+
+          .pk-on {
+            display: inline-block;
+            height: 32px;
+            width: 32px;
+            margin-left: 10px;
+            margin-right: 10px;
+            margin-top: 5px;
+            background: url('~@/assets/newHome/pk-on.png');
+            cursor: pointer;
+          }
+
+          .sc {
+            // margin-top: 4px;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+
+            .sc-down {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-down.png');
+            }
+
+            .sc-on {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-on.png');
+            }
+          }
+
+          .ant-btn {
+            background: transparent;
+            background: #0058e1;
+            color: white;
+            width: 80px;
+            height: 32px;
+            font-weight: 600;
+            border-radius: 2px;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 10px;
+          }
+
+          .ant-btn:last-child {
+            background: #0058e1;
+            color: white;
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        align-items: center;
+
+        & > div {
+          display: flex;
+          align-items: center;
+
+          & > div {
+            margin: 0 10px;
+          }
+        }
+
+        .pingfen {
+          :deep(span) {
+            display: flex;
+            align-items: center;
+
+            :deep(ul) {
+              display: flex;
+              align-items: center;
+
+              :deep(.ant-rate-star:not(:last-child)) {
+                margin-right: 4px;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .item:nth-of-type(1) {
+      margin-top: 0;
+    }
+  }
+}
 </style>

front/src/views/personalCenter/components/PurchaseVehicle.vue

@@ -753,7 +753,7 @@
   // 详情
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
-      console.log()
+      // console.log()
       let arr = JSON.parse(note1)
       xVideoList.value = []
       arr.map((val) => {