new

src/views/ZMOverView/components/fourSuppress/components/allGovernment/index.vue

@@ -198,6 +198,7 @@
 										'card-white': event.level === 'white',
 										'card-default': !event.level
 									}"
+									:style="event.noData ? 'opacity:0;' : ''"
 									@click="handleClickEventCard(event)"
 								>
 									<div class="card-mask" v-if="activeSanctionId && activeSanctionId !== event.sanctionId"></div>
@@ -327,13 +328,46 @@ const getUSGovernmentSanctionHistoryData = async () => {
 
 				grouped[deptName].events.push({
 					date: item.endDate ? item.endDate.replace(/^(\d{4})-(\d{2})-(\d{2})$/, "$1年$2月$3日") : "",
+					time: item.endDate,
 					content: item.name || item.summary,
 					tags: item.techDomainList ? item.techDomainList.slice(0, 2) : [],
 					level: level,
 					sanctionId: item.sanctionId
 				});
 			});
-			timelineList.value = Object.values(grouped);
+			
+			//统计完成后生成新的数组
+			let fArr = []
+			rawList.forEach((item)=>{
+				fArr.push(item.endDate)
+			})
+
+			let timeLine = Object.values(grouped);
+			//重新遍历timeLine，根据日期数组额外增加数据
+			timeLine.forEach((item) => {
+				// 根据日期数组构建空数据
+				const data = []
+				for (let i = 0; i < fArr.length; i++) {
+					const option = {
+						date: fArr[i],
+						noData: true
+					}
+					data.push(option)
+				}
+				item.events.forEach((ele) => {
+					for (let m = 0; m < data.length; m++) {
+						if(ele.time == data[m].date && data[m].noData){
+							data[m] = ele
+							data[m].noData = false
+							break
+						}
+					}
+				})
+				item.events = data
+			})
+
+			// timelineList.value = Object.values(grouped);
+			timelineList.value = timeLine
 			console.log("timelineList", timelineList.value);
 
 			initSlider();
@@ -2020,6 +2054,10 @@ const prev = () => {
 									}
 								}
 							}
+							.event-no-card{
+								width: 240px;
+								height: 130px;
+							}
 						}
 					}
 				}