yanym 5 anos atrás
pai
commit
9032693e6d

+ 34 - 7
dorm-manager-wx/pages/teacher/statistics/statistics.js

@@ -156,15 +156,35 @@ Page({
         fontSize: 18
       },
       series: [{
-        name: '归勤',
-        data: that.data.totalInfo.attendance * 100,
+        name: '无进出记录人员',
+        data: that.data.totalInfo.unAccessCount / that.data.totalInfo.total,
         stroke: false,
-        color: '#6282f4'
+        color: '#ed5c68'
       }, {
-        name: '缺勤',
-        data: 100 - that.data.totalInfo.attendance * 100,
+        name: '已出宿舍人员',
+        data: that.data.totalInfo.out / that.data.totalInfo.total,
         stroke: false,
-        color: '#ed5c68'
+        color: '#f5a786'
+      }, {
+        name: '已归宿舍人员',
+        data: that.data.totalInfo.in / that.data.totalInfo.total,
+        stroke: false,
+        color: '#7792f5'
+      }, {
+        name: '晚归宿舍人员',
+        data: that.data.totalInfo.laterIn / that.data.totalInfo.total,
+        stroke: false,
+        color: '#79bef4'
+      }, {
+        name: '未归宿舍人员',
+        data: that.data.totalInfo.unIn / that.data.totalInfo.total,
+        stroke: false,
+        color: '#5be0c1'
+      }, {
+        name: '未出宿舍人员',
+        data: that.data.totalInfo.unOut / that.data.totalInfo.total,
+        stroke: false,
+        color: '#ac91f7'
       }],
       disablePieStroke: true,
       width: 160,
@@ -208,11 +228,18 @@ Page({
 
   getUnInInfo: function(e) {
     const that = this;
+    let deptId;
+    if (that.data.listDept != '') {
+      deptId = that.data.listDept[that.data.value[1]].deptId
+    } else {
+      deptId = that.data.listCollege[that.data.value[0]].deptId
+    }
     util.httpRequest(api.getUnInInfo, {
       start: that.data.startDate,
       end: that.data.endDate,
       page: 1,
-      rows: 20
+      rows: 20,
+      deptId: deptId
     }, 'post').then(res => {
       that.setData({
         list: res.data.data.data

+ 1 - 1
dorm-manager-wx/utils/api.js

@@ -107,7 +107,7 @@ const index = 2,
     getVisitorCheck: '/visitor/approvalAlumniVisitor.if', //访客信息审批
     getunInByCount: '/access/unInByCount.if', //按天查询未归记录
     getOutAndInInfo: '/access/InAndOut.if', //已出已归记录
-    getUnInInfo: '/access/unIn.if', //未归记录
+    getUnInInfo: '/access/outUnIn.if', //未归记录
     getLateIn: '/access/lateIn.if', //晚归记录
     getInUnOunt: '/access/InUnOunt.if', //未出记录
     getUnOut: '/access/unOut.if', //查询没有进出记录的人员情况