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

src/data/xsxxfxData.ts

@@ -185,19 +185,32 @@ export async function get图表(mid, rid, gid) {
 }
 
 export async function get散点图(mid, rid, gid) {
-    let sql = "select * from attack_point where m_id = Placeholder1 and r_id = Placeholder2 and g_id = Placeholder3";
+    let attack_sql = "select * from attack_point where m_id = Placeholder1 and r_id = Placeholder2 and g_id = Placeholder3";
+    let defense_sql = "select * from defense_point where m_id = Placeholder1 and r_id = Placeholder2 and g_id = Placeholder3";
 
-    let selectResult = await selectData(sql, mid, rid, gid);
+    let selectResult = await selectData(attack_sql, mid, rid, gid);
+    let defenseResult = await selectData(defense_sql, mid, rid, gid);
 
     let result = [];
 
     selectResult.forEach(info => {
         result.push({
+            type:1,
             time:info.M_TIME,
             x:info.X,
             y:info.Y
         });
     });
+    defenseResult.forEach(info => {
+        result.push({
+            type:2,
+            time:info.M_TIME,
+            x:info.X,
+            y:info.Y
+        });
+    });
+    
+    result.sort( (a, b) => {return a.time - b.time});
     
     return result;
 }