Merge remote-tracking branch 'origin/master'

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();
@@ -104,30 +113,18 @@ 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 +146,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 +164,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 +187,9 @@ const openWarningDetail = (event, index) => {
       item.dotColor = '';
     }
   })
+  
+  warningModalVisable.value = true;
+  currentWarning.value = event;
 }
 
 let resizeObserver: ResizeObserver | null = null;
@@ -209,6 +209,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 +390,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>

src/views/Jyh/Search/Components/BatchVerify.vue

@@ -9,7 +9,7 @@
       <d-input
         style="width: 400px"
         v-model="formData.title"
-        placeholder="请输入搜索内容"
+        placeholder="请输入软件名称"
         maxLength="50"
         minLength="2"
       >
@@ -29,6 +29,8 @@
         <span class="yellow">3</span>
       </div>
       <div class="left-btn">
+        <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>
         <TableSetting :columns="columns" :show-column-list="showColumnList" @update:show-column-list="updateShowColumnList"/>

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">

src/views/Jyh/Version/Detail/SubscriptionModal.vue

@@ -20,24 +20,49 @@
 </template>
 
 <script setup lang="ts">
+import { subscribeSoftware } from '@/api/jyh';
 import { computed, ref } from 'vue';
+import { Message } from 'vue-devui';
 
 const props = defineProps(['softwareData']);
 const emit = defineEmits(['close']);
 const formRef = ref(null);
 const formData = ref({
   subscribeType: '',
-  subscribeText: '',
 });
 const rules = {
   subscribeType: [{ required: true, message: '请选择', trigger: 'change' }],
 };
+const sendSubscribe = async () => {
+  const data = await subscribeSoftware({
+    softwareId: props.softwareData.id,
+    status: '1',
+    alertType: {
+      mobileSwitch: formData.value.subscribeType === '0',
+      emailSwitch: formData.value.subscribeType === '1',
+      webSwitch: formData.value.subscribeType === '2',
+    }
+  }).catch(err => {
+    Message({
+      message: err.error,
+      type: 'error'
+    })
+  });
+  if (!data?.data?.data?.data) {
+    Message({
+      message: data?.data?.data?.msg,
+      type: 'error'
+    })
+  } else {
+    emit('close');
+  }
+}
 const confirm = () => {
   (formRef?.value as any)?.validate((isValid: boolean, invalidFields: any) => {
     if (!isValid) {
       return;
     }
-    emit('close');
+    sendSubscribe();
   });
 };
 </script>

src/views/Jyh/Version/Detail/index.vue

@@ -37,11 +37,11 @@
       <d-tabs class="jyh-tabs jyh-tabs-2" type="wrapped" v-model="selectTab">
         <d-tab id="bbxx" title="版本信息"></d-tab>
         <d-tab id="ylgx" title="依赖关系"></d-tab>
-        <d-tab id="ldxx" title="漏洞信息"></d-tab>
         <d-tab id="SBOM" title="SBOM"></d-tab>
-        <d-tab id="communityInfo" title="开发者社区信息"></d-tab>
+        <d-tab id="ldxx" title="漏洞信息"></d-tab>
         <d-tab id="ai" title="AI修复建议"></d-tab>
         <d-tab id="licenseInfo" title="许可证信息"></d-tab>
+        <d-tab id="communityInfo" title="开发者社区信息"></d-tab>
       </d-tabs>
     </div>
     <div class="version-detail-content">