Commit af0f6a6e by chenjinjing

no message

parent a9e75be7
...@@ -141,18 +141,6 @@ export async function getData(req, res) { ...@@ -141,18 +141,6 @@ export async function getData(req, res) {
// }; // };
// ret["qyds"] = {title:"全员导师", dataList:qyds}; // ret["qyds"] = {title:"全员导师", dataList:qyds};
let jshjrc = [
{
key:"学业优秀学生数",
value:0
},
{
key:"竞赛获奖学生数",
value:0
},
];
ret["jshjrc"] = {title:"竞赛获奖人次", dataList:jshjrc};
let xyyxxss = { let xyyxxss = {
titleList: ["优秀学生姓名", "学生班级", "获奖作品内容"], titleList: ["优秀学生姓名", "学生班级", "获奖作品内容"],
dataList: [ dataList: [
...@@ -165,14 +153,30 @@ export async function getData(req, res) { ...@@ -165,14 +153,30 @@ export async function getData(req, res) {
let jshjxss = { let jshjxss = {
titleList: ["优秀学生姓名", "学生班级", "获奖作品内容"], titleList: ["优秀学生姓名", "学生班级", "获奖作品内容"],
dataList: [ dataList: []
["-", "-", "-"],
["-", "-", "-"],
["-", "-", "-"],
]
}; };
let jshjxssData = await getReqApiData(jsgrfzNENUM.竞赛获奖人次, {type:1, sso_user_id:teacherId}, null, "data", "jsfz");
jshjxssData.list.data.forEach( info => {
if (info.type == "指导学生") {
jshjxss.dataList.push([info.name, info.level, info.grade]);
}
})
ret["jshjxss"] = {title:"竞赛获奖学生数", dataList:jshjxss}; ret["jshjxss"] = {title:"竞赛获奖学生数", dataList:jshjxss};
let jshjrc = [
{
key:"学业优秀学生数",
value:0
},
{
key:"竞赛获奖学生数",
value:jshjxss.dataList.length || 0
},
];
ret["jshjrc"] = {title:"竞赛获奖人次", dataList:jshjrc};
let grcgData = {课题研究数:0, 发表出版数:0, 获得奖项:0}; let grcgData = {课题研究数:0, 发表出版数:0, 获得奖项:0};
let zyfzcgData = await getReqApiData(jshxWENUM.专业发展成果, {type:1}, null, "data", "jsfz"); let zyfzcgData = await getReqApiData(jshxWENUM.专业发展成果, {type:1}, null, "data", "jsfz");
if (zyfzcgData.list) { if (zyfzcgData.list) {
...@@ -370,6 +374,7 @@ export async function getData(req, res) { ...@@ -370,6 +374,7 @@ export async function getData(req, res) {
]; ];
ret["ztcql"] = {title:"整体出勤率", dataList:ztcql}; ret["ztcql"] = {title:"整体出勤率", dataList:ztcql};
// let jxtjData = await getReqApiData(jshxWENUM.获奖情况, {type:1, sso_user_id:teacherId}, null, "data", "jsfz");
let cqkhqk = [ let cqkhqk = [
{ {
key:"12.19", key:"12.19",
......
...@@ -7,7 +7,6 @@ import { getReqApiData } from "../../data/interface/url"; ...@@ -7,7 +7,6 @@ import { getReqApiData } from "../../data/interface/url";
import { getImagesInDir, getKeyValue, readFileList } from "../outData"; import { getImagesInDir, getKeyValue, readFileList } from "../outData";
import { jyzjshxTableData, tysjyTableData } from "../../data/table/duiwai"; import { jyzjshxTableData, tysjyTableData } from "../../data/table/duiwai";
import { keyValuePackage, tablePackage } from "../../dataPackage/inFrontOut"; import { keyValuePackage, tablePackage } from "../../dataPackage/inFrontOut";
import { systemConfig } from "../../config/serverConfig";
import { jshxTableData } from "../../data/table/duinei"; import { jshxTableData } from "../../data/table/duinei";
import * as duiwai from "../../data/table/duiwai"; import * as duiwai from "../../data/table/duiwai";
import moment = require("moment"); import moment = require("moment");
......
...@@ -118,7 +118,7 @@ export async function getData(req, res) { ...@@ -118,7 +118,7 @@ export async function getData(req, res) {
]; ];
ret["cyks"] = {title:"参与课时", dataList:cyks}; ret["cyks"] = {title:"参与课时", dataList:cyks};
// let tddyhdData = await getReqApiData(xshxNENUM.团队德育活动, {grade}) //todo let tddyhdData = await getReqApiData(xshxNENUM.团队德育活动, {gradeId:grade}) //todo
let tddyhd = [ let tddyhd = [
{ {
key:"仪式活动", key:"仪式活动",
...@@ -145,7 +145,7 @@ export async function getData(req, res) { ...@@ -145,7 +145,7 @@ export async function getData(req, res) {
let xsbjrsData = await getReqApiData(xshxNENUM.获取班级数学生数, {}); let xsbjrsData = await getReqApiData(xshxNENUM.获取班级数学生数, {});
let bjsl = xsbjrsData.classNum; let bjsl = xsbjrsData.classNum;
let xsrsData = xsbjrsData.studentNum; let xsrsData = xsbjrsData.studentNum || [];
let xsrs = 0; let xsrs = 0;
xsrsData.forEach( info=> { xsrsData.forEach( info=> {
let {code, name, value} = info; let {code, name, value} = info;
...@@ -228,7 +228,7 @@ export async function getData(req, res) { ...@@ -228,7 +228,7 @@ export async function getData(req, res) {
ret["bjwcl"] = {title:"班级完成率", dataList:bjwcl}; ret["bjwcl"] = {title:"班级完成率", dataList:bjwcl};
// let njtshdData = await getReqApiData(xshxNENUM.年级特色活动, {pageNo:1, pageSize:100, gradeId:grade}); //todo let njtshdData = await getReqApiData(xshxNENUM.年级特色活动, {pageNo:1, pageSize:100, gradeId:grade}); //todo
let njtshd = { let njtshd = {
titleList:["活动种类", "活动名称", "时间", "地点", "参与人数"], titleList:["活动种类", "活动名称", "时间", "地点", "参与人数"],
dataList:[ dataList:[
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* 教师画像(对内)-身心健康 * 教师画像(对内)-身心健康
*/ */
import { xshxNENUM } from "../../config/interficeEnum"; import { sxjkWENUM } from "../../config/interficeEnum";
import { getReqApiData } from "../../data/interface/url"; import { getReqApiData } from "../../data/interface/url";
import { getKeyValue, readFileList } from "../outData"; import { getKeyValue, readFileList } from "../outData";
import { jshxTableData } from "../../data/table/duiwai"; import { jshxTableData } from "../../data/table/duiwai";
...@@ -11,77 +11,107 @@ import { systemConfig } from "../../config/serverConfig"; ...@@ -11,77 +11,107 @@ import { systemConfig } from "../../config/serverConfig";
const ImgUrl = "img/对内/学生画像/身心健康/"; const ImgUrl = "img/对内/学生画像/身心健康/";
const GradeChange = {
1:"一年级",
2:"二年级",
3:"三年级",
4:"四年级",
5:"五年级",
6:"六年级",
7:"七年级",
8:"八年级",
9:"九年级",
10:"高中",
// 10:"高一",
// 11:"高二",
// 12:"高三",
}
/**体质监测 */ /**体质监测 */
export async function getTzjc(req, res) { export async function getTzjc(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let className = req.body.className || "一班"; let className = req.body.className || "一年级2班";
let ret:any = {}; let ret:any = {};
let tzjc = [ let tzjc = [
{ {
key:"优良率", key:"优良率",
value:0 value:"0.0%"
}, },
{ {
key:"合格率", key:"合格率",
value:0 value:"0.0%"
} }
]; ];
let tzjcData = await getReqApiData(sxjkWENUM.班级合格率优良率, {gradeId:grade, className});
for (let key in tzjcData) {
if (key == "classFine") {
tzjc[0].value = tzjcData[key][className] + "%";
}
if (key == "classPass") {
tzjc[1].value = tzjcData[key][className] + "%";
}
}
ret["tzjc"] = {title:"体质监测", dataList:tzjc}; ret["tzjc"] = {title:"体质监测", dataList:tzjc};
let BMIqs = { // let BMIqs = {
正常:[ // 正常:[
{ // {
key:"2023", // key:"2023",
value:80 // value:80
}, // },
{ // {
key:"2024", // key:"2024",
value:30 // value:30
}, // },
], // ],
偏低:[ // 偏低:[
{ // {
key:"2023", // key:"2023",
value:86 // value:86
}, // },
{ // {
key:"2024", // key:"2024",
value:12 // value:12
}, // },
], // ],
偏高:[ // 偏高:[
{ // {
key:"2023", // key:"2023",
value:30 // value:30
}, // },
{ // {
key:"2024", // key:"2024",
value:11 // value:11
}, // },
], // ],
}; // };
let BMIqs = [];
let BMIqsData = await getReqApiData(sxjkWENUM.班级BMI趋势, {gradeId:grade, className});
BMIqsData.forEach( info => {
BMIqs.push( {key:info.name, value:info.value} );
})
ret["BMIqs"] = {title:"BMI趋势", dataList:BMIqs}; ret["BMIqs"] = {title:"BMI趋势", dataList:BMIqs};
let jcsj = [ let jcsjInfo = { "视力异常率":"0.0%", "体型异常(超重,肥胖)":0, "龋齿人数":0, "其他人数":0 };
{ let classBmiData = await getReqApiData(sxjkWENUM.班级BMI趋势, {gradeId:grade, className});
key:"视力异常人数", classBmiData.forEach( info => {
value:0 if (info.name == "超重" || info.name == "肥胖") {
}, jcsjInfo["体型异常(超重,肥胖)"] += info.value;
{ }
key:"体型异常(超重,肥胖)", })
value:0 let jcsjData = await getReqApiData(sxjkWENUM.视力分析, {gradeId:grade, className});
}, jcsjData.forEach( info => {
{ if (info.name == className) {
key:"龋齿人数", jcsjInfo.视力异常率 = info.value + "%";
value:0 }
}, })
{
key:"视力异常人数", let jcsj = [];
value:0 for(let key in jcsjInfo) {
}, jcsj.push( {key, value:jcsjInfo[key]} );
]; }
ret["jcsj"] = {title:"基础数据", dataList:jcsj}; ret["jcsj"] = {title:"基础数据", dataList:jcsj};
let tytz = [ let tytz = [
...@@ -90,6 +120,7 @@ export async function getTzjc(req, res) { ...@@ -90,6 +120,7 @@ export async function getTzjc(req, res) {
value:0 value:0
} }
]; ];
let tytzData = await getReqApiData(sxjkWENUM.特异体质总人数, {gradeId:grade, className}); //todo
ret["tytz"] = {title:"特异体质", dataList:tytz}; ret["tytz"] = {title:"特异体质", dataList:tytz};
let tytzxx = { let tytzxx = {
...@@ -126,6 +157,7 @@ export async function getTzjc(req, res) { ...@@ -126,6 +157,7 @@ export async function getTzjc(req, res) {
value:0 value:0
}, },
]; ];
let gmdaData = await getReqApiData(sxjkWENUM.特异体质总人数, {gradeId:grade, className}); //todo
ret["gmda"] = {title:"过敏档案", dataList:gmda}; ret["gmda"] = {title:"过敏档案", dataList:gmda};
res.send(ret); res.send(ret);
...@@ -135,8 +167,11 @@ export async function getTzjc(req, res) { ...@@ -135,8 +167,11 @@ export async function getTzjc(req, res) {
/**学生出勤情况 */ /**学生出勤情况 */
export async function getXscqqk(req, res) { export async function getXscqqk(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let className = req.body.className || "一班"; let className = req.body.className || "一年级2班";
let ret:any = {}; let ret:any = {};
let classId = "";
let classStr = `${GradeChange[grade]}${className}`;
let classData = await getReqApiData(sxjkWENUM.获取班级信息, {className:classStr});
let jcsj = [ let jcsj = [
{ {
...@@ -148,6 +183,7 @@ export async function getXscqqk(req, res) { ...@@ -148,6 +183,7 @@ export async function getXscqqk(req, res) {
value:2 value:2
} }
]; ];
let jcsjData = await getReqApiData(sxjkWENUM.学生请假统计, {classId});
ret["jcsj"] = {title:"基础数据", dataList:jcsj}; ret["jcsj"] = {title:"基础数据", dataList:jcsj};
let qjlb = { let qjlb = {
...@@ -314,19 +350,28 @@ export async function getXscqqk(req, res) { ...@@ -314,19 +350,28 @@ export async function getXscqqk(req, res) {
/**体质测试情况 */ /**体质测试情况 */
export async function getTzcsqk(req, res) { export async function getTzcsqk(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let className = req.body.className || "一班"; let className = req.body.className || "一年级2班";
let ret:any = {}; let ret:any = {};
let jcsj = [ let jcsj = [
{ {
key:"优良率", key:"优良率",
value:0 value:"0.0%"
}, },
{ {
key:"合格率", key:"合格率",
value:0 value:"0.0%"
}, },
]; ];
let jcsjData = await getReqApiData(sxjkWENUM.班级合格率优良率, {gradeId:grade, className});
for (let key in jcsjData) {
if (key == "classFine") {
jcsj[0].value = jcsjData[key][className] + "%";
}
if (key == "classPass") {
jcsj[1].value = jcsjData[key][className] + "%";
}
}
ret["jcsj"] = {title:"基础数据", dataList:jcsj}; ret["jcsj"] = {title:"基础数据", dataList:jcsj};
let tzcsqk = [ let tzcsqk = [
......
...@@ -255,7 +255,7 @@ export async function getData(req, res) { ...@@ -255,7 +255,7 @@ export async function getData(req, res) {
ret["zhpj"] = {title:"综合评价", dataList:zhpj}; ret["zhpj"] = {title:"综合评价", dataList:zhpj};
/**修业课程与学业成绩 */ /**修业课程与学业成绩 */
// let xycjzfData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"基础课程"}); //todo let xycjzfData = await getReqApiData(xshxgrWENUM.获取学生各科成绩, {studentId}); //todo
let xycjzData = cjExcelData["学业成绩"].dataList; let xycjzData = cjExcelData["学业成绩"].dataList;
let stuXycjData = {}; let stuXycjData = {};
xycjzData.forEach(info => { xycjzData.forEach(info => {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
import { title } from "process"; import { title } from "process";
import { xshxNENUM } from "../../config/interficeEnum"; import { xyspNENUM } from "../../config/interficeEnum";
import { getReqApiData } from "../../data/interface/url"; import { getReqApiData } from "../../data/interface/url";
import { getKeyValue, readFileList } from "../outData"; import { getKeyValue, readFileList } from "../outData";
import { jshxTableData } from "../../data/table/duiwai"; import { jshxTableData } from "../../data/table/duiwai";
...@@ -186,7 +186,7 @@ export async function getBxqxkbhqs(req, res) { ...@@ -186,7 +186,7 @@ export async function getBxqxkbhqs(req, res) {
/**整体数据 */ /**整体数据 */
export async function getData(req, res) { export async function getData(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let className = req.body.className || "班"; let className = req.body.className || "1班";
// let score = req.body.className || "A"; // let score = req.body.className || "A";
let ret:any = {}; let ret:any = {};
...@@ -850,6 +850,8 @@ export async function getData(req, res) { ...@@ -850,6 +850,8 @@ export async function getData(req, res) {
value:"名次99" value:"名次99"
}, },
]; ];
let xksyjData = await getReqApiData(xyspNENUM.学困生预警, {gradeId:grade, classNum:className});
ret["xksyj"] = {title:"学困生预警", dataList:xksyj, count:11}; ret["xksyj"] = {title:"学困生预警", dataList:xksyj, count:11};
res.send(ret); res.send(ret);
......
...@@ -2,13 +2,9 @@ ...@@ -2,13 +2,9 @@
* 教师画像(对内)-综合实践活动参与情况 * 教师画像(对内)-综合实践活动参与情况
*/ */
import { title } from "process"; import { zhsjhdNENUM, xshxNENUM } from "../../config/interficeEnum";
import { xshxNENUM } from "../../config/interficeEnum";
import { getReqApiData } from "../../data/interface/url"; import { getReqApiData } from "../../data/interface/url";
import { getKeyValue, readFileList } from "../outData"; import { readFileList } from "../outData";
import { jshxTableData } from "../../data/table/duiwai";
import { keyValuePackage, tablePackage } from "../../dataPackage/inFrontOut";
import { systemConfig } from "../../config/serverConfig";
const ImgUrl = "img/对内/学生画像/综合实践活动参与情况/"; const ImgUrl = "img/对内/学生画像/综合实践活动参与情况/";
...@@ -16,7 +12,7 @@ const ImgUrl = "img/对内/学生画像/综合实践活动参与情况/"; ...@@ -16,7 +12,7 @@ const ImgUrl = "img/对内/学生画像/综合实践活动参与情况/";
/**左侧 */ /**左侧 */
export async function getTddyhd(req, res) { export async function getTddyhd(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let className = req.body.className || "班"; let className = req.body.className || "1班";
let ret:any = {}; let ret:any = {};
let cyrc = [ let cyrc = [
...@@ -25,6 +21,7 @@ export async function getTddyhd(req, res) { ...@@ -25,6 +21,7 @@ export async function getTddyhd(req, res) {
value:243 value:243
} }
]; ];
let jcsjData = await getReqApiData(zhsjhdNENUM.各类活动统计, {gradeId:grade, className});
ret["cyrc"] = {title:"参与人次", dataList:cyrc}; ret["cyrc"] = {title:"参与人次", dataList:cyrc};
let tddyhd = [ let tddyhd = [
...@@ -117,29 +114,70 @@ export async function getData(req, res) { ...@@ -117,29 +114,70 @@ export async function getData(req, res) {
let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】 let grade = req.body.grade || 1; //【一年级:1、二年级:2、三年级:3、四年级:4】
let ret:any = {}; let ret:any = {};
let xshjcgzs = [ // let xshjcgzs = [
// {
// key:"获奖人次",
// value:39
// },
// {
// key:"国家级",
// value:2
// },
// {
// key:"市级",
// value:0
// },
// {
// key:"区级",
// value:4
// },
// {
// key:"校级",
// value:33
// },
// ];
let jshjData = await getReqApiData(zhsjhdNENUM.获奖统计, {grade, pageNo:1, pageSize:100});
let jshjCount = {gjj:0, sj:0, qj:0, xj:0};
if (jshjData) {
switch (jshjData.awardLevel) {
case "国家级":
jshjCount.gjj++;
break;
case "市级":
jshjCount.sj++;
break;
case "区级":
jshjCount.qj++;
break;
case "校级":
jshjCount.xj++;
break;
}
}
let jshj = [
{ {
key:"获奖人次", key:"获奖人次",
value:39 value:jshjData.length || 0
}, },
{ {
key:"国家级", key:"国家级奖项",
value:2 value:jshjCount.gjj || 6
}, },
{ {
key:"市级", key:"市级奖项",
value:0 value:jshjCount.sj || 35
}, },
{ {
key:"区级", key:"区级奖项",
value:4 value:jshjCount.qj || 114
}, },
{ {
key:"校级", key:"校级奖项",
value:33 value:jshjCount.xj || 0
}, },
]; ]
ret["xshjcgzs"] = {title:"学生获奖成果展示", dataList:xshjcgzs}; ret["xshjcgzs"] = {title:"学生获奖成果展示", dataList:jshj};
let hdfcImg = readFileList(`${ImgUrl}活动风采/`, [], "png"); let hdfcImg = readFileList(`${ImgUrl}活动风采/`, [], "png");
let hdfc = []; let hdfc = [];
......
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
import { ztbxNENUM } from "../../config/interficeEnum"; import { ztbxNENUM } from "../../config/interficeEnum";
import { getReqApiData } from "../../data/interface/url"; import { getReqApiData } from "../../data/interface/url";
import moment = require("moment"); import moment = require("moment");
import { xxgzapTableData, xxzdhdTableData, ztbxTableData } from "../../data/table/duinei"; import { xxzdhdTableData, ztbxTableData } from "../../data/table/duinei";
import { getKeyValue } from "../outData";
import { keyValuePackage, onceYBarChartPackage } from "../../dataPackage/inFrontOut";
import { getKeyValueOut, getOnceYBarChartOut } from "../../dataPackage/out";
import { systemConfig } from "../../config/serverConfig";
import { tysjyTableData } from "../../data/table/duiwai"; import { tysjyTableData } from "../../data/table/duiwai";
import { get } from "../../util/request"; import { get } from "../../util/request";
......
import { systemConfig } from "../../config/serverConfig";
import { getBase64Str, getAppToken, getReqApiData, getAppTicket } from "../../data/interface/url"; import { getBase64Str, getAppToken, getReqApiData, getAppTicket } from "../../data/interface/url";
import { BizError } from "../../util/bizError"; import { BizError } from "../../util/bizError";
import { get } from "../../util/request";
......
...@@ -7,6 +7,21 @@ import { spfxWENUM } from "../../config/interficeEnum"; ...@@ -7,6 +7,21 @@ import { spfxWENUM } from "../../config/interficeEnum";
const ImgUrl = "img/对外/水平分析弹窗/"; const ImgUrl = "img/对外/水平分析弹窗/";
const GradeChange = {
1:"一年级",
2:"二年级",
3:"三年级",
4:"四年级",
5:"五年级",
6:"六年级",
7:"七年级",
8:"八年级",
9:"九年级",
10:"高中",
// 10:"高一",
// 11:"高二",
// 12:"高三",
}
export async function getData(req, res) { export async function getData(req, res) {
let ret: any = {}; let ret: any = {};
...@@ -224,33 +239,13 @@ export async function getData(req, res) { ...@@ -224,33 +239,13 @@ export async function getData(req, res) {
]; ];
ret["sg"] = {title:"身高", dataList:sg}; ret["sg"] = {title:"身高", dataList:sg};
let sgczfx = [ let sgczfx = [];
{ let sgczfxData = await getReqApiData(spfxWENUM.身高体重成长分析, {studentId});
"key":"2021上", if (sgczfxData.heightAnalysis) {
"value":"120", sgczfxData.heightAnalysis.forEach( info => {
"age":"130" sgczfx.push( {key: info.key, value: info.value || 0, age: info.bmiScore || 0} );
}, })
{ }
"key":"2021下",
"value":"125",
"age":"130"
},
{
"key":"2022上",
"value":"120",
"age":"130"
},
{
"key":"2022下",
"value":"125",
"age":"130"
},
{
"key":"2023上",
"value":"120",
"age":"130"
},
];
ret["xgczfx"] = {title:"身高成长分析", dataList:sgczfx}; ret["xgczfx"] = {title:"身高成长分析", dataList:sgczfx};
let tzBMI = [ let tzBMI = [
...@@ -265,72 +260,20 @@ export async function getData(req, res) { ...@@ -265,72 +260,20 @@ export async function getData(req, res) {
]; ];
ret["tzBMI"] = {title:"体重BMI", dataList:tzBMI}; ret["tzBMI"] = {title:"体重BMI", dataList:tzBMI};
let tzczfx = [ let tzczfx = [];
{ if (sgczfxData.weightAnalysis) {
"key":"2021上", sgczfxData.weightAnalysis.forEach( info => {
"value":"32.5 ", tzczfx.push( {key: info.key, value: info.value || 0, age: info.bmiScore || 0} );
"age":"30" })
}, }
{
"key":"2021下",
"value":"35.2",
"age":"35"
},
{
"key":"2022上",
"value":"32.5 ",
"age":"30"
},
{
"key":"2022下",
"value":"35.2",
"age":"35"
},
{
"key":"2023上",
"value":"32.5 ",
"age":"30"
},
{
"key":"2023下",
"value":"35.2",
"age":"35"
},
];
ret["tzczfx"] = {title:"体重成长分析", dataList:tzczfx}; ret["tzczfx"] = {title:"体重成长分析", dataList:tzczfx};
let BMIfx = [ let BMIfx = [];
{ if (sgczfxData.BMIAnalysis) {
"key":"2021上", sgczfxData.BMIAnalysis.forEach( info => {
"value":"21", BMIfx.push( {key: info.key, value: info.avgWeightValue || 0, age: info.avgBmiScore || 0} );
"age":"20.7" })
}, }
{
"key":"2021下",
"value":"21.5",
"age":"21.3"
},
{
"key":"2022上",
"value":"21",
"age":"20.7"
},
{
"key":"2022下",
"value":"21.5",
"age":"21.3"
},
{
"key":"2023上",
"value":"21",
"age":"20.7"
},
{
"key":"2023下",
"value":"21.5",
"age":"21.3"
},
];
ret["BMIfx"] = {title:"BMI分析", dataList:BMIfx}; ret["BMIfx"] = {title:"BMI分析", dataList:BMIfx};
let sl = [ let sl = [
...@@ -345,47 +288,55 @@ export async function getData(req, res) { ...@@ -345,47 +288,55 @@ export async function getData(req, res) {
]; ];
ret["sl"] = {title:"视力", dataList:sl}; ret["sl"] = {title:"视力", dataList:sl};
let slfx = [ let slfxMap = {};
{ let slfxData = await getReqApiData(spfxWENUM.视力分析, {studentId});
"key":"2021上", if (slfxData.visualAcuityAnalysis) {
"value":"5.2", slfxData.visualAcuityAnalysis.forEach( info => {
"age":"4.9" slfxMap[info.key] = {
}, leftValue:0,
{ rightValue:0,
"key":"2021下", avgLeftValue:info.avgLeftValue,
"value":"5.0", avgRightValue:info.avgRightValue
"age":"4.7" }
}, });
{ }
"key":"2022上",
"value":"5.2", if (slfxData.rightVisualAcuity) {
"age":"4.9" slfxData.rightVisualAcuity.forEach( info => {
}, slfxMap[info.key].rightValue = info.value;
{ })
"key":"2022下", }
"value":"5.0",
"age":"4.7" if (slfxData.leftVisualAcuity) {
}, slfxData.leftVisualAcuity.forEach( info => {
{ slfxMap[info.key].leftValue = info.value;
"key":"2023上", })
"value":"5.2", }
"age":"4.9"
}, let slfx = [];
{ for (let key in slfxMap) {
"key":"2023下", slfx.push({
"value":"5.0", key:key,
"age":"4.7" leftValue: slfxMap[key].leftValue,
}, rightValue: slfxMap[key].rightValue,
]; avgLeftValue: slfxMap[key].avgLeftValue,
avgRightValue: slfxMap[key].avgRightValue,
})
}
ret["slfx"] = {title:"视力分析", dataList:slfx}; ret["slfx"] = {title:"视力分析", dataList:slfx};
let baseData = await getReqApiData(spfxWENUM.获取学生列表, {studentId}); let baseData = await getReqApiData(spfxWENUM.获取学生列表, {studentId});
let schoolId = "559254528fc7421d9a4e25aaa1caaad3"; let schoolId = "559254528fc7421d9a4e25aaa1caaad3";
let classId = ""; let classId = "";
let className = "一年级2班";
let gradeId = "1";
if (baseData) { if (baseData) {
if (baseData.length) { if (baseData.length) {
let item = baseData[0] || {}; let item = baseData[0] || {};
gradeId = item.gradeId || "1";
classId = item.classId; classId = item.classId;
className = item.className || "一年级2班";
} }
} }
let maximumcore = await postReqApiData(spfxWENUM.行为表现, {personId:studentId, schoolId, classId, platformCode:"999999"}); let maximumcore = await postReqApiData(spfxWENUM.行为表现, {personId:studentId, schoolId, classId, platformCode:"999999"});
...@@ -451,33 +402,62 @@ export async function getData(req, res) { ...@@ -451,33 +402,62 @@ export async function getData(req, res) {
let tytctj = [ let tytctj = [
{ {
"key":"体育体侧总分", "key":"体育体侧总分",
"value":"80" "value":"0"
} }
]; ];
let tytctjData = await getReqApiData(spfxWENUM.学生体质健康, {studentId});
if (tytctjData) {
tytctj[0].value = tytctjData[0].finallyScore;
}
ret["tytctj"] = {title:"体育体侧统计", dataList:tytctj}; ret["tytctj"] = {title:"体育体侧统计", dataList:tytctj};
let jqtccyqk = [ let jqtccyqk = [
{ {
"key":"肺活量(ml)", "key":"肺活量(ml)",
"value":2087 "value":0
}, },
{ {
"key":"50米跑(秒)", "key":"50米跑(秒)",
"value":8.34 "value":0
}, },
{ {
"key":"坐位体前屈(cm)", "key":"坐位体前屈(cm)",
"value":16.5 "value":0
}, },
{ {
"key":"一分钟跳绳(次)", "key":"一分钟跳绳(次)",
"value":135 "value":0
}, },
{ {
"key":"一分钟仰卧起坐(次)", "key":"一分钟仰卧起坐(次)",
"value":50 "value":0
}, },
]; ];
if (tytctjData) {
jqtccyqk = [
{
"key":"肺活量(ml)",
"value":tytctjData[0].vital || '0',
},
{
"key":"50米跑(秒)",
"value":tytctjData[0].run50 || '0',
},
{
"key":"坐位体前屈(cm)",
"value":tytctjData[0].flexion || '0',
},
{
"key":"一分钟跳绳(次)",
"value":tytctjData[0].jumpRope60 || '0',
},
{
"key":"一分钟仰卧起坐(次)",
"value":tytctjData[0].sitUp60 || '0',
},
];
}
ret["jqtccyqk"] = {title:"当前学期体质测试结果", dataList:jqtccyqk}; ret["jqtccyqk"] = {title:"当前学期体质测试结果", dataList:jqtccyqk};
let bjcjtj = [ let bjcjtj = [
...@@ -490,6 +470,15 @@ export async function getData(req, res) { ...@@ -490,6 +470,15 @@ export async function getData(req, res) {
"value":"0.0%" "value":"0.0%"
} }
]; ];
let bjcjtjData = await getReqApiData(spfxWENUM.班级合格率优良率, {gradeId, className});
for (let key in bjcjtjData) {
if (key == "classFine") {
bjcjtj[0].value = bjcjtjData[key][className] + "%";
}
if (key == "classPass") {
bjcjtj[1].value = bjcjtjData[key][className] + "%";
}
}
ret["bjcjtj"] = {title:"班级成绩统计", dataList:bjcjtj}; ret["bjcjtj"] = {title:"班级成绩统计", dataList:bjcjtj};
let njcjtj = [ let njcjtj = [
...@@ -502,8 +491,18 @@ export async function getData(req, res) { ...@@ -502,8 +491,18 @@ export async function getData(req, res) {
"value":"0.0%" "value":"0.0%"
} }
]; ];
let njcjtjData = await getReqApiData(spfxWENUM.年级合格率优良率, {gradeId});
for (let key in njcjtjData) {
if (key == "gradeFine") {
njcjtj[0].value = njcjtjData[key][GradeChange[gradeId]] + "%";
}
if (key == "gradePass") {
njcjtj[1].value = njcjtjData[key][GradeChange[gradeId]] + "%";
}
}
ret["njcjtj"] = {title:"年级成绩统计", dataList:njcjtj}; ret["njcjtj"] = {title:"年级成绩统计", dataList:njcjtj};
let hjcsData = await getReqApiData(spfxWENUM.获奖信息, {studentId, pageNo:1, pageSize:100});
let hjcs = [ let hjcs = [
{ {
key:"获奖次数", key:"获奖次数",
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
* 校园文化标识、发展里程碑 * 校园文化标识、发展里程碑
*/ */
import { xyfzlcbWENUM } from "../../config/interficeEnum";
import { getReqApiData } from "../../data/interface/url";
import { xywhbsTableData } from "../../data/table/duiwai"; import { xywhbsTableData } from "../../data/table/duiwai";
import { readFileList } from "../outData"; import { readFileList } from "../outData";
......
...@@ -437,6 +437,7 @@ export async function getData(req, res) { ...@@ -437,6 +437,7 @@ export async function getData(req, res) {
}, },
] ]
} }
let ryjxjsData = await getReqApiData(ztbxWENUM.荣誉奖项教师, {type:2});
ret["ryjxjs"] = {title:"荣誉奖项教师", dataList:ryjxjs}; ret["ryjxjs"] = {title:"荣誉奖项教师", dataList:ryjxjs};
let ryjxxx = { let ryjxxx = {
......
...@@ -41,7 +41,7 @@ export enum ztbxWENUM { ...@@ -41,7 +41,7 @@ export enum ztbxWENUM {
// 教师成长饼图数据 = "", // 教师成长饼图数据 = "",
统计学生九个一完成情况 = "/getCountStuTenComplete", 统计学生九个一完成情况 = "/getCountStuTenComplete",
// 荣誉奖项学生 = "", // 荣誉奖项学生 = "",
// 荣誉奖项教师 = "", 荣誉奖项教师 = "/api/portrait/jxbscyqk",
// 荣誉奖项学校 = "", // 荣誉奖项学校 = "",
// 毕业生去向 = "", // 毕业生去向 = "",
...@@ -62,6 +62,9 @@ export enum jshxWENUM { ...@@ -62,6 +62,9 @@ export enum jshxWENUM {
参与科研情况 = "/api/portrait/cykyqk", 参与科研情况 = "/api/portrait/cykyqk",
教师病假人数趋势 = "/getTeacherLeaveLine", 教师病假人数趋势 = "/getTeacherLeaveLine",
教研活动 = "/api/portrait/jyhd", 教研活动 = "/api/portrait/jyhd",
出勤考核 = "/getTeacherClockingState",
请假情况 = "/getTeacherClockingState",
调代课情况 = "/getTeacherClassHourCount",
} }
...@@ -139,7 +142,37 @@ export enum spfxWENUM { ...@@ -139,7 +142,37 @@ export enum spfxWENUM {
获取学生列表 = "/getStudentList", 获取学生列表 = "/getStudentList",
九加一完成情况 = "/getCountStuTenComplete", 九加一完成情况 = "/getCountStuTenComplete",
行为表现 = "/studentDimensionRadar", 行为表现 = "/studentDimensionRadar",
身高体重成长分析 = "/getAvgHeightWeight",
BMI分析 = "/getBmiLine",
视力分析 = "/getVisualAcuityAnalysis",
学生体质健康 = "/getTzjkOne",
班级合格率优良率 = "/getCountTzjkPassRatioClass",
年级合格率优良率 = "/getCountTzjkPassRatioGrade",
获奖信息 = "/getStuAwards",
}
/**身心健康弹窗 */
export enum sxjkWENUM {
获取班级信息 = "/queryClassInfo",
班级合格率优良率 = "/getCountTzjkPassRatioClass",
年级BMI趋势 = "/getCountTzjkBmiRatioGrade",
视力分析 = "/getGradeClassVisionDefect",
班级BMI趋势 = "/getCountTzjkBmiRatioClass",
特异体质总人数 = "/getAtopySumNum",
学生请假统计 = "/student-apply-count",
}
/**综合实践活动参与情况 */
export enum zhsjhdNENUM {
各类活动统计 = "/getCountStuActivity",
获奖统计 = "/getStuAwards",
}
export enum xyspNENUM {
学困生预警 = "/getStuStudyScoreWarning",
} }
...@@ -209,6 +242,7 @@ export enum jsgrfzNENUM { ...@@ -209,6 +242,7 @@ export enum jsgrfzNENUM {
教师基本信息 = "/getTeacherInfoList", 教师基本信息 = "/getTeacherInfoList",
教师任教班级 = "/getTeachingClass", 教师任教班级 = "/getTeachingClass",
教师经历 = "/api/portrait/jxjl", 教师经历 = "/api/portrait/jxjl",
竞赛获奖人次 = "/api/portrait/zyry",
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment