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

front/src/views/home/DetailsPageconetent.vue

@@ -74,7 +74,11 @@
           <span v-else>
             {{ item.name }}
           </span>
+        
+          <div  :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
+      
         </div>
+        
       </div>
       <div class="top-content-father" :key="listKey">
         <template
@@ -215,6 +219,7 @@
           <span v-else>
             {{ item.name }}
           </span>
+          <div  :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
         </div>
       </div>
       <div class="top-content-father">
@@ -276,6 +281,7 @@
           <span v-else>
             {{ item.name }}
           </span>
+          <div  :class="item.name === Cardsname ? 'sanjiao' : ''"></div>
         </div>
       </div>
       <KnowledgeBase
@@ -333,6 +339,7 @@
             }"
           ></span>
           <span>{{ item.name }}</span>
+        
         </div>
       </div>
       <div class="resultListSearchInput-father">
@@ -465,6 +472,7 @@
             }"
           ></span>
           <span>{{ item.name }}</span>
+         
         </div>
       </div>
       <div class="top-content-father">
@@ -491,6 +499,7 @@
             }"
           ></span>
           <span>{{ item.name }}</span>
+       
         </div>
       </div>
       <div class="resultListSearchInput-father" style="background: unset">
@@ -2274,18 +2283,32 @@
           margin-right: 0.1rem;
         }
         div {
-          padding: 0 0.1rem;
+          padding-left: 33px;
+          width: 220px;
           cursor: pointer;
-          display: flex;
+         // display: flex;
           align-items: center;
         }
+        div span{
+          vertical-align:middle;
+        }
         div:hover {
-          color: #0087ff;
+          color: #0058e1;
+        }
+       
+       .sanjiao{
+        background: url('~@/assets/home/sanjiao.png');
+    background-repeat: no-repeat;
+    height: 10px;
+    width: 10px;
+    margin-left: 67px;
+    position: absolute;
        }
         .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
+          color: #000000;     
+          border-bottom: 0.03rem solid #0058e1;
+          // background: url('~@/assets/home/sanjiao.png');
+          // background-repeat: no-repeat;
         }
       }
       .top-content-father {
@@ -2301,6 +2324,7 @@
           display: flex;
           margin-top: 0rem;
           span:nth-child(1) {
+            font-size: 0.14rem;
             display: inline-block;
             position: relative;
             line-height: 0.3614rem;

front/src/views/home/algorithmCompare.vue

@@ -744,7 +744,7 @@
         height: 60px;
         display: flex;
         align-items: center;
-        justify-content: center;
+        justify-content: left;
         font-size: 16px;
         color: #212121;
         border-bottom: 1px solid #dddee1;
@@ -931,7 +931,7 @@
     height: 60px;
     display: flex;
     align-items: center;
-    justify-content: center;
+    justify-content: left;
     font-size: 16px;
     color: #212121;
     border-bottom: 1px solid #dddee1;

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

@@ -147,19 +147,19 @@
       cursor: pointer;
     }
     .zskTag {
-      margin: 20px 10px;
+      margin: 20px 20px;
       // display: flex;
       // justify-content: center;
-      border-top: 1px solid #eee;
-      padding-top: 20px;
+      border-top: 1px solid #dddee1;
+     padding-top: 18px;
       .type {
         padding: 0 10px 0 0;
-        font-size: 18px;
+        font-size: 16px;
         font-weight: 600;
-        border-right: 1px solid #eee;
+        border-right: 1px solid #dddee1;
       }
       .ant-tag {
-        font-size: 18px;
+        font-size: 16px;
         padding: 5px;
         margin-left: 10px;
       }
@@ -170,15 +170,20 @@
     }
     .top {
       display: flex;
+      padding-top: 10px;
     justify-content: space-between;
-      border-top: 1px solid #eee;
-      margin: 10px 0;
-      padding: 30px 10px 0;
+    border-top: 1px solid #dddee1;
+    margin: 3px 18px 5px;
+    font-size: 14px;
       span {
         color: #0058e1;
        font-weight: 600;
+       font-size:16px;
       }
     }
+    :deep(.ant-list-lg  .ant-list-item){
+      padding: 18px 17px 12px 49px;
+    }
     :deep(.ant-list-bordered) {
       border: none;
       .ant-list-item {
@@ -192,11 +197,12 @@
           display: flex;
           justify-content: flex-start;
           align-items: center;
+          font-size: 14px;
           svg {
             margin-right: 5px;
           }
           .text {
-            font-size: 16px;
+            font-size: 14px;
             cursor: pointer;
             &:hover {
               color: #0087ff;

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

@@ -127,7 +127,7 @@
   </div>
 </template>
 <script setup>
-  import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
+  import { ref, onMounted, onBeforeUnmount, defineProps,watch } from 'vue'
   import { getUserInfo, getRole } from '@/api/user'
   import { recordRoute } from '@/config'
   import { useRoute, useRouter } from 'vue-router'
@@ -162,6 +162,19 @@
   }
   const targetRouter = ref('')
   const backFlag = ref(false)
+  watch(
+    () => router.currentRoute.value.path,
+    (newValue, oldValue) => {
+
+  if(newValue=='/apply' || newValue=='/details'){
+    select.value='DetailsPageconetent'
+  }else if(newValue=='/demandDetails'){
+    select.value='demandCenter'
+  }
+  
+    },
+    { immediate: true }
+  )
   getUserInfo().then((res) => {
     if (res.data.data.superAdmin == '1') {
       backFlag.value = true
@@ -176,7 +189,6 @@
     }
   })
 
-  console.log('navList------------>', navList)
 
   const props = defineProps({
     showView: { type: String, default: '' },
@@ -197,7 +209,7 @@
       }
     }
   }
-  console.log('3333333------------>', props)
+
   // 返回首页
   const goToHome = () => {
     // 西海岸
@@ -226,6 +238,7 @@
           return message.warn('暂无权限')
         }
       }
+
       select.value = item.key
       switch (item.name) {
         case '个人中心':

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

@@ -372,6 +372,7 @@
           li {
             width: 90px;
             height: 12px;
+            align-items: right;
             position: relative;
             text-align: center;
             cursor: pointer;