Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/record/getData.js

@@ -12,9 +12,11 @@ if(!search || search.indexOf('?') < 0){
         params[paramKey[0]] = paramKey[1]
     })
     // 正式使用时，只调用正式站接口
-    host = params.srvAdr != 'China' ? 'https://www.teammodel.net' : 'https://test.teammodel.cn'
+    host = params.srvAdr != 'China-Dep' ? 'https://www.teammodel.net' : 'https://test.teammodel.cn'
     params.stime = parseInt(params.stime)
     params.etime = parseInt(params.etime)
+    params.astime = parseInt(params.astime)
+    params.aetime = parseInt(params.aetime)
 }
 console.log('999999999', params);
 
@@ -47,7 +49,7 @@ if(!params || (params.scope === 'school' && !params.school) || !params.courseId
     alert('缺少课程、名单等信息')
 } else {
     // 获取本学期数据
-    getRecord('', '', 'period').then(res => {
+    getRecord(params.astime, params.aetime, 'period').then(res => {
         let {courseData, stuList} = res
         if(!courseData || !stuList.length) {
             alert('未找到相关数据')
@@ -210,15 +212,11 @@ function getRecord(stime, etime, timeType) {
             "scope": params.scope,
             "school": params?.school,
             "tmdid": params.tmdId,
-            // "stime": 1724688000000,
-            // "etime": 1729668634000,
+            "stime": stime,
+            "etime": etime,
             "courseId": params.courseId,
             "groupIds": [params.groupIds]
         }
-        if(timeType != 'period') {
-            param.stime = stime
-            param.etime = etime
-        }
         let courseData = {
             count: 0, //课堂数
             attendCountAverage: 0, //出席总人数【需计算】