合并分支 'yp-dev' 到 'master'

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

@@ -417,6 +417,7 @@ const pageSize = ref(5); // 每页显示 5 条
 const handleFieldChange = domainId => {
 	console.log("领域改变", domainId);
 	console.log("领域值 =>", selectedFieldForLatest.value);
+	newsCurrentPage.value = 1;
 	getUSGovernmentLatestDynamicData();
 };
 

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

@@ -320,13 +320,11 @@ const monthNum = computed(() => {
 	}
 });
 
-
-
 // 全政府-美政府部门对我打压遏制时间线
 const loadingHistory = ref(false);
-const timelineData = ref([])
+const timelineData = ref([]);
 const getUSGovernmentSanctionHistoryData = async () => {
-	timelineData.value = []  // 初始化数据
+	timelineData.value = []; // 初始化数据
 	loadingHistory.value = true;
 	try {
 		const params = {
@@ -803,12 +801,17 @@ const handleGetSanList = async () => {
 		const res = await getSanTypeList(params);
 		console.log("制裁手段列表", res);
 		if (res.code === 200 && res.data) {
-			methodOptions.value = res.data.map(item => {
+			let _methodOptions = res.data.map(item => {
 				return {
 					label: item.name,
 					value: item.id
 				};
 			});
+			_methodOptions.unshift({
+				label: "全部制裁手段",
+				value: ""
+			});
+			methodOptions.value = _methodOptions;
 			methodValue.value = "";
 		}
 	} catch (error) {}

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

@@ -1062,16 +1062,20 @@ const initRightDonut = async () => {
 			{
 				type: "graph",
 				layout: "circular",
+				circular: {
+					rotateLabel: true
+				},
 				symbolSize: 80,
 				roam: true,
 				label: {
-					show: true
+					show: true,
+					position: "outside"
 				},
 				edgeSymbol: ["circle", ""],
 				edgeSymbolSize: [4, 80],
 				edgeLabel: {
 					fontSize: 20,
-					show: false
+					show: true
 				},
 				data: data,
 				// links: [],
@@ -1232,7 +1236,12 @@ const getPredictionList = async () => {
 		const res = await getPrediction();
 		if (res && res.code === 200) {
 			console.log("----getPredictionList", res.data);
-			warningList.value = res.data;
+			warningList.value = res.data.map(item => {
+				return {
+					...item,
+					statementList: item.statementList.reverse()
+				};
+			});
 		}
 	} catch (error) {
 		console.error("获取联盟动态接口失败:", error);
@@ -2055,7 +2064,7 @@ watch(activeDate, async () => {
 
 		.area-left {
 			width: 792px;
-			height: 500px;
+			height: 520px;
 			box-sizing: border-box;
 			border-radius: var(---10, 10px);
 			/* 业务系统/模块阴影 */
@@ -2098,7 +2107,7 @@ watch(activeDate, async () => {
 
 		.area-right {
 			width: 792px;
-			height: 500px;
+			height: 520px;
 			box-sizing: border-box;
 			border-radius: var(---10, 10px);
 			/* 业务系统/模块阴影 */
@@ -2134,8 +2143,8 @@ watch(activeDate, async () => {
 
 			.right-content {
 				width: 100%;
-				height: calc(100% - 48px);
-				padding: 33px 48px 59px 50px;
+				height: 450px;
+				// padding: 33px 48px 59px 50px;
 			}
 		}
 	}

src/views/exportControl/utils/charts.js

@@ -1024,16 +1024,19 @@ export const getMultipleBarChart_m = object => {
 			type: "value",
 			splitNumber: 5,
 			alignTicks: false,
-			name: "个",
-			nameLocation: "end",
-			nameGap: 10,
-			nameTextStyle: {
-				color: "rgba(95, 101, 108, 1)",
-				fontSize: 14,
-				fontWeight: 400,
-				fontFamily: "Microsoft YaHei",
-				padding: [0, 0, 0, 0]
-			}
+			axisLabel: {
+				formatter: "{value} 个"
+			}
+			// name: "个",
+			// nameLocation: "end",
+			// nameGap: 10,
+			// nameTextStyle: {
+			// 	color: "rgba(95, 101, 108, 1)",
+			// 	fontSize: 14,
+			// 	fontWeight: 400,
+			// 	fontFamily: "Microsoft YaHei",
+			// 	padding: [0, 0, 0, 0]
+			// }
 		},
 		series: datas
 	};