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

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

@@ -1084,7 +1084,8 @@ const processRankingData = rawData => {
 			// 新增字段
 			domains: item.domainList ? item.domainList.map(d => d.name) : [],
 			date: formattedDate,
-			member: item.keyMember || "-"
+			member: item.keyMember || "-",
+			province: item.province || ""
 		};
 	});
 };

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

@@ -148,7 +148,7 @@
 			<div class="warning">
 				<div class="warning-title">
 					<img src="./assets/warning.png" alt />
-					<span>新增排华联盟预警1</span>
+					<span>新增排华联盟预警</span>
 				</div>
 				<div class="warning-content">
 					<div class="content-item" v-for="(item, index) in warningList" :key="index">

src/views/ZMOverView/components/gameProfile/index.vue

@@ -469,43 +469,45 @@ const handleIndicatorChange = indicator => {
 		{
 			name: "中国",
 			type: "line",
-			symbolSize: 10,
+			symbolSize: 8,
+			smooth: true,
 			itemStyle: {
 				color: "#CE4F51"
 			},
-			areaStyle: {
-				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(206, 79, 81, .8)"
-					},
-					{
-						offset: 1,
-						color: "rgb(206, 79, 81, .3)"
-					}
-				])
-			},
+			// areaStyle: {
+			// 	color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+			// 		{
+			// 			offset: 0,
+			// 			color: "rgb(206, 79, 81, .8)"
+			// 		},
+			// 		{
+			// 			offset: 1,
+			// 			color: "rgb(206, 79, 81, .3)"
+			// 		}
+			// 	])
+			// },
 			data: chinaValues
 		},
 		{
 			name: "美国",
 			type: "line",
-			symbolSize: 10,
+			smooth: true,
+			symbolSize: 8,
 			itemStyle: {
 				color: "#055FC2"
 			},
-			areaStyle: {
-				color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(5, 95, 194,.8)"
-					},
-					{
-						offset: 1,
-						color: "rgb(5, 95, 194, .3)"
-					}
-				])
-			},
+			// areaStyle: {
+			// 	color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+			// 		{
+			// 			offset: 0,
+			// 			color: "rgb(5, 95, 194,.8)"
+			// 		},
+			// 		{
+			// 			offset: 1,
+			// 			color: "rgb(5, 95, 194, .3)"
+			// 		}
+			// 	])
+			// },
 			data: usaValues
 		}
 	];
@@ -540,22 +542,25 @@ const lineOption = ref({
 	xAxis: {
 		type: "category",
 		boundaryGap: false,
+		minInterval: 1,
+		scale: true,
 		axisLine: {
 			lineStyle: {
-				color: "#ccc",
+				color: "#e0e0e0",
 				width: 1
 			}
 		},
 		axisTick: {
-			show: true,
+			show: false,
 			lineStyle: {
 				color: "#ccc"
 			}
 		},
 		axisLabel: {
-			color: "#ccc",
-			fontSize: 16,
-			fontWeight: 400
+			color: "#666",
+			fontSize: 13,
+			fontWeight: 500,
+			margin: 12
 		},
 		data: ["2021", "2022", "2023", "2024", "2025"]
 	},
@@ -571,9 +576,9 @@ const lineOption = ref({
 			padding: [0, 0, 10, 0]
 		},
 		axisLine: {
-			show: false,
+			show: true,
 			lineStyle: {
-				color: "#ccc",
+				color: "#e0e0e0",
 				width: 1
 			}
 		},