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,7 +620,7 @@
   }
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
+#search-result-list-container {
   width: 1088px;
   padding: 0 20px;
   background: #f3f5f9;
@@ -952,5 +955,5 @@
       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) => {