no message

src/biz/ydygl.ts

-import { get运动员概览 } from "../data/analysisData";
-import { get最近一条淘汰赛时间, get男女训练成绩对比, get积分赛淘汰赛数据, 基础数据 } from "../data/ydyglData";
+import { get最近一条淘汰赛时间, get男女训练成绩对比, get积分赛淘汰赛数据, get运动员概览, 基础数据 } from "../data/ydyglData";
 import { getChartData, objKeyReplace, getKeyValue, getSingleYAndMoreData, getListData } from "../util/tools";
 
 export async function getData(req, res) {
     let ret:any = {};
-    let dataInfo:any = get运动员概览();
+    let dataInfo:any = await get运动员概览();
 
     let 左上数据DataAndUnit = objKeyReplace(dataInfo.左上数据);
     ret["api1"] = getKeyValue("左上数据", 左上数据DataAndUnit.dataMap, 左上数据DataAndUnit.unitMap, false, false );
@@ -23,7 +22,7 @@ export async function getData(req, res) {
     let 参赛性别占比DataAndUnit = objKeyReplace(dataInfo.参赛性别占比);
     ret["api11"] = getKeyValue("参赛性别占比", 参赛性别占比DataAndUnit.dataMap, 参赛性别占比DataAndUnit.unitMap, false, false );
 
-    ret["api8"] =  getListData("训练成绩优秀榜", dataInfo.训练成绩优秀榜, ["排名","照片","成绩","姓名"], {"排名":"rank","照片":"self_pic","成绩":"grade","姓名":"p_name"} );
+    ret["api8"] =  getListData("训练成绩优秀榜", dataInfo.训练成绩优秀榜, ["排名","照片","成绩","姓名"], {"排名":"RANK","照片":"PIC","成绩":"GRADE","姓名":"P_NAME"} );
    
     let {maleAndFemale, countMap} = await get男女训练成绩对比();
     
@@ -32,9 +31,9 @@ export async function getData(req, res) {
     ret["api7"] = getChartData("月训练量趋势", countMap, false, false );
     
     let 最新一条数据 = await get最近一条淘汰赛时间();
-    let data = await get积分赛淘汰赛数据(最新一条数据.time, 最新一条数据.type);
+    let data = await get积分赛淘汰赛数据(最新一条数据.time || new Date(), 0 );
     let dataName = 最新一条数据.type == 1 ? "淘汰赛" : "校内积分赛";
-    ret["matchlist"] = getListData(dataName, data, ["排名","学员","场次","胜场","负场","积分"], {"排名":"rank","学员":"name","场次":"gameCount","胜场":"win","负场":"lose","积分":"points"} );
+    ret["matchlist"] = getListData(dataName, data, ["排名","学员","场次","胜场","负场","积分"], {"排名":"rank","学员":"p_name","场次":"gameCount","胜场":"win","负场":"lose","积分":"points"} );
 
     ret["api12"] = await 基础数据();
 
@@ -49,6 +48,6 @@ export async function getCompetition(req, res) {
     let data = await get积分赛淘汰赛数据(time, type);
     let ret:any = {};
     let dataName = type == 1 ? "淘汰赛" : "校内积分赛";
-    ret["matchlist"] = getListData(dataName, data, ["排名","学员","场次","胜场","负场","积分"], {"排名":"rank","学员":"name","场次":"gameCount","胜场":"win","负场":"lose","积分":"points"} );
+    ret["matchlist"] = getListData(dataName, data, ["排名","学员","场次","胜场","负场","积分"], {"排名":"RANK","学员":"P_NAME","场次":"GAMECOUNT","胜场":"WIN","负场":"LOSE","积分":"POINTS"} );
     res.send(ret);
 }