合并分支 'dev_hhq' 到 'master'

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

@@ -32,7 +32,7 @@
 
 					<div style="width: 672px; height: 486px; padding-top: 50px" id="char"></div>
 				</div>
-				<div style="width: 50%;    height: 620px;overflow: auto;">
+				<div style="width: 778px;    height: 620px;overflow: auto;">
 					<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="targetCode" border
 						:tree-props="{ children: 'children' }" default-expand-all :header-cell-style="{ 'border-right': 'none' }"
 						:cell-style="{ 'border-right': 'none' }">
@@ -43,7 +43,7 @@
 							<template #default="scope">
 								<div style="display: flex;">
 									<div class="progress-text">
-										{{ scope.row.usScore }}
+										{{ 'NO.' + scope.row.usRank + ' ' + scope.row.usScore }}
 									</div>
 									<div class="progress-wrapper left" :style="{ '--i': '40px', '--j': '-20px', marginLeft: '20px' }">
 										<el-progress :percentage="scope.row.chinaScore" :stroke-width="20" class="left-progress"
@@ -62,7 +62,7 @@
 											:show-text="false" />
 									</div>
 									<div class="progress-text" style="color:rgba(206, 79, 81, 1);">
-										{{ scope.row.chinaScore }}
+										{{ 'NO.' + scope.row.chinaRank + ' ' + scope.row.chinaScore }}
 									</div>
 								</div>
 
@@ -621,9 +621,9 @@ const btnList = ref([
 }
 
 /* 自定义展开图标 */
-:deep(.el-table__expand-icon.is-expanded) {
+:deep(.el-table__expand-icon--expanded) {
 	background-image: url('./icon/arrowDown.png');
-	transform: rotate(-90deg);
+	transform: rotate(270deg) !important;
 }
 
 /* 自定义表头背景颜色 */