Merge branch 'master' of http://123.207.147.179:8888/node_server/sportsschoolserver

src/biz/ydygl.ts

@@ -24,8 +24,8 @@ export async function getData(req, res) {
     
 
     let 特化右上数据 = [];
-    特化右上数据.push({key:"比赛场次", number:parseInt(dataInfo.右上数据["比赛场次"]), rate:parseInt(dataInfo.右上数据["比赛场次增幅"]), unit:"" });
-    特化右上数据.push({key:"参赛覆盖人员", number:parseInt(dataInfo.右上数据["参赛覆盖人员"]), rate:parseInt(dataInfo.右上数据["参赛覆盖人员增幅"]) , unit:"" });
+    特化右上数据.push({key:"比赛场次", number:parseInt(dataInfo.右上数据["比赛场次"]), rate:parseInt(dataInfo.右上数据["比赛场次增幅"]), unit:"%" });
+    特化右上数据.push({key:"参赛覆盖人员", number:parseInt(dataInfo.右上数据["参赛覆盖人员"]), rate:parseInt(dataInfo.右上数据["参赛覆盖人员增幅"]) , unit:"%" });
     // let 右上数据DataAndUnit = objKeyReplace(dataInfo.右上数据);
     // ret["api9"] = getKeyValue("右上数据", 右上数据DataAndUnit.dataMap, 右上数据DataAndUnit.unitMap, false, false );
     ret["api9"] = 特化右上数据;

src/data/xsxxfxData.ts

@@ -89,7 +89,7 @@ export async function get近期比赛概览(PID, checkDate) {
 }
 
 export async function get全部比赛日期() {
-    let sql = "select to_char(m_date,'yyyy-mm-dd') m_time from recent_match group by m_date";
+    let sql = "select to_char(m_date,'yyyy-mm-dd') m_time from recent_match group by m_date order by m_date ";
     let selectResult = await selectData(sql); // [{to_char:'日期'},...]
     let result = [];
     selectResult.forEach(info => {
@@ -103,7 +103,7 @@ function dataFormat(time) {
     let date = new Date(time);
     let match = date.getMonth() + 1;
     let matchStr = match > 9 ? `${match}` : `0${match}`;
-    let day = date.getMonth();
+    let day = date.getDate();
     let dayStr = day > 9 ? `${day}` : `0${day}`;
     let hours = date.getHours();
     let hoursStr = hours > 9 ? `${hours}` : `0${hours}`;

src/serverConfig.ts

@@ -29,9 +29,12 @@ export const mySqlConfig = {
 //orcale数据库连接对象
   //49152  55944 55407  1522 
 export const orcaleConfig = {
-    user:'user_ylxk',
-    password:'rkld(34Gl',
-    connectString : "10.10.200.186:1521/orcl"
+    // user:'user_ylxk',
+    // password:'rkld(34Gl',
+    // connectString : "10.10.200.186:1521/orcl"
+    user:'root',
+    password:'root',
+    connectString : "127.0.0.1:1521/orcl"
 }
 
 
@@ -40,4 +43,6 @@ export const interfaceConfig = {
     企业信息数据列表: '/openapi/company/list',
     创投机构数据列表: '/openapi/investorg/list',
     科技金融产品: '/openapi/product/list'
-}
+}
\ No newline at end of file
+
+