Commit Graph

  • *
  • *
  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • |/ /
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • |/ /
  • | *
  • * |
  • | *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • | |\ \
  • | * | |
  • | | * |
  • | | * |
  • | | * |
  • | | |\ \
  • | |_|/ /
  • |/| | |
  • | | * |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • * | | |
  • | * | |
  • | * | |
  • | |\| |
  • | * | |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | * | |
  • | |\| |
  • | * | |
  • | | * |
  • | | * |
  • | |/ /
  • |/| |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | |\| |
  • | * | |
  • |/ / /
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • * | |
  • |\| |
  • * | |
  • | * |
  • | * |
  • | * |
  • | |\ \
  • | * | |
  • | | * |
  • | |/ /
  • |/| |
  • * | |
  • |/ /
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\ \ \
  • * | | |
  • * | | |
  • | * | |
  • | |\ \ \
  • | |/ / /
  • |/| | |
  • | * | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • * | | |
  • | * | |
  • |/ / /
  • * / /
  • |/ /
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | * | |
  • |/ / /
  • * / /
  • |/ /
  • * |
  • |\ \
  • | * |
  • | * |
  • | |\ \
  • | * | |
  • * | | |
  • | |/ /
  • |/| |
  • 4c60fa7f4 移动端替换关于“力软” 的信息 by zhichao lei 2020-09-15 11:55:42 +0800
  • e41107397 水晶报表测试 by liangkun 2020-09-15 09:56:46 +0800
  • 053ed2af7 机器码生成方式修改 by zhichao lei 2020-09-14 14:05:09 +0800
  • 5c7c4af9f Merge branch 'master' into 大厂分支 by zhichao lei 2020-09-14 11:07:46 +0800
  • 788fe948c 考勤时间查询修改 by zhichao lei 2020-09-14 11:03:08 +0800
  • 830610b32 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-11 17:25:34 +0800
  • b4ca58061 功能授权:取消表单权限的授权;学籍实体:增加异动状态字段; by dyy 2020-09-11 17:25:25 +0800
  • 748b8d3f4 考勤表单样式调整 by liangkun 2020-09-11 11:22:34 +0800
  • 924f3729a 微调考勤规则显示 by liangkun 2020-09-11 11:09:51 +0800
  • 4990d42a2 F_RealName by liangkun 2020-09-11 10:05:19 +0800
  • 73f3d57fb Merge branch 'master' into 大厂分支 by liangkun 2020-09-11 09:26:35 +0800
  • cc4f6eed4 考勤记录增加查询条件 by liangkun 2020-09-11 09:25:05 +0800
  • 6f299d673 删除console.log by zhichao lei 2020-09-10 16:12:08 +0800
  • f16671a40 Merge branch 'master' into 大厂分支 by liangkun 2020-09-10 15:14:49 +0800
  • 03aad919e pdm 更新 by zhichao lei 2020-09-10 14:13:46 +0800
  • b65782b66 签到规则完善 by zhichao lei 2020-09-10 12:54:19 +0800
  • 739c49354 考勤规则增加中午打卡 by zhichao lei 2020-09-10 12:01:57 +0800
  • 84a780542 Merge branch 'master' into 大厂分支 by liangkun 2020-09-10 10:22:15 +0800
  • 1c2348ce8 补卡申请 by zhichao lei 2020-09-09 18:30:40 +0800
  • 98fc0bf45 更改文档位置 by liangkun 2020-09-09 17:15:40 +0800
  • caf7ccf9e 部署手册 by liangkun 2020-09-09 17:12:33 +0800
  • a5107e334 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-09 17:01:37 +0800
  • 1e538099c 添加了几个必要的引用 by liangkun 2020-09-09 17:01:29 +0800
  • eb18d6a14 补卡申请 by zhichao lei 2020-09-09 16:24:35 +0800
  • 18bcbea6d 天气预报微调 by liangkun 2020-09-09 16:19:42 +0800
  • aa5519daa 部署文档 by liangkun 2020-09-09 16:03:21 +0800
  • aa086b291 大厂首页天气预报修改 by liangkun 2020-09-09 16:00:27 +0800
  • 52987b9d1 Merge branch 'master' into 大厂分支 by liangkun 2020-09-09 15:49:42 +0800
  • 0b7dbcc63 表单验证 by zhichao lei 2020-09-09 15:47:53 +0800
  • a03c23c21 大厂合并 by liangkun 2020-09-09 15:46:35 +0800
  • a8e451b58 考勤记录列表微调 by liangkun 2020-09-09 15:39:10 +0800
  • e9062ddb9 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-09 12:23:31 +0800
  • 4c26e38c5 调整报表设计预览 by dyy 2020-09-09 12:23:16 +0800
  • 2d5cebcf3 考勤限制增加启用功能 by zhichao lei 2020-09-09 11:30:50 +0800
  • 182885081 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-09 11:04:12 +0800
  • 96bf147df 考勤排序 by zhichao lei 2020-09-09 11:04:08 +0800
  • 44c9f657d 去除不必要的引用 by liangkun 2020-09-09 09:59:06 +0800
  • cff82eeb4 website by liangkun 2020-09-09 09:17:43 +0800
  • b59d5e5df Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-08 17:48:11 +0800
  • 87cd3b69d 修改服务增加自动运行连接考勤机 by liangkun 2020-09-08 17:48:03 +0800
  • ea1d4342b Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-08 17:30:01 +0800
  • 766463cf3 选修课课程列表按学年、学期、课程名称排序;查看已审学生页面增加“批量拒绝”按钮; by dyy 2020-09-08 17:29:50 +0800
  • 0bfa31e4a 修改服务config by liangkun 2020-09-08 14:43:58 +0800
  • a87569225 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-08 12:16:32 +0800
  • 3a8511ce5 考勤功能移到digitalschoolapi项目 by liangkun 2020-09-08 12:16:23 +0800
  • 09e054400 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-07 18:25:52 +0800
  • eff549936 打卡状态优化显示 by zhichao lei 2020-09-07 18:25:40 +0800
  • ef09e9c20 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-07 18:24:16 +0800
  • 1bb4e3f10 海康签到服务调试 by liangkun 2020-09-07 18:24:08 +0800
  • 917a0df5c Revert "1" by zhichao lei 2020-09-07 18:12:46 +0800
  • 5ea3604d6 1 by zhichao lei 2020-09-07 17:55:10 +0800
  • 1d78fef70 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-07 16:39:23 +0800
  • d7ded5416 界面风格:聊天窗体脚本、样式的调整 by dyy 2020-09-07 16:38:36 +0800
  • 5454a7f73 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-07 14:25:04 +0800
  • e3acc36eb 数据源 departmentid 改为 id 考勤记录 根据no 查询 name 和 department by zhichao lei 2020-09-07 14:24:54 +0800
  • aee10a36d Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-07 12:14:58 +0800
  • c650af61d 服务修改 by liangkun 2020-09-07 12:14:47 +0800
  • a0689e242 金隅招生 录入增加年级字段 by leizhichao 2020-09-05 17:38:42 +0800
  • 286fc6de5 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-04 18:25:56 +0800
  • 397a86ba8 金隅搜索条件 by zhichao lei 2020-09-04 18:25:35 +0800
  • c21960936 考勤对接优化 by liangkun 2020-09-04 18:25:18 +0800
  • ce574131a 考勤机dll by liangkun 2020-09-04 17:25:10 +0800
  • 33b1b39ce Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-04 17:18:12 +0800
  • 4ef62c343 考勤机对接功能 by liangkun 2020-09-04 17:18:01 +0800
  • 91077d1da 增加多语言管理;调整界面风格的样式; by dyy 2020-09-04 16:37:43 +0800
  • 81931e932 金隅 招生类别改为录取方式 by zhichao lei 2020-09-03 18:22:49 +0800
  • eee266f12 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-03 18:14:34 +0800
  • 91d926716 金隅登陆页面提示信息 by zhichao lei 2020-09-03 18:14:31 +0800
  • 44de0e828 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-03 18:09:07 +0800
  • b39a8181e 增加文件上传管理功能(带流程审核、带权限) by dyy 2020-09-03 18:08:56 +0800
  • 0e077ed19 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-03 15:32:13 +0800
  • 7ed4ebf0c 考勤限制 by zhichao lei 2020-09-03 15:32:10 +0800
  • c210a1499 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-09-03 15:04:58 +0800
  • aa0b21bf3 增加甘特图、信息可视化、电子签章; by dyy 2020-09-03 15:04:17 +0800
  • 5573bdc3a Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-03 14:20:05 +0800
  • 06b6b7c09 1 by zhichao lei 2020-09-03 14:16:01 +0800
  • ae3de77e8 金隅招生限制修改 by zhichao lei 2020-09-03 14:13:10 +0800
  • 7e189117c Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-03 14:12:39 +0800
  • 2938b4036 增加考勤设备,考勤设备日志 by liangkun 2020-09-03 14:11:10 +0800
  • 211bf7f46 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-03 12:03:50 +0800
  • 8d835f73d 金隅修改 by zhichao lei 2020-09-03 12:03:47 +0800
  • fc8ba0df7 调整横纵向滚动条的宽度; by dyy 2020-09-02 18:11:11 +0800
  • 1067b52e1 增加门户网站 by dyy 2020-09-02 16:23:14 +0800
  • 00efd402a webconfig修改dll更新 by liangkun 2020-09-02 15:30:19 +0800
  • 22ec65f4e Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-02 10:48:02 +0800
  • 0f8f4105f 删除不必要的引用 by liangkun 2020-09-02 10:47:57 +0800
  • 71ab6aeef Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-09-02 10:07:51 +0800
  • a1f760843 app 考勤记录使用新版生成代码 by zhichao lei 2020-09-02 10:06:09 +0800
  • cdd998e3e RouteConfig修改到授权版代码 by liangkun 2020-09-02 09:55:20 +0800
  • d91f75499 增加了葡萄城引用 by liangkun 2020-09-02 09:51:53 +0800
  • c0fe43cbf Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-09-01 17:49:18 +0800
  • 5eb0bee37 流程中,获取当前角色名称功能缺失,写入后台数据 by liangkun 2020-09-01 17:48:59 +0800
  • 151311b79 流程设计:列表增加“类型”列,表单增加“模板类型“为自定义流程、系统流程的单选配置; by dyy 2020-09-01 17:29:35 +0800
  • 6c0d472b3 数据看板;门户配置;任务调度; by dyy 2020-09-01 16:25:52 +0800
  • 73d6d31d1 金隅招生只显示20级修改2020为20 by liangkun 2020-09-01 12:31:33 +0800
  • 3b60b8e64 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-08-31 17:01:02 +0800
  • a302665ef 1 by dyy 2020-08-31 16:57:22 +0800
  • 5fe65f8c2 1 by dyy 2020-08-31 16:53:43 +0800
  • 3fa41a9b8 教师职称评定管理:增加资料上传;学籍信息管理:增加简历表打印;上传控件:增加预览; by dyy 2020-08-31 16:48:23 +0800
  • b65e7ef0d 学生报道添加照片对比功能 by zhichao lei 2020-08-31 16:17:29 +0800