Skip to content

S
skdSecond
Commit 55781177 by lixinming
Options

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

parents 1a0ef8ea c7cc2131
Showing with 123 additions and 98 deletions
src/biz/duinei/jsgrfz.ts
......@@ -22,7 +22,7 @@ export async function getData(req, res) {
let jbxxData = await getReqApiData(jsgrfzNENUM.教师基本信息, {teacherId});
let jsrjbjData = await getReqApiData(jsgrfzNENUM.教师任教班级, {teacherId});
let jbxx = {
img:"",
img:`${systemConfig.ipUrl}对内/教师个人发展/默认头像.png`,
state:"已认证",
name: jbxxData[0].name,
sex: jbxxData[0].sexName,
......
src/biz/duinei/jshx.ts
......@@ -159,7 +159,9 @@ export async function getData(req, res) {
ret["xxkc"] = { title: "选修课程", dataList: xxkc };
// let jshjData = await getReqApiData(jshxNENUM.教师获奖, {pageNo:1, pageSize:100});
let jshjData = await getReqApiData(jshxNENUM.获奖情况, { type: 1 }, null, "data", "jsfz");
// let jshjData = await getReqApiData(jshxNENUM.获奖情况, { type: 1 }, null, "data", "jsfz");
let jshjData = await getReqApiData(jshxNENUM.教师获奖, {type:1}, null, "data", "jsfz");
let jxtjDataList = { gjj: [], sj: [], qj: [], xj: [] };
if (jshjData) {
jshjData.list.data.forEach(info => {
......
src/biz/duinei/xshx.ts
......@@ -22,9 +22,10 @@ const Grade = {
7:"七年级组",
8:"八年级组",
9:"九年级组",
10:"高一年级组",
11:"高二年级组",
12:"高三年级组",
10:"高中组",
// 10:"高一年级组",
// 11:"高二年级组",
// 12:"高三年级组",
}
const GradeChange = {
......@@ -37,9 +38,10 @@ const GradeChange = {
7:"七年级",
8:"八年级",
9:"九年级",
10:"高一",
11:"高二",
12:"高三",
10:"高中",
// 10:"高一",
// 11:"高二",
// 12:"高三",
}
export async function getData(req, res) {
......@@ -216,35 +218,11 @@ export async function getData(req, res) {
},
{
key:"班级数",
value:parseInt(bjsl.classNum)
value:parseInt(bjsl)
}
];
ret["jcsj"] = {title:"基础数据", dataList:jcsj};
let bjwcl = [
{
key:"1班",
value:20,
rate:86
},
{
key:"2班",
value:20,
rate:86
},
{
key:"3班",
value:20,
rate:86
},
{
key:"4班",
value:20,
rate:86
},
];
ret["bjwcl"] = {title:"班级完成率", dataList:bjwcl};
let jgyzhwcl = [
{
key:"九个一综合完成率",
......@@ -314,6 +292,43 @@ export async function getData(req, res) {
}
ret["jgyxxwcqk"] = {title:"九个一详细完成情况", dataList:jgyxxwcqk};
let bjwcl = [];
let classCount = 0;
for (let key in xsczData.className) {
for (let jgy in xsczData.className[key]) {
classCount += parseInt(xsczData.className[key][jgy]);
}
}
let classrate = 0;
for (let key in xsczData.className) {
if (classCount || xsrs) classrate = Math.round(classCount / xsrs) || 0;
bjwcl.push({key, value:parseInt(xsczData.className[key]), rate:classrate});
}
// let bjwcl = [
// {
// key:"1班",
// value:20,
// rate:86
// },
// {
// key:"2班",
// value:20,
// rate:86
// },
// {
// key:"3班",
// value:20,
// rate:86
// },
// {
// key:"4班",
// value:20,
// rate:86
// },
// ];
ret["bjwcl"] = {title:"班级完成率", dataList:bjwcl};
let njtshd = {
titleList:["活动种类", "活动名称", "时间", "地点", "参与人数"],
dataList:[
......
src/biz/duinei/ztbx.ts
......@@ -172,22 +172,22 @@ export async function getData(req, res) {
let xxmrsp = await getReqApiData(ztbxNENUM.每日食谱, mrspQuery, "GET", "data");
let xx = [];
if (xxmrsp) xx = getMrsp(xxmrsp.list);
// 初中A每日食谱
// 初中每日食谱
let czmrsp = [];
let czamrspQuery = {date_str:mrspTime, typeid:5};
let czamrspQuery = {date_str:mrspTime, typeid:11};
let czamrsp = await getReqApiData(ztbxNENUM.每日食谱, czamrspQuery, "GET", "data");
let cza = [];
if (czamrsp) cza = getMrsp(czamrsp.list);
// cza = getMrsp(czamrsp.list);
czmrsp = cza;
// 初中B每日食谱
let czbmrspQuery = {date_str:mrspTime, typeid:8};
let czbmrsp = await getReqApiData(ztbxNENUM.每日食谱, czbmrspQuery, "GET", "data");
let czb = [];
if (czbmrsp) czb = getMrsp(czbmrsp.list);
czb.forEach( info => {
czmrsp.push(info);
})
// let czbmrspQuery = {date_str:mrspTime, typeid:8};
// let czbmrsp = await getReqApiData(ztbxNENUM.每日食谱, czbmrspQuery, "GET", "data");
// let czb = [];
// if (czbmrsp) czb = getMrsp(czbmrsp.list);
// czb.forEach( info => {
// czmrsp.push(info);
// })
// 住宿生每日食谱
let zssmrspQuery = {date_str:mrspTime, typeid:10};
let zssmrsp = await getReqApiData(ztbxNENUM.每日食谱, zssmrspQuery, "GET", "data");
......
src/biz/duiwai/xshxgr.ts
......@@ -275,7 +275,7 @@ export async function getData(req, res) {
ret["zhpj"] = {title:"综合评价", dataList:zhpj};
/**修业课程与学业成绩 */
let xycjzfData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"基础课程"}); //todo
// let xycjzfData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"基础课程"}); //todo
let xycjzData = cjExcelData["学业成绩"].dataList;
let stuXycjData = {};
xycjzData.forEach(info => {
......@@ -325,20 +325,20 @@ export async function getData(req, res) {
];
ret["xycjzf"] = {title:"修业课程与学业成绩", dataList:xycjzf};
let gkcjData = await getReqApiData(xshxgrWENUM.获取学生各科成绩, {studentId}); //todo
let gkcj = [];
if (gkcjData.length) {
let score = gkcjData[0].score;
let gkcjInfo = {};
score.forEach( info => {
if (!gkcjInfo[info.subject]) gkcjInfo[info.subject] = {qz:0, qm:0};
gkcjInfo[info.subject].qz = info.score4;
gkcjInfo[info.subject].qm = info.score5;
})
for (let key in gkcjInfo) {
gkcj.push({key, midTerm:gkcjInfo[key].qz, endTerm:gkcjInfo[key].qm});
}
}
// let gkcjData = await getReqApiData(xshxgrWENUM.获取学生各科成绩, {studentId}); //todo
// let gkcj = [];
// if (gkcjData.length) {
// let score = gkcjData[0].score;
// let gkcjInfo = {};
// score.forEach( info => {
// if (!gkcjInfo[info.subject]) gkcjInfo[info.subject] = {qz:0, qm:0};
// gkcjInfo[info.subject].qz = info.score4;
// gkcjInfo[info.subject].qm = info.score5;
// })
// for (let key in gkcjInfo) {
// gkcj.push({key, midTerm:gkcjInfo[key].qz, endTerm:gkcjInfo[key].qm});
// }
// }
// let gkcj = [
......@@ -373,6 +373,17 @@ export async function getData(req, res) {
// endTerm:0
// },
// ]
let gkcj = [];
let xkConf = {"yw":"语文", "sx":"数学", "yy":"英语", "df":"道法", "wl":"物理", "hx":"化学", "sw":"生物", "ls":"历史", "dl":"地理", "zz":"政治", "ty":"体育"};
for (let key in xkConf) {
let qm = `${key}qm`;
let qz = `${key}qz`;
let xkqm = thisStuXycj[qm] || "-";
let xkqz = thisStuXycj[qz] || "-";
gkcj.push({key:xkConf[key], midTerm:xkqz, endTerm:xkqm});
}
ret["gkcj"] = {title:"各科成绩", dataList:gkcj};
// let xqzhmscjData = await getReqApiData(xshxgrWENUM.获取学生成绩综合信息, {studentId, type:"综合面试"}); //todo
......@@ -424,19 +435,19 @@ export async function getData(req, res) {
let xssy = [
{
key:"科技素养",
value:"16%"
value:"0%"
},
{
key:"艺术素养",
value:"21%"
value:"0%"
},
{
key:"健康素养",
value:"63%"
value:"0%"
},
{
key:"人文素养",
value:"51%"
value:"0%"
},
];
ret["xssy"] = {title:"学生素养", dataList:xssy};
......@@ -488,27 +499,27 @@ export async function getData(req, res) {
// ret["dtjk"] = {title:"动态-健康", dataList:jkdt};
/**todo 接口接入方式不一致，最后修改 */
// let dtData = await postReqApiData(xshxgrWENUM.学生日常行为规范, {personId:studentId, schoolId, classId});
let dtData = await postReqApiData(xshxgrWENUM.学生日常行为规范, {personId:studentId, schoolId, classId});
let dt = [
{
key:"思想品德",
value:12
value:0
},
{
key:"学业水平",
value:15
value:0
},
{
key:"艺术素养",
value:7
value:0
},
{
key:"身心健康",
value:1
value:0
},
{
key:"社会实践",
value:3
value:0
}
];
ret["dt"] = {title:"动态", rcdp:12, dataList:dt};
......@@ -544,13 +555,13 @@ export async function getData(req, res) {
"时间", "类型", "课题名称", "指导老师", "是否跨学科"
],
dataList:[
[
"2024-01-26",
"探究学习报告",
"*********",
"李**",
"是"
],
// [
// "2024-01-26",
// "探究学习报告",
// "*********",
// "李**",
// "是"
// ],
]
};
ret["cxjsysjnlxxsj"] = {title:"创新精神与实践能力表格", dataList:cxjsysjnlChart};
......@@ -698,32 +709,32 @@ export async function getData(req, res) {
let zpzs = [
{
"key":"活动瞬间",
"value":"10"
"value":"0"
},
{
"key":"个人风采",
"value":"8"
"value":"0"
}
];
ret["zpzs"] = {title:"作品展示", dataList:zpzs};
let zpzstp = [
{
"key":"活动瞬间",
"value":"http://*******.jpg"
},
{
"key":"个人风采",
"value":"http://*******.jpg"
},
{
"key":"科技活动",
"value":"http://*******.jpg"
},
{
"key":"个人风采",
"value":"http://*******.jpg"
},
// {
// "key":"活动瞬间",
// "value":"http://*******.jpg"
// },
// {
// "key":"个人风采",
// "value":"http://*******.jpg"
// },
// {
// "key":"科技活动",
// "value":"http://*******.jpg"
// },
// {
// "key":"个人风采",
// "value":"http://*******.jpg"
// },
];
ret["zpzstp"] = {title:"作品展示图片", dataList:zpzstp};
......@@ -731,12 +742,8 @@ export async function getData(req, res) {
let sjhdjl = {
titleList:["时间", "实践主题", "场所", "课时"],
dataList:[
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["2024-04-24", "这里是实践主题", "这里是场所", "18"],
["-", "-", "-", "-"]
// ["2024-04-24", "这里是实践主题", "这里是场所", "18"],
]
};
ret["sjhdjl"] = {title:"实践活动记录", dataList:sjhdjl};
......
src/config/interficeEnum.ts
......@@ -182,6 +182,7 @@ export enum jshxNENUM {
获取近七天出勤人员 = "/getTeacherReport",
教师调代课记录 = "/getMoveSubject",
获奖情况 = "/api/portrait/jxbscyqk",
教师获奖 = "/api/portrait/zyry",
听评课情况 = "/api/portrait/tpkqk",
任务听评课情况 = "/api/portrait/rwtpk",
全员导师制 = "/api/portrait/qydsz",
......
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