Browse Source

Merge remote-tracking branch 'origin/dev' into dev

zhangyihao 9 months ago
parent
commit
7859f109e8

+ 4 - 0
src/types/components.d.ts

@@ -52,6 +52,8 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -60,6 +62,8 @@ declare module 'vue' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElUpload: typeof import('element-plus/es')['ElUpload']

+ 1 - 1
src/views/knowledge/knowledge-management/detail.vue

@@ -156,7 +156,7 @@ onMounted(async () => {
       sourceUnit: data.publishingUnit,
       notificationType: data.notificationType,
       summary: data.summary,
-      attachmentName: data.file.length > 0 ? data.file[0].name : '',
+      attachmentName: data.file.length > 0 ? data.file[0].content : '',
       attachmentUrl: data.file.length > 0 ? data.file[0].url : ''
     };
   } catch (error) {

+ 0 - 3
src/views/knowledge/knowledge-management/index.vue

@@ -205,10 +205,7 @@ const getList = async () => {
     const [startDate, endDate] = queryParams.publishDate;
     const formattedStartDate = startDate ? startDate.replace(/-/g, '/') : '';
     const formattedEndDate = endDate ? endDate.replace(/-/g, '/') : '';
-    console.log('startDate:', startDate, 'endDate:', endDate);
     const publishDateRange = formattedStartDate && formattedEndDate ? `${formattedStartDate}-${formattedEndDate}` : '';
-    console.log('publishDateRange:', publishDateRange);
-
 
     // 构建新的请求参数对象
     const requestParams = {