fix 完成57、58、60、66、67bug

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -93,7 +93,7 @@
 									<div class="item">
 										<div class="item-left">法案进展：</div>
 										<div class="item-right2">
-											<div class="tag" v-for="(val, idx) in getReversedProgress(item.progress)" :key="`${item.billId}-${val}-${idx}`" :style="{ zIndex: item.progress.length - idx }">{{ val }}</div>
+											<div class="tag" v-for="(val, idx) in item.progress" :key="`${item.billId}-${val}-${idx}`" :style="{ zIndex: item.progress.length - idx }">{{ val }}</div>
 										</div>
 									</div>
 								</div>
@@ -458,8 +458,6 @@ const handleClickAvatar = async member => {
 	} catch (error) {}
 };
 
-const getReversedProgress = progress => (Array.isArray(progress) ? [...progress].reverse() : []);
-
 const handleClickCommitteeBill = bill => {
 	if (!bill?.billId) return;
 	props.onClickToDetail({

src/views/bill/billHome/index.vue

@@ -373,7 +373,8 @@ const committeeTimeRange = ref("近一月");
 const committeeTimeOptions = [
 	{ label: "近一周", value: "近一周" },
 	{ label: "近一月", value: "近一月" },
-	{ label: "近一年", value: "近一年" }
+	{ label: "近一年", value: "近一年" },
+	{label:"全部时间", value: "全部时间"}
 ];
 const committeeCardList = ref([]);
 
@@ -1063,6 +1064,27 @@ const box9YearList = ref([
 ]);
 const box9HasData = ref(true);
 let box9ChartInstance = null;
+const BOX9_MAX_DOMAIN_COUNT = 7;
+const BOX9_OTHER_DOMAIN_NAME = "其他";
+const formatBox9DomainData = (list = []) => {
+	if (!Array.isArray(list) || list.length <= BOX9_MAX_DOMAIN_COUNT) {
+		return list;
+	}
+	const topDomainList = list.slice(0, BOX9_MAX_DOMAIN_COUNT);
+	const otherDomainCount = list.slice(BOX9_MAX_DOMAIN_COUNT).reduce((sum, item) => {
+		return sum + Number(item?.countBill || 0);
+	}, 0);
+	if (!otherDomainCount) {
+		return topDomainList;
+	}
+	return [
+		...topDomainList,
+		{
+			industryName: BOX9_OTHER_DOMAIN_NAME,
+			countBill: otherDomainCount
+		}
+	];
+};
 const getBox9Data = async () => {
 	chartLoading.value = { ...chartLoading.value, box6: true };
 	const params = {
@@ -1074,7 +1096,7 @@ const getBox9Data = async () => {
 		console.log("box9-涉华法案领域分布", res.data);
 		if (res.code === 200 && res.data && res.data.length > 0) {
 			box9HasData.value = true;
-			box9ChartData.value = res.data;
+			box9ChartData.value = formatBox9DomainData(res.data);
 		} else {
 			box9HasData.value = false;
 			box9ChartData.value = [];

src/views/bill/template/index.vue

@@ -343,6 +343,27 @@ const chart1ColorList = ref([...MUTICHARTCOLORS]);
 const chart2ColorList = ref([...MUTICHARTCOLORS]);
 
 const chart2Data = ref([]);
+const DOMAIN_MAX_DISPLAY_COUNT = 7;
+const DOMAIN_OTHER_NAME = "其他";
+const formatDomainChartData = (list = []) => {
+	if (!Array.isArray(list) || list.length <= DOMAIN_MAX_DISPLAY_COUNT) {
+		return list;
+	}
+	const topDomainList = list.slice(0, DOMAIN_MAX_DISPLAY_COUNT);
+	const otherCount = list.slice(DOMAIN_MAX_DISPLAY_COUNT).reduce((sum, item) => {
+		return sum + Number(item?.value || 0);
+	}, 0);
+	if (!otherCount) {
+		return topDomainList;
+	}
+	return [
+		...topDomainList,
+		{
+			name: DOMAIN_OTHER_NAME,
+			value: otherCount
+		}
+	];
+};
 
 const aiPaneVisible = ref({
 	domain: false,
@@ -737,12 +758,13 @@ const handleGetBillHyly = async () => {
 			.map(name => {
 				return { label: name, value: name };
 			});
-		chart2Data.value = res.data.map(item => {
+		const domainChartData = res.data.map(item => {
 			return {
 				name: item.hylymc,
 				value: item.countTk
 			};
 		});
+		chart2Data.value = formatDomainChartData(domainChartData);
 		aiPaneFetched.value = { ...aiPaneFetched.value, domain: false };
 
 		let chart2 = getPieChart(chart2Data.value, chart2ColorList.value);