Commit Graph

128 Commits (2da5e720d33514d8289a618e368810f8c2f72fd4)

Author SHA1 Message Date
LiuJiaNan 7724a93c30 init 2024-01-26 16:16:02 +08:00
dearlin 04f28b4acc ai视频报警 2024-01-26 15:52:00 +08:00
LiuJiaNan 41f08a759e init 2024-01-26 10:24:28 +08:00
chenxinying bd76ab2a39 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/asyncRouter.js
2024-01-26 08:59:59 +08:00
zhangqihang ca7eadbb19 重点工程(不包括AI报警和视频监控) 2024-01-25 18:05:58 +08:00
LiuJiaNan 3c06405a40 init 2024-01-25 18:00:08 +08:00
chenxinying 486fea5b03 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/assets/js/asyncRouter.js
2024-01-25 17:54:39 +08:00
dearlin 659469ec58 清单检查要有电子围栏禁止排查 2024-01-25 17:35:13 +08:00
dearlin f7859bdb34 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:22:20 +08:00
dearlin 53b63fabc1 人员与辨别部位对接第三方 2024-01-25 14:22:04 +08:00
鲁洪霞 b8006fa5ec 样式修改 2024-01-25 11:35:41 +08:00
鲁洪霞 919644d1dd 样式修改 2024-01-25 11:23:48 +08:00
鲁洪霞 added38399 BI页面 2024-01-25 10:28:53 +08:00
LiuJiaNan 70f10de762 init 2024-01-24 18:08:04 +08:00
LiuJiaNan 0a76bcbdf0 init 2024-01-22 17:15:27 +08:00
LiuJiaNan 1812d05ec3 init 2024-01-22 16:18:39 +08:00
z 6db2c2cb03 init 2024-01-22 15:55:37 +08:00
z ec267cc310 init 2024-01-20 17:18:25 +08:00
z 9b837c85c9 init 2024-01-20 14:13:41 +08:00
z 41a4ee6edd init 2024-01-20 09:19:27 +08:00
z 7166ee57d8 init 2024-01-20 08:48:10 +08:00
z 4bd0189616 init 2024-01-19 17:41:26 +08:00
z daa59776e3 init 2024-01-19 08:21:45 +08:00
z e181a0ef35 init 2024-01-17 17:56:46 +08:00
z 7ed384d478 init 2024-01-17 10:48:18 +08:00
chenxinying 63be3b2f81 Merge remote-tracking branch 'origin/dev' into dev 2024-01-17 10:23:18 +08:00
z 9bd8936773 init 2024-01-16 18:03:59 +08:00
chenxinying fcb5dd3908 视频监控列表 2024-01-16 15:15:52 +08:00
z 4f53bd7e81 init 2024-01-15 18:00:19 +08:00
chenxinying ae9707dc6c Merge remote-tracking branch 'origin/dev' into dev 2024-01-15 17:20:29 +08:00
z 6184e2c723 init 2024-01-15 15:11:17 +08:00
z fee5d6f786 init 2024-01-15 13:51:54 +08:00
chenxinying b3055a31fd 八项作业添加监控播放 2024-01-15 10:09:11 +08:00
z fef033926e init 2024-01-13 17:35:14 +08:00
z a46297da57 init 2024-01-13 13:46:40 +08:00
z 6216d08511 init 2024-01-13 09:50:30 +08:00
z 2fe776a3f6 init 2024-01-12 18:21:07 +08:00
chenxinying f9b2c57e26 八项作业添加监控 2024-01-12 14:38:08 +08:00
chenxinying 8dd359b08f Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 09:56:35 +08:00
z b30aaf9f34 init 2024-01-12 09:51:58 +08:00
z f12ae4a5bc init 2024-01-11 18:01:45 +08:00
chenxinying bc637b6fce 八项作业添加监控 2024-01-11 17:15:52 +08:00
duhang 461d5e31e7 在线学习与考试-课件管理-视频/资料课件维护-新增/修改未做 2024-01-11 14:57:20 +08:00
z 20a8d64ea1 init 2024-01-11 14:40:34 +08:00
duhang 5db9c3f30a Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-10 19:17:17 +08:00
duhang 405c6c296d 🎨 教育培训-统一调整已完成功能的样式(含打印) 2024-01-10 19:17:03 +08:00
z 82f63b7698 init 2024-01-10 18:01:56 +08:00
z f74c51cbb7 init 2024-01-10 13:52:16 +08:00
duhang 6124a37116 🔥 移除无用todo 2024-01-10 11:18:04 +08:00
duhang 3ef14d2406 🐜 教育培训-平台资源库-课程管理-课件预览 2024-01-10 10:58:32 +08:00
duhang 24387955fe 视频课件 2024-01-10 10:42:12 +08:00
duhang 43298dfa07 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-10 10:05:36 +08:00
z 8ca5d0b105 init 2024-01-10 10:04:26 +08:00
z bab6fe50b8 init 2024-01-10 10:03:17 +08:00
duhang dccf6f8d49 🐜 教育培训-平台资源库-试卷管理-调整题目 2024-01-10 09:12:29 +08:00
duhang eb5cd17c49 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-09 19:51:34 +08:00
duhang d200851bc9 教育培训-档案管理 2024-01-09 19:51:01 +08:00
z 0bba51d4d9 init 2024-01-09 18:02:04 +08:00
z f8b71eccbf init 2024-01-09 16:20:28 +08:00
duhang faeb08ff24 教育培训-档案管理-一期一档/一企一档-剩余档案编辑 2024-01-08 20:21:32 +08:00
duhang 382f6fa062 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-08 18:27:07 +08:00
duhang c9b83bc968 平台资源库-试卷管理、档案管理-一人一档 2024-01-08 18:26:39 +08:00
z 0525bed574 init 2024-01-08 18:04:31 +08:00
z 88bcda5eea init 2024-01-08 17:48:35 +08:00
z fb75396024 init 2024-01-08 17:47:50 +08:00
z 079e4c17b9 init 2024-01-08 14:31:18 +08:00
z 3ad49a0620 init 2024-01-06 17:44:23 +08:00
duhang b9f0889fed 🐛 课件资源管理路由 2024-01-05 18:35:33 +08:00
duhang f9aa36fc15 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb_vue into dev 2024-01-05 18:23:29 +08:00
duhang b2d75a5b86 教育培训-平台资源库-课件资源管理(视频、资料)、课程管理 2024-01-05 18:23:04 +08:00
z b5861440f2 init 2024-01-05 18:02:22 +08:00
z 1fc7e96f0d init 2024-01-05 17:33:18 +08:00
z 29b4c7d2ba init 2024-01-05 15:49:15 +08:00
z bff8547433 init 2024-01-05 14:42:51 +08:00
z 474c5ee580 init 2024-01-05 14:32:49 +08:00
liujianan 0180e34d6e init 2024-01-04 09:26:49 +08:00
liujianan 38e615ca83 init 2024-01-04 09:23:56 +08:00
liujianan 0cdce1c49f init 2024-01-04 09:02:38 +08:00