From af1ce0d1bf3bf3a5afaf95a235755987b25e1aa8 Mon Sep 17 00:00:00 2001
From: "@user8949" <user8949@noreply.gitcode.com>
Date: Tue, 18 Mar 2025 20:20:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dissue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jyh/index.ts                          | 36 +++++++
 src/components/AdvanceSearch/index.vue        | 43 +++-----
 src/components/Header/Search.vue              | 53 +++++++++-
 src/views/Jyh/Home/index.vue                  | 98 +++++++++++++------
 .../Jyh/Search/Components/BatchVerify.vue     |  2 +-
 src/views/Jyh/Version/Detail/Dependency.vue   |  6 ++
 6 files changed, 174 insertions(+), 64 deletions(-)

diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts
index 8f87160..2c9d909 100644
--- a/src/api/jyh/index.ts
+++ b/src/api/jyh/index.ts
@@ -8,3 +8,39 @@ export function releaseInfo(params: { repoId: string,releaseId: string  }): Prom
     method: 'get'
   });
 }
+
+// 获取高级筛选语言列表
+export function searchLanguageList() {
+  return request({
+    url: `/api/v1/repo/lan/list`,
+    method: 'get'
+  });
+}
+
+
+// 获取首页公告列表
+export function getHomeNoticeList() {
+  return request({
+    url: '/api/v1/home/notice/list',
+    method: 'get',
+    params: {}
+  });
+}
+
+// 获取依赖关系列表
+export function getDepencyList(softwareId: string) {
+  return request({
+    url: '/api/v1/repo/release/info',
+    method: 'get',
+    params: { softwareId: 2 }
+  });
+}
+
+// 获取AI修复建议
+export function getRepairInfo() {
+  return request({
+    url: '/api/v1/repo/repair/info',
+    method: 'get',
+    params: {}
+  });
+}
\ No newline at end of file
diff --git a/src/components/AdvanceSearch/index.vue b/src/components/AdvanceSearch/index.vue
index ff1c134..b9391c1 100644
--- a/src/components/AdvanceSearch/index.vue
+++ b/src/components/AdvanceSearch/index.vue
@@ -3,11 +3,6 @@
     <slot name="title"></slot>
     <d-form :layout="props.layout" :label-align="'end'">
       <d-row :gutter="16">
-        <d-col :span="8">
-          <d-form-item field="license" label="license">
-            <d-input placeholder="请输入license名称" v-model="formData.licenseName"/>
-          </d-form-item>
-        </d-col>
         <d-col :span="8">
           <d-form-item field="name" label="软件/组件名称">
             <d-input placeholder="请输入软件/组件名称" v-model="formData.searchWord"/>
@@ -18,6 +13,11 @@
             <d-input v-model="formData.softwareVersion"/>
           </d-form-item>
         </d-col>
+        <d-col :span="8">
+          <d-form-item field="license" label="license">
+            <d-input placeholder="请输入license名称" v-model="formData.licenseName"/>
+          </d-form-item>
+        </d-col>
       </d-row>
       <d-row :gutter="16">
         <d-col :span="8">
@@ -49,6 +49,8 @@
 
 <script setup lang="ts">
 import { ref, defineEmits, defineProps, watch } from 'vue';
+import { searchLanguageList } from '@/api/jyh'
+
 const props = defineProps({
   layout: {
     type: String,
@@ -100,32 +102,11 @@ const cancel = () => {
   emit('update:modelValue', formData.value);
 }
 
-const getLanguageList = () => {
-  const mockData = [
-      {
-          "key": "c++",
-          "name": "C++"
-      },
-      {
-          "key": "C",
-          "name": "C"
-      },
-      {
-          "key": "PYTHON",
-          "name": "PYTHON"
-      },
-      {
-          "key": "JAVA",
-          "name": "JAVA"
-      }
-  ]
-
-  languageList.value = mockData.map(item => {
-    return {
-      name: item.name,
-      value: item.key
-    }
-  })
+const getLanguageList = async() => {
+  const res: any = await searchLanguageList();
+  if (!res.error) {
+    languageList.value = res.data.data;
+  }
 }
 getLanguageList();
 </script>
diff --git a/src/components/Header/Search.vue b/src/components/Header/Search.vue
index ea1d9af..d7d99f0 100644
--- a/src/components/Header/Search.vue
+++ b/src/components/Header/Search.vue
@@ -3,7 +3,30 @@
     :key="$route.path + $route.query?.val"  id="golbalSearch" class="g-header-search"
     v-model.trim="searchStr" placeholder="输入搜索内容..." @keyup.enter="search" @clear="handleClear" clearable >
     <template #prepend>
-      <d-select v-model="searchType" :options="options"></d-select>
+      <d-dropdown @toggle="onCateToggle($event)">
+        <div class="flex items-center gap-1 cursor-pointer">
+          {{ searchType }}
+          <d-icon :rotate="cateRotate" name="icon-chevron-down-2"></d-icon>
+        </div>
+        <template #menu>
+          <ul class="list-menu">
+            <li class="menu-item" @click="onCategoryChange('组件/软件')">组件/软件</li>
+            <d-dropdown :position="position" :offset="0">
+              <li class="menu-item">
+                行业
+                <i class="icon icon-chevron-right"></i>
+              </li>
+              <template #menu>
+                <ul class="list-menu">
+                  <li class="menu-item" v-for="option in industryOptions" @click="onCategoryChange(option)">
+                      {{ option }}
+                  </li>
+                </ul>
+              </template>
+            </d-dropdown>
+          </ul>
+        </template>
+      </d-dropdown>
     </template>
     <template #append>
       <d-icon @click="search" name="search" style="font-size: inherit;" />
@@ -19,11 +42,16 @@ import microApp from '@micro-zoe/micro-app';
 const route = useRoute();
 const router = useRouter();
 const searchStr = ref(route?.query?.val || '');
-const searchType = ref('License');
-const options = reactive(['License']);
+const searchType = ref('组件/软件');
+const position = ref(['right-start', 'right-end']);
+const industryOptions = ref(['通信', '军工', '金融', '能源']);
 
 const placeholder = ref('「开搜」：一搜即达，开发者的AI搜索');
 
+const onCategoryChange = (event) => {
+  searchType.value = event;
+}
+
 const search = () => {
   if (!searchStr.value) {
     document.querySelector('#golbalSearch').blur();
@@ -81,4 +109,23 @@ onUnmounted(() => {
     width: 40px;
   }
 }
+
+.menu-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    padding: 4px;
+    cursor: pointer;
+    &:hover {
+      background-color: var(--devui-list-item-hover-bg, #f2f5fc);
+      color: var(--devui-list-item-hover-text, #526ecc);
+    }
+}
+
+.list-menu {
+    padding: 8px;
+    margin: 0;
+    width: 100px;
+}
 </style>
diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue
index c7b692a..b924181 100644
--- a/src/views/Jyh/Home/index.vue
+++ b/src/views/Jyh/Home/index.vue
@@ -37,7 +37,7 @@
           <template #append>
             <div class="advanced-search" @click="openAdvancedSearch">
                 <span>高级筛选</span>
-                <d-badge :count="5" :bg-color="'#f0f0f0'"></d-badge>
+                <d-badge :count="6" :bg-color="'#f0f0f0'"></d-badge>
                 <d-icon :rotate="rotate" name="icon-chevron-down-2"></d-icon>
               </div>
           </template>
@@ -68,11 +68,14 @@
             <d-timeline-item v-for="(item, index) in infoList" :key="index"
             :dot-color="item.dotColor" :line-color="'var(--devui-form-control-line-hover)'">
               <template #default>
-                <div style="display: flex; justify-content: space-between;">
-                  <div class="cursor-pointer" @click="openWarningDetail(item.text, index)">{{ item.text }}</div>
-                  <div style="display: flex;  align-items: center; gap: 8px;">
+                <div class="flex items-center justify-between w-full">
+                  <div class="cursor-pointer notice-content flex gap-2 items-center" @click="openWarningDetail(item, index)">
+                    <span>{{ item.subject }}</span>
+                    <d-tag :color="tagMap[item.importance]" size="sm">{{ item.importance }}</d-tag>
+                  </div>
+                  <div class="time-container">
                     <d-icon name="icon-time"></d-icon>
-                    {{ item.time }}
+                    {{ item.pulishTime }}
                   </div>
                 </div>
               </template>
@@ -85,12 +88,18 @@
       </div>
     </div>
   </div>
+
+  <d-modal class="warning-modal" v-model="warningModalVisable" title="主题：" style="width: 600px;">
+    <EarlyWarningDetail :warningData="currentWarning" :type="'user'"></EarlyWarningDetail>
+  </d-modal>
 </template>
 
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import AdvanceSearch from '@/components/AdvanceSearch/index.vue';
+import { getHomeNoticeList } from '@/api/jyh'
+import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -98,36 +107,22 @@ const inputGlow = ref(false);
 const searchStr = ref('');
 const position = ref(['right-start', 'right-end']);
 const industryOptions = ref(['通信', '军工', '金融', '能源'])
-const searchType = ref('组件/软件');
-const searchOptions = ref(['组件/软件']);
 const offset = ref({ mainAxis: 7 , crossAxis: -10 });
 const isOpen = ref(false);
 const rotate = ref(0);
 const cateRotate = ref(0);
-const infoList = ref([
-  {
-    text: '公告1',
-    time: '2021-10-1',
-    dotColor: 'var(--devui-info)',
-  },
-  {
-    text: '公告2',
-    time: '2021-10-2',
-    dotColor: 'var(--devui-info)',
-  },
-  {
-    text: '公告3',
-    time: '2021-10-3',
-  },
-  {
-    text: '公告4',
-    time: '2021-10-3',
-  },
-])
+const infoList = ref([])
+const warningModalVisable = ref(false);
+const currentWarning = ref();
 
 const homeSearch = ref(null);
 const dropdownWidth = ref(0);
 const selectedCate = ref('组件/软件');
+const tagMap = {
+  '高': '#f66f6a',
+  '中': '#fac20a',
+  '低': '#5e7ce0'
+}
 
 const searchInput = ref(null);
 const openAdvancedSearch = () => {
@@ -149,7 +144,7 @@ const closeOutside = () => {
 
 const submit = (formData) => {
   isOpen.value = false;
-  router.push({ name: 'Search', query: { ...formData, searchType: selectedCate.value }});
+  router.push({ name: 'Search', query: { searchWord: searchStr, ...formData, searchType: selectedCate.value}});
 };
 
 const inputFocus = () => {
@@ -167,7 +162,7 @@ const updateDropdownWidth = () => {
 };
 
 const search = () => {
-  router.push({ name: 'Search', query: { val: searchStr.value || '', type: route?.query?.type || 'License' }});
+  router.push({ name: 'Search', query: { searchWord: searchStr.value, searchType: selectedCate.value}});
 };
 
 const onCategoryChange = (cate) => {
@@ -190,6 +185,9 @@ const openWarningDetail = (event, index) => {
       item.dotColor = '';
     }
   })
+  
+  warningModalVisable.value = true;
+  currentWarning.value = event;
 }
 
 let resizeObserver: ResizeObserver | null = null;
@@ -209,6 +207,15 @@ onBeforeUnmount(() => {
   }
 });
 
+const getNoticeList = async() => {
+  const res:any = await getHomeNoticeList();
+  if (!res.error) {
+    infoList.value = res.data.data;
+  }
+}
+
+getNoticeList();
+
 </script>
 
 <style scoped lang="scss">
@@ -381,4 +388,37 @@ onBeforeUnmount(() => {
   font-size: 14px;
   font-weight: 500;
 }
+
+.notice-content {
+  flex: 1;
+  overflow: hidden;
+  margin-right: 8px;
+  
+  span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+  }
+}
+
+.time-container {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 120px;
+  flex-shrink: 0;
+}
+
+:deep(.devui-timeline-item-data-right) {
+  width: 80%;
+}
 </style>
+
+<style>
+.warning-modal {
+  .devui-modal__body {
+    padding: 0px !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Jyh/Search/Components/BatchVerify.vue b/src/views/Jyh/Search/Components/BatchVerify.vue
index 7ab4a71..778be06 100644
--- a/src/views/Jyh/Search/Components/BatchVerify.vue
+++ b/src/views/Jyh/Search/Components/BatchVerify.vue
@@ -29,7 +29,7 @@
         <span class="red">3</span>
       </div>
       <div class="left-btn">
-        <a class="cursor-pointer" href="/static/template.xlsx" download><i class="icon icon-download-2"></i>下载excel模板</a>
+        <a v-if="isLogin" class="cursor-pointer" href="/static/template.xlsx" download><i class="icon icon-download-2"></i>下载excel模板</a>
         <span v-if="isLogin" style="height: 14px" class="split"></span>
         <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
         <span v-if="isLogin" style="height: 14px" class="split"></span>
diff --git a/src/views/Jyh/Version/Detail/Dependency.vue b/src/views/Jyh/Version/Detail/Dependency.vue
index d98ddfb..44286f8 100644
--- a/src/views/Jyh/Version/Detail/Dependency.vue
+++ b/src/views/Jyh/Version/Detail/Dependency.vue
@@ -67,6 +67,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive } from 'vue';
+import { getDepencyList } from '@/api/jyh'
 const checked = ref(false);
 const showDetail = ref(false);
 const table = ref(null)
@@ -216,6 +217,11 @@ const openAll = (tree) => {
 const sortNumberMethod = (a, b) => {
   return a.number > b.number
 }
+
+const getList = async() => {
+  const res = await getDepencyList('APACHE-001');
+}
+getList();
 </script>
 
 <style scoped lang="scss">

From 16588908952dba4345da46faf09fadc9061593be Mon Sep 17 00:00:00 2001
From: "@user8949" <user8949@noreply.gitcode.com>
Date: Tue, 18 Mar 2025 20:29:01 +0800
Subject: [PATCH 2/2] fix: fix issue

---
 src/components/Header/Search.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Header/Search.vue b/src/components/Header/Search.vue
index d7d99f0..49d7d7a 100644
--- a/src/components/Header/Search.vue
+++ b/src/components/Header/Search.vue
@@ -10,7 +10,7 @@
         </div>
         <template #menu>
           <ul class="list-menu">
-            <li class="menu-item" @click="onCategoryChange('组件/软件')">组件/软件</li>
+            <li class="menu-item" @click="onCategoryChange('软件')">软件</li>
             <d-dropdown :position="position" :offset="0">
               <li class="menu-item">
                 行业
@@ -42,7 +42,7 @@ import microApp from '@micro-zoe/micro-app';
 const route = useRoute();
 const router = useRouter();
 const searchStr = ref(route?.query?.val || '');
-const searchType = ref('组件/软件');
+const searchType = ref('软件');
 const position = ref(['right-start', 'right-end']);
 const industryOptions = ref(['通信', '军工', '金融', '能源']);