no message

src/biz/duinei/jsgrfz.ts

@@ -261,11 +261,13 @@ export async function getData(req, res) {
     ret["cyjszs"] = {title:"参与教师总数", dataList:cyjszs};
 
     let zyry = [
-        ["区骨干", "2016.06.30-2025.06.30", "****"],
-        ["学科带头人", "2016.06.30-2025.06.30", "****"],
-        ["区骨干", "2016.06.30-2025.06.30", "****"],
-        ["区骨干", "2016.06.30-2025.06.30", "****"],
-        ["市中心组成员", "2016.06.30-2025.06.30", "****"],
+        ["-", "-", "-"],
+        ["-", "-", "-"],
+        ["-", "-", "-"],
+        // ["学科带头人", "2016.06.30-2025.06.30", "****"],
+        // ["区骨干", "2016.06.30-2025.06.30", "****"],
+        // ["区骨干", "2016.06.30-2025.06.30", "****"],
+        // ["市中心组成员", "2016.06.30-2025.06.30", "****"],
     ];
     ret["zyry"] = {title:"专业荣誉", dataList:zyry};
 

src/biz/duinei/jshx.ts

@@ -160,19 +160,21 @@ export async function getData(req, res) {
 
     // 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 jxtjDataList = { gjj: [], sj: [], qj: [], xj: [] };
-    if (jshjData) {
-        jshjData.list.data.forEach(info => {
-            //todo 对应标准发给我之后修改
-            if (info.level == "国家级及以上") jxtjDataList.gjj.push(info);
-            if (info.level == "省/市级") jxtjDataList.sj.push(info);
-            if (info.level == "区/县级") jxtjDataList.qj.push(info);
-            if (info.level == "校级") jxtjDataList.xj.push(info);
-        })
+    for (let i = 1; i <=3; i++) {
+        let jshjData = await getReqApiData(jshxNENUM.教师获奖, {type:1, page:i, api_rpp:100}, null, "data", "jsfz");
+    
+        if (jshjData) {
+            jshjData.list.data.forEach(info => {
+                //todo 对应标准发给我之后修改
+                if (info.level == "国家级及以上") jxtjDataList.gjj.push(info);
+                if (info.level == "省/市级") jxtjDataList.sj.push(info);
+                if (info.level == "区/县级") jxtjDataList.qj.push(info);
+                if (info.level == "校级") jxtjDataList.xj.push(info);
+            })
+        }
     }
-
+    
     let jshj = [
         {
             key: "国家级奖项",
@@ -193,11 +195,11 @@ export async function getData(req, res) {
     ]
     ret["jshj"] = { title: "教师获奖", dataList: jshj };
 
-    // let tptdImg = getImagesInDir(`img/对内/教师画像/特聘团队/`);  标记取消注释
-    // ret["tptd"] = { title: "特聘团队", dataList: tptdImg };
+    let tptdImg = getImagesInDir(`img/对内/教师画像/特聘团队/`);
+    ret["tptd"] = { title: "特聘团队", dataList: tptdImg };
 
-    // let zjtdImg = getImagesInDir(`img/对内/教师画像/专家团队/`);
-    // ret["zjtd"] = {title:"专家团队", dataList:zjtdImg};
+    let zjtdImg = getImagesInDir(`img/对内/教师画像/专家团队/`);
+    ret["zjtd"] = {title:"专家团队", dataList:zjtdImg};
 
     let xkdstd = keyValuePackage(excelData['学科导师团队'].dataList);
     ret["xkdstd"] = { title: "学科导师团队", dataList: xkdstd };
@@ -578,8 +580,8 @@ export async function getData(req, res) {
         }
     ];
     ret["zyfzcg"] = { title: "论文发表", dataList: lwfb };
-    // let lwfbImg = readFileList(`${ImgUrl}论文发表图片/`, [], "png");   标记取消注释
-    // ret["lwfbImg"] = {title:"论文发表图片", dataList:lwfbImg};
+    let lwfbImg = readFileList(`${ImgUrl}论文发表图片/`, [], "png");
+    ret["lwfbImg"] = {title:"论文发表图片", dataList:lwfbImg};
 
     // let jyhj = keyValuePackage(excelData["教师获奖"].dataList);
     let jyhj = [

src/biz/duinei/njzjshx.ts

@@ -59,9 +59,11 @@ export async function getData(req, res) {
     let zcfbData = {"高级教师":0, "中教一级":0, "中教二级":0, "未评级":0};
     //教龄分布
     let jlData = {"10年以上教龄":0, "6-10年教龄":0, "3-5年教龄":0, "3年以下教龄":0}
+    //学科教师人数
+    let xkjcsjData = {"语文":0, "数学":0, "英语":0, "综理":0, "综文":0, "体育":0, "艺术":0};
 
     jszyData.forEach( info => {
-        let {njzcy, nl, xb, xl, zc, zzmm, jl} = info;
+        let {njzcy, nl, xb, xl, zc, zzmm, jl, jyz} = info;
         if(xb == "女") nvshenNum += 1;
         else nanshenNum += 1;
         if(xl) {
@@ -88,6 +90,10 @@ export async function getData(req, res) {
         else if(jl>=6 || jl<10) jlData["6-10年教龄"] += 1;
         else if(jl>=3 || jl<5) jlData["3-5年教龄"] += 1;
         else if(jl<3) jlData["3年以下教龄"] += 1;
+
+        for(let key in xkjcsjData) {
+            if (key == jyz) xkjcsjData[key] += 1;
+        }
     })
 
     let nanshen = {
@@ -190,7 +196,11 @@ export async function getData(req, res) {
     let xkdszb = excelData["学科导师占比"].dataList;
     ret["xkdszb"] = {title:"学科导师占比", dataList:xkdszb};
 
-    let xkjcsj = excelData["学科导师占比"].dataList;
+    // let xkjcsj = excelData["学科导师占比"].dataList;
+    let xkjcsj = [];
+    for(let key in xkjcsjData) {
+        xkjcsj.push({key, value:xkjcsjData[key]});
+    }
     ret["xkjcsj"] = {title:"学科基础数据", dataList:xkjcsj};
 
     let njjsImg = readFileList(`${ImgUrl}${grade}/`, [], "png");

src/biz/duinei/xshx.ts

@@ -494,7 +494,7 @@ export async function getData(req, res) {
     let hjcgzs = [];
     hjcgzsData.forEach( info => {
         let {key, value} = info;
-        hjcgzs.push({img:`${systemConfig.ipUrl}对外/学生画像/获奖成果展示/${key}`, name:value});
+        hjcgzs.push({img:`${systemConfig.ipUrl}对内/学生画像/获奖成果展示/${key}`, name:value});
     });
     ret["hjcgzs"] = {title:"获奖成果展示", dataList:hjcgzs};