sync

src/config.js

@@ -1,7 +1,7 @@
 import React from "react";
 import dayjs from "dayjs";
 
-export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.144:890";
+export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" :"http://202.103.68.231:889"; //"http://202.103.68.144:890";
 export const DATE_FORMAT = "YYYY-MM-DD";
 export const DATE_FORMAT_MONTH = "YYYY-MM";
 export const DATE_PRESETS = [

src/stores/Report.js

@@ -34,23 +34,12 @@ class Report {
 		this.search_date_end = dates==null? null: dates[1];
 	};
 
-	fetchInvoiceList(VEI_SN, GroupNo, DateStart, DateEnd,OrderType) {
+	getHWVendorScores(VEI_SN, StartDate, EndDate) {
 		this.loading = true;
-		const fetchUrl = prepareUrl(HT_HOST + "/service-cusservice/PTSearchGMBPageList")
+		const fetchUrl = prepareUrl(HT_HOST + "/service-cusservice/PTGetHWProductScores")
 			.append("VEI_SN", VEI_SN)
-			.append("OrderType", 0)
-			.append("GroupNo", GroupNo.trim())
-			.append("DateStart", DateStart)
-			.append("DateEnd", DateEnd)
-			.append("Orderbytype", 1)
-			.append("TimeType", 0)
-			.append("limitmarket", "")
-			.append("mddgroup", "")
-			.append("SecuryGroup", "")
-			.append("TotalNum", 0)
-			.append("PageSize", 2000)
-			.append("PageIndex", 1)
-			.append("PayState",OrderType)
+			.append("StartDate", StartDate)
+			.append("EndDate", EndDate)
 			.append("token",this.root.authStore.login.token)
 			.build();
 

src/views/report/Index.jsx

@@ -39,28 +39,28 @@ function Index() {
 		},
 		{
 			title: "Number of People",
-			dataIndex: "Number of People",
-			key: "Number of People",
+			dataIndex: "PersonNum",
+			key: "PersonNum",
 		},
 		{
 			title: "Transaction Amount（USD)",
-			dataIndex: "Transaction Amount（USD)",
-			key: "Transaction Amount（USD)",
+			dataIndex: "AmountUSD",
+			key: "AmountUSD",
 		},
 		{
 			title: "Evaluation Score",
-			dataIndex: "Evaluation Score",
-			key: "Evaluation Score",
+			dataIndex: "EvaluationScore",
+			key: "EvaluationScore",
 		},
 		{
 			title: "TP Reviews",
-			dataIndex: "TP Reviews",
-			key: "TP Reviews",
+			dataIndex: "TPReviews",
+			key: "TPReviews",
 		},
 		{
 			title: "TP Reviews Rate",
-			dataIndex: "TP Reviews Rate",
-			key: "TP Reviews Rate",
+			dataIndex: "TPReviewRate",
+			key: "TPReviewRate",
 		},
 		{
 			title: "Complaints",
@@ -69,46 +69,46 @@ function Index() {
 		},
 		{
 			title: "Complaint Rate",
-			dataIndex: "Complaint Rate",
-			key: "Complaint Rate",
+			dataIndex: "ComplaintRate",
+			key: "ComplaintRate",
 		},
 	];
 
 	const columns_month = [
 		{
 			title: "Date",
-			dataIndex: "Date",
-			key: "Date",
+			dataIndex: "VMonth",
+			key: "VMonth",
 		},
 		{
 			title: "Groups",
-			dataIndex: "Groups",
-			key: "Groups",
+			dataIndex: "GroupsNum",
+			key: "GroupsNum",
 		},
 		{
 			title: "Number of People",
-			dataIndex: "Number of People",
-			key: "Number of People",
+			dataIndex: "PersonNum",
+			key: "PersonNum",
 		},
 		{
 			title: "Transaction Amount（USD)",
-			dataIndex: "Transaction Amount（USD)",
-			key: "Transaction Amount（USD)",
+			dataIndex: "AmountUSD",
+			key: "AmountUSD",
 		},
 		{
 			title: "Evaluation Score",
-			dataIndex: "Evaluation Score",
-			key: "Evaluation Score",
+			dataIndex: "EvaluationScore",
+			key: "EvaluationScore",
 		},
 		{
 			title: "TP Reviews",
-			dataIndex: "TP Reviews",
-			key: "TP Reviews",
+			dataIndex: "TPReviews",
+			key: "TPReviews",
 		},
 		{
 			title: "TP Reviews Rate",
-			dataIndex: "TP Reviews Rate",
-			key: "TP Reviews Rate",
+			dataIndex: "TPReviewRate",
+			key: "TPReviewRate",
 		},
 		{
 			title: "Complaints",
@@ -117,8 +117,8 @@ function Index() {
 		},
 		{
 			title: "Complaint Rate",
-			dataIndex: "Complaint Rate",
-			key: "Complaint Rate",
+			dataIndex: "ComplaintRate",
+			key: "ComplaintRate",
 		},
 	];
 
@@ -130,7 +130,14 @@ function Index() {
 			onCell: (_, index) => {
 				if (index === 0) {
 					return {
-						rowSpan: 2,
+						rowSpan: 3,
+						//colSpan:0,
+					};
+				}
+				if (index >= 1 && index <= 2) {
+					return {
+						rowSpan: 0,
+						colSpan: 0,
 					};
 				}
 			},
@@ -149,44 +156,57 @@ function Index() {
 			title: "Final Scores",
 			dataIndex: "Final Scores",
 			key: "Final Scores",
+			onCell: (_, index) => {
+				if (index === 0) {
+					return {
+						rowSpan: 5, //合并五行
+						//colSpan: 5,
+					};
+				} else {
+					return {
+						rowSpan: 0, //不显示其他数据
+						colSpan: 0,
+					};
+				}
+			},
 		},
 	];
 
 	const dataSource_dmc = [
 		{
 			key: "1",
-			Category: "Category",
-			Item: "Item",
-			"Your Scores": "Your Scores",
-			"Final Scores": "Final Scores",
+			Category: "Category1",
+			Item: "Item1",
+			"Your Scores": "Your Scores1",
+			"Final Scores": "Final Scores1",
 		},
 		{
 			key: "2",
-			Category: "Category",
-			Item: "Item",
-			"Your Scores": "Your Scores",
-			"Final Scores": "Final Scores",
+			Category: "Category2",
+			Item: "Item2",
+			"Your Scores": "Your Scores2",
+			"Final Scores": "Final Scores2",
 		},
 		{
 			key: "3",
-			Category: "Category",
-			Item: "Item",
-			"Your Scores": "Your Scores",
-			"Final Scores": "Final Scores",
+			Category: "Category3",
+			Item: "Item3",
+			"Your Scores": "Your Scores3",
+			"Final Scores": "Final Scores3",
 		},
 		{
 			key: "4",
-			Category: "Category",
-			Item: "Item",
-			"Your Scores": "Your Scores",
-			"Final Scores": "Final Scores",
+			Category: "Category4",
+			Item: "Item4",
+			"Your Scores": "Your Scores4",
+			"Final Scores": "Final Scores4",
 		},
 		{
 			key: "5",
-			Category: "Category",
-			Item: "Item",
-			"Your Scores": "Your Scores",
-			"Final Scores": "Final Scores",
+			Category: "Category5",
+			Item: "Item5",
+			"Your Scores": "Your Scores5",
+			"Final Scores": "Final Scores5",
 		},
 	];