no message

src/biz/duinei/jshx.ts

@@ -2,7 +2,7 @@
  * 教师画像（对内）
  */
 
-import { jshxNENUM, jshxWENUM } from "../../config/interficeEnum";
+import { jshxNENUM, jshxWENUM, ztbxNENUM } from "../../config/interficeEnum";
 import { getReqApiData } from "../../data/interface/url";
 import { getImagesInDir, getKeyValue, readFileList } from "../outData";
 import { jyzjshxTableData, tysjyTableData } from "../../data/table/duiwai";
@@ -191,8 +191,8 @@ 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};
@@ -311,62 +311,98 @@ export async function getData(req, res) {
     ret["ztcql"] = { title: "整体出勤率", dataList: ztcql };
 
     let cqkhqk = [
-        {
-            key: "5.17",
-            value: 46
-        },
-        {
-            key: "5.18",
-            value: 17
-        },
-        {
-            key: "5.19",
-            value: 11
-        },
-        {
-            key: "5.20",
-            value: 49
-        },
-        {
-            key: "5.21",
-            value: 20
-        },
-        {
-            key: "5.22",
-            value: 31
-        },
-        {
-            key: "5.23",
-            value: 66
-        }
+        // {
+        //     key: "5.17",
+        //     value: 46
+        // },
+        // {
+        //     key: "5.18",
+        //     value: 17
+        // },
+        // {
+        //     key: "5.19",
+        //     value: 11
+        // },
+        // {
+        //     key: "5.20",
+        //     value: 49
+        // },
+        // {
+        //     key: "5.21",
+        //     value: 20
+        // },
+        // {
+        //     key: "5.22",
+        //     value: 31
+        // },
+        // {
+        //     key: "5.23",
+        //     value: 66
+        // }
     ];
     let startOfWeek = moment().subtract(7, 'days').format("YYYY-MM-DD HH:mm:ss");
     let endOfWeek = moment(NowTime).format("YYYY-MM-DD HH:mm:ss");
-    let jqtcqData = await getReqApiData(jshxNENUM.获取近七天出勤人员, { startDate: startOfWeek, endDate: endOfWeek, pageNo: 1, pageSize: 100 }, "GET", "data");
+    let jqtcqData = await getReqApiData(jshxNENUM.教师考勤统计, { startDate: startOfWeek, endDate: endOfWeek, pageNum: 7, pageSize: 100 }, "GET", "data");
     //todo 接口字段没有说明
     // /getTeacherReport
     if (jqtcqData) {
+        let thisDateKey = moment().format("YYYY-MM-DD");
+        let dayMap = {};
         jqtcqData.list.forEach(info => {
-
+            let  {every_date, num, clock_status} = info;
+            if (!dayMap[every_date]) dayMap[every_date] = {count:0, successCount:0, ms:moment(every_date).valueOf() };
+            if (clock_status == 1) {
+                dayMap[every_date].successCount += parseInt(num);
+            }
+            dayMap[every_date].count += parseInt(num);
+        });
+        let dayList = Object.values(dayMap);
+    
+        dayList.forEach(info => {
+            cqkhqk.push({
+                key:moment(info["ms"]).format("M.D"),
+                value:Math.round(info["successCount"]/info["count"]*100)
+            });
         })
     }
 
     ret["cqkhqk"] = { title: "出勤考核情况", dataList: cqkhqk };
 
+   
     let qjqk = [
         {
             key: "请假",
             value: 0,
-            rate: "50%"
+            rate:`0%`
         },
         {
             key: "调休",
             value: 0,
-            rate: "50%"
+            rate: `0%`
         },
     ];
+    let qjData = await getReqApiData(ztbxNENUM.教师当天请假人数, { type:1 }, "GET", "list");
+    let txData = await getReqApiData(ztbxNENUM.教师当天请假人数, { type:2 }, "GET", "list");
+    
+   
+    if (qjData && txData) {
+        let qjRate = 0;
+        let txRate = 0;
+        let thisCount = qjData[0].value + txData[0].value;
+        if (thisCount) {
+            if (qjData[0].value) qjRate = Math.round(qjData[0].value/thisCount*100);
+            if (txData[0].value) txRate = Math.round(txData[0].value/thisCount*100);
+        }
+        qjqk[0].value = qjData[0].value;
+        qjqk[0].rate = `${qjRate}%`;
+        qjqk[1].value = txData[0].value;
+        qjqk[1].rate = `${txRate}%`;
+    }
+   
     ret["qjqk"] = { title: "请假情况", dataList: qjqk };
 
+    
+
     // let startOfWeek = moment().subtract(7, 'days').format("YYYY-MM-DD HH:mm:ss");
     // let endOfWeek = moment(NowTime).format("YYYY-MM-DD HH:mm:ss");
     //todo 接口返回数据不对
@@ -540,8 +576,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/duiwai/jshx.ts

@@ -119,7 +119,7 @@ export async function getData(req, res) {
 
     // let jszpq = keyValuePackage(excelData["教师照片墙"].dataList);
 
-    let jszpq = readFileList(`img/对外/教师照片/`, [], "png");
+    let jszpq = readFileList(`img/对外/教师照片/`, [], "png");   
     ret["jszpq"] = {title:"教师照片墙", dataList:jszpq};
     
 

src/config/interficeEnum.ts

@@ -185,6 +185,7 @@ export enum jshxNENUM {
     听评课情况 = "/api/portrait/tpkqk",
     任务听评课情况 = "/api/portrait/rwtpk",
     全员导师制 = "/api/portrait/qydsz",
+    教师考勤统计="/getTeacherClockingState"
 }
 
 

src/routers/router.ts

@@ -53,10 +53,10 @@ export function setRouter(httpServer){
     httpServer.post('/dw/spfxtc', asyncHandler(spfxtcBiz.getData));
 
     //====================对内=======================
-    httpServer.get('/dn/ztbx', asyncHandler(ztbxNBiz.getData));
+    httpServer.get('/dn/ztbx', asyncHandler(ztbxNBiz.getData));//整体办学
     httpServer.get('/dn/getclass', asyncHandler(ztbxNBiz.getClass));
     httpServer.get('/dn/getkcap', asyncHandler(ztbxNBiz.getKcap));
-    httpServer.get('/dn/jshx', asyncHandler(jshxNBiz.getData));
+    httpServer.get('/dn/jshx', asyncHandler(jshxNBiz.getData));//教师画像
     httpServer.get('/dn/jshx/kyqk', asyncHandler(jshxNBiz.getKyqk));
     httpServer.get('/dn/njzjshx', asyncHandler(njzjshxNBiz.getData));
     httpServer.get('/dn/jsgrfz', asyncHandler(jsgrfzNBiz.getData));