Commit Graph

  • *
  • *
  • |\
  • * |
  • | *
  • | *
  • | *
  • | |\
  • | * |
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | | *
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\| |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • * | |
  • | |/
  • |/|
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\|
  • | * |
  • |/ /
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • * |
  • |\|
  • * |
  • | *
  • | *
  • | *
  • | |\
  • | * |
  • | | *
  • | |/
  • |/|
  • * |
  • |/
  • *
  • |\
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • |\|
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • |\ \
  • * | |
  • * | |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | * |
  • * | |
  • |\ \ \
  • | | |/
  • | |/|
  • * | |
  • | * |
  • |/ /
  • * /
  • |/
  • *
  • *
  • |\
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • |/ /
  • * /
  • |/
  • *
  • |\
  • | *
  • | *
  • | |\
  • | * |
  • * | |
  • | |/
  • |/|
  • * |
  • |\|
  • * |
  • | *
  • |/
  • *
  • *
  • |\
  • * |
  • | *
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • | * |
  • | * |
  • |/ /
  • * |
  • |\ \
  • * | |
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | | *
  • | | |\
  • | * | \
  • | |\ \ \
  • | |/ / /
  • |/| | |
  • | * | |
  • * | | |
  • |/ / /
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | | *
  • * | |
  • |\ \ \
  • | | | *
  • | | |/|
  • | | |/
  • | |/|
  • * | |
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • |/ / /
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | | *
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • | * |
  • | |\|
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • | | *
  • | |/
  • * |
  • |\ \
  • 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
  • 79926e1c0 1 by zhichao lei 2020-08-31 14:35:56 +0800
  • 69d3b9fdc 新版小程序 挪移 生成小程序代码挪移 by zhichao lei 2020-08-31 14:34:04 +0800
  • c6805c447 选修课选课:不显示与已经报名课程 相同课程名称相同教师的课程; 微信api:缓存登录用户的年级; by dyy 2020-08-29 15:06:11 +0800
  • 8bcadcd39 新版app by zhichao lei 2020-08-28 12:00:36 +0800
  • bf44499e7 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-08-28 11:48:02 +0800
  • 6ae8f7395 教师考勤列表 by zhichao lei 2020-08-28 11:47:59 +0800
  • df72e78f6 选修课课程:增加选课专业列 by dyy 2020-08-27 17:32:11 +0800
  • 3b3b60a8b Merge branch 'master' into 大厂分支 by liangkun 2020-08-26 17:56:48 +0800
  • 96710676d 选修排课数据id去重 by liangkun 2020-08-26 17:55:27 +0800
  • 9b607b60a 选修排课数据去重语句增加 by liangkun 2020-08-26 15:16:33 +0800
  • 9e879759c 选修课选课:专业、年级的限制 by dyy 2020-08-26 10:40:17 +0800
  • c487e43f2 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-08-25 18:21:01 +0800
  • e8314df49 2 by zhichao lei 2020-08-25 17:50:54 +0800
  • 6efc0499c 合并 by liangkun 2020-08-25 18:02:32 +0800
  • 166d0b460 Merge branch '大厂分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 大厂分支 by liangkun 2020-08-25 17:53:39 +0800
  • 75ce3abcc Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-08-25 17:53:08 +0800
  • b5c66aa6a 385 add 1 by liangkun 2020-08-25 17:52:58 +0800
  • 0c4c4affc 1 by zhichao lei 2020-08-25 17:52:05 +0800
  • 070845250 Merge branch 'master' into 大厂分支 by liangkun 2020-08-25 17:51:06 +0800
  • ac2a2262c 2 by zhichao lei 2020-08-25 17:50:54 +0800
  • 8033aa525 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-08-25 17:50:10 +0800
  • 1e777b417 Merge branch 'master' into 大厂分支 by zhichao lei 2020-08-25 17:49:56 +0800
  • 5f35410a0 个人中心基本信息90行注释去掉 by liangkun 2020-08-25 17:49:42 +0800
  • a5f27f22c Merge branch '大厂分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 大厂分支 by zhichao lei 2020-08-25 17:49:26 +0800
  • 1282f69a0 2 by zhichao lei 2020-08-25 17:49:12 +0800
  • d70d72f10 1 by zhichao lei 2020-08-25 17:48:20 +0800
  • 29164162f Merge branch '大厂分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 大厂分支 by liangkun 2020-08-25 17:45:13 +0800
  • 4d8015f8b 大厂个人中心不同 by liangkun 2020-08-25 17:44:49 +0800
  • 3c04422e0 Merge branch 'master' into 大厂分支 by liangkun 2020-08-25 17:28:44 +0800
  • 5a3035236 Merge branch '大厂分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 大厂分支 by zhichao lei 2020-08-25 17:28:07 +0800
  • be224babb Merge branch 'master' into 大厂分支 by zhichao lei 2020-08-25 17:27:11 +0800
  • e9c61544e AdminDefaultForDC.cshtml by liangkun 2020-08-25 17:26:43 +0800
  • c84e00927 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by zhichao lei 2020-08-25 17:23:49 +0800