表格展示数据

src/stores/Notice.js

@@ -21,7 +21,6 @@ class Notice {
 		fetch(config.HT_HOST + url)
 			.then(response => response.json())
 			.then(json => {
-				console.log(json);
 				runInAction(() => {
 					this.noticeList = json.Result;
 				});

src/stores/Report.js

@@ -28,7 +28,7 @@ class Report {
 	getHWVendorScores(VEI_SN, StartDate, EndDate) {
 		this.loading = true; //HT_HOST +
 		const fetchUrl = prepareUrl("http://202.103.68.231:889/service-cusservice/PTGetHWVendorScores")
-			.append("VEI_SN", 32865)
+			.append("VEI_SN", VEI_SN)
 			.append("StartDate", StartDate)
 			.append("EndDate", EndDate)
 			.append("StrDEI_SN", "(,-1,)")
@@ -56,7 +56,7 @@ class Report {
 	getHWProductScores(VEI_SN, StartDate, EndDate) {
 		this.loading = true; //HT_HOST +
 		const fetchUrl = prepareUrl("http://202.103.68.231:889/service-cusservice/PTGetHWProductScores")
-			.append("VEI_SN", 1511)
+			.append("VEI_SN", VEI_SN)
 			.append("StartDate", StartDate)
 			.append("EndDate", EndDate)
 			.append("StrDEI_SN", "(,-1,)")
@@ -84,7 +84,7 @@ class Report {
 	getHWCommendScores(VEI_SN, StartDate, EndDate) {
 		this.loading = true; //HT_HOST +
 		const fetchUrl = prepareUrl("http://202.103.68.231:889/service-cusservice/PTGetHWCommendScores")
-			.append("VEI_SN", 1511)
+			.append("VEI_SN", VEI_SN)
 			.append("StartDate", StartDate)
 			.append("EndDate", EndDate)
 			.append("StrDEI_SN", "(,-1,)")

src/views/report/Index.jsx

@@ -268,7 +268,7 @@ function Index() {
 			<Title level={3}></Title>
 
 			<Row ref={targetRef}>
-				<Col md={24} lg={24} xxl={24}>
+				<Col md={24} lg={13} xxl={13}>
 					<Descriptions title="Primary Data" layout="vertical" bordered column={8}>
 						<Descriptions.Item label="Groups">{evaluationScores.Groups}</Descriptions.Item>
 						<Descriptions.Item label="Number of People">{evaluationScores.PersonNum}</Descriptions.Item>
@@ -281,24 +281,21 @@ function Index() {
 					</Descriptions>
 				</Col>
 
-				<Col md={24} lg={24} xxl={24}>
+				<Col md={24} lg={13} xxl={13}>
 					<Divider orientation="left">Monthly Data</Divider>
 					<Table dataSource={vendorScoresData.MonthlyData} columns={columns_month} pagination={false} bordered />
 				</Col>
 
-				<Col md={24} lg={24} xxl={24}>
+				<Col md={24} lg={13} xxl={13}>
 					<Divider orientation="center">
 						地接考核分数 Final Scores:
 						<Typography.Title level={3} type="danger">
 							{evaluationScores.FinalScores}
 						</Typography.Title>
 					</Divider>
-					<div class="ant-table-wrapper css-dev-only-do-not-override-3op25v">
+					<div class="ant-table-wrapper ant-spin-nested-loading css-dev-only-do-not-override-3op25v ant-spin-container">
-						<div class="ant-spin-nested-loading css-dev-only-do-not-override-3op25v">
-							<div class="ant-spin-container">
 						<div class="ant-table ant-table-bordered">
-									<div class="ant-table-container">
+							<div class="ant-table-container ant-table-content">
-										<div class="ant-table-content">
 								<table style={{ textAlign: "center" }}>
 									<thead class="ant-table-thead">
 										<tr>
@@ -512,9 +509,6 @@ function Index() {
 							</div>
 						</div>
 					</div>
-							</div>
-						</div>
-					</div>
 					<br />
 					<List header={<div>Scoring Rules</div>} bordered>
 						<List.Item>1. The maximum score is 5</List.Item>
@@ -529,20 +523,84 @@ function Index() {
 						<List.Item>3. For each category, you can only get the corresponding score if you meet the standards of all items under the score.</List.Item>
 						<List.Item>4. The final score is the sum of the scores of each category multiplied by the proportion of the category.</List.Item>
 					</List>
+					<br />
+					<Divider orientation="left">反馈表分析</Divider>
+					<div class="ant-table-wrapper ant-spin-nested-loading css-dev-only-do-not-override-3op25v ant-spin-container">
+						<div class="ant-table ant-table-bordered">
+							<div class="ant-table-container ant-table-content">
+								<table style={{ textAlign: "center" }}>
+									<thead class="ant-table-thead">
+										<tr>
+											<th class="ant-table-cell" scope="col">
+												项目
+											</th>
+											<th class="ant-table-cell" scope="col">
+												产品
+											</th>
+											<th class="ant-table-cell" scope="col">
+												得分
+											</th>
+											<th class="ant-table-cell" scope="col">
+												备注说明
+											</th>
+										</tr>
+									</thead>
+									<tbody class="ant-table-tbody">
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell" rowspan="4">
+												地接接待
+											</td>
+											<td class="ant-table-cell">导游</td>
+											<td class="ant-table-cell">{evaluationScores.FRTGuide}</td>
+											<td class="ant-table-cell" rowspan="7">
+												{evaluationScores.FRTText}
+											</td>
+										</tr>
+
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell">司机+车</td>
+											<td class="ant-table-cell">{evaluationScores.FRTGriver}</td>
+										</tr>
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell">餐</td>
+											<td class="ant-table-cell">{evaluationScores.FRTMeal}</td>
+										</tr>
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell">产品体验</td>
+											<td class="ant-table-cell">{evaluationScores.FRTProduct}</td>
+										</tr>
+
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell" rowspan="3">
+												线路安排
+											</td>
+											<td class="ant-table-cell">酒店</td>
+											<td class="ant-table-cell">{evaluationScores.FRTHotel}</td>
+										</tr>
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell">游船</td>
+											<td class="ant-table-cell">{evaluationScores.FRTCruise}</td>
+										</tr>
+										<tr class="ant-table-row ant-table-row-level-0">
+											<td class="ant-table-cell">顾问服务</td>
+											<td class="ant-table-cell">{evaluationScores.FRTAdvisor}</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
 				</Col>
-				<Col md={24} lg={24} xxl={24}>
+				<Col md={24} lg={13} xxl={13}>
 					<Divider orientation="left">导游接待情况</Divider>
 					<Table dataSource={productScoresData.GuideScores} columns={columns_guide} pagination={false} bordered />
-				</Col>
+
-				<Col md={24} lg={24} xxl={24}>
 					<Divider orientation="left">表扬情况</Divider>
 					<Table dataSource={commendScoresData.CommendScores} columns={columns_commend} pagination={false} bordered />
-				</Col>
+
-				<Col md={24} lg={24} xxl={24}>
 					<Divider orientation="left">投诉情况</Divider>
 					<Table dataSource={commendScoresData.ComplaintScores} columns={columns_commend} pagination={false} bordered />
-				</Col>
+
-				<Col md={24} lg={24} xxl={24}>
 					<Divider orientation="left">批评建议</Divider>
 					<Table dataSource={commendScoresData.CriticizeScores} columns={columns_commend} pagination={false} bordered />
 				</Col>