Commit Graph

Select branches

Hide Pull Requests

dev

master

Mono Color

• ecbd690117 Merge branch 'test' into dev zk 2023-12-28 17:19:53 +08:00
• 88c9ac1576 update zk 2023-12-28 17:16:08 +08:00
• 861d9e4798 update 1.睡眠图标缺失字段 weixin 2023-12-28 17:13:29 +08:00
• 1d28db6839 Merge branch 'dev' into test zk 2023-12-27 18:34:47 +08:00
• f93e2dccae update zk 2023-12-27 18:34:06 +08:00
• 6352e5dd21 Merge branch 'dev' into test zk 2023-12-27 18:05:16 +08:00
• 36f484d028 update zk 2023-12-27 18:00:39 +08:00
• 63eb01d641 update 1.用户数据左侧没有工号 2.样式问题 weixin 2023-12-27 17:55:35 +08:00
• a0ffce1fa7 update 1.睡眠模块：深睡、浅水颠倒问题 weixin 2023-12-27 16:05:46 +08:00
• 626fbf9085 update 1.压力模块接口调用错误 weixin 2023-12-27 14:44:13 +08:00
• c1474f0c64 update 1.体温模块字段变更 weixin 2023-12-27 10:59:49 +08:00
• dfcf737258 update zk 2023-12-27 09:14:48 +08:00
• 98abe8d9ca Merge branch 'dev' into test zk 2023-12-27 09:14:17 +08:00
• 2e106c4731 update zk 2023-12-27 09:13:09 +08:00
• dd89375d40 update zk 2023-12-26 17:39:59 +08:00
• 541fbb4b0a update zk 2023-12-22 17:42:54 +08:00
• 22a4132300 update zk 2023-12-22 17:15:26 +08:00
• b9f2b3b521 update zk 2023-12-22 16:57:16 +08:00
• dd5a47e7fb update zk 2023-12-21 16:42:22 +08:00
• 5a33aa1df4 update zk 2023-12-21 14:07:18 +08:00
• 568c0132e7 update zk 2023-12-21 09:04:17 +08:00
• 9230f659c1 update zk 2023-12-21 09:02:45 +08:00
• 1c65f18bab update 1.修改样式 weixin 2023-12-20 10:36:22 +08:00
• 3cc95902ae update zk 2023-12-20 10:25:06 +08:00
• ce85f39c11 update zk 2023-12-20 09:08:13 +08:00
• 26f4a6ad81 update zk 2023-12-20 09:05:44 +08:00
• 8dccce0208 update zk 2023-12-19 18:10:46 +08:00
• 3e53c75a6f update zk 2023-12-19 14:41:00 +08:00
• e732938a34 update zk 2023-12-19 14:26:27 +08:00
• cf29ea07c1 update zk 2023-12-19 12:49:00 +08:00
• 5342774ca5 update zk 2023-12-19 12:41:15 +08:00
• 9b5be1af25 update zk 2023-12-19 10:46:50 +08:00
• 8cb7d4baf8 update zk 2023-12-19 09:09:11 +08:00
• 12ae90f274 add svg zk 2023-12-19 09:04:24 +08:00
• 2501a5e6be 构建去掉ts类型检测 SkyJourney 2023-12-19 05:58:37 +08:00
• 6c2510147f 更新自动化脚本 SkyJourney 2023-12-19 05:51:36 +08:00
• 6c5e3e8f06 添加开发环境和测试环境自动化配置，修正eslint配置和依赖 SkyJourney 2023-12-19 05:37:04 +08:00
• 580a4fc5c6 update master zk 2023-12-18 18:34:19 +08:00
• 2cc8886c2d update zk 2023-12-15 18:33:04 +08:00
• d614f10bb5 update zk 2023-12-14 09:23:58 +08:00
• 825d10fc35 update zk 2023-12-12 14:24:48 +08:00
• c5e1dd5d19 update zhaotiantian 2023-12-12 09:43:01 +08:00
• 8b2c82dc6b update zk 2023-12-11 18:37:58 +08:00
• 35f21a4342 update zk 2023-12-11 18:29:35 +08:00
• e449d5687b 组件调整 zhaotiantian 2023-12-11 18:28:52 +08:00
• d4f668548c 预警表格样式修改 zhaotiantian 2023-12-11 14:18:29 +08:00
• d20335eb4c Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-12-11 13:27:32 +08:00
• 66175f4b4b 表格样式 zhaotiantian 2023-12-11 13:27:27 +08:00
• c9663bb3ba update zk 2023-12-11 13:25:13 +08:00
• bc15167485 update zk 2023-12-11 10:19:17 +08:00
• e576d20c00 update zk 2023-12-11 10:06:57 +08:00
• 4a616ed1c8 update zk 2023-12-11 09:57:38 +08:00
• bad6f793de Merge remote-tracking branch 'origin/master' zhaotiantian 2023-12-08 18:35:12 +08:00
• 1e68c7a15a 解决冲突 zhaotiantian 2023-12-08 18:28:19 +08:00
• fc0a4ae9d0 update zk 2023-12-08 18:25:59 +08:00
• 7bcc265bd7 副屏 zhaotiantian 2023-12-08 18:23:08 +08:00
• b7e84b89a9 update 对接底部数据，添加地图公共less zk 2023-12-08 18:16:52 +08:00
• 190d69573f update 添加websocket功能推送员工报警信息 zk 2023-12-08 14:20:35 +08:00
• 622181ac96 update 添加图标 完善地图功能 zk 2023-12-07 18:44:15 +08:00
• 123b681dc3 update 地图绘制 zk 2023-12-06 19:44:44 +08:00
• 3b9b1d67fc update 1.修改大屏副屏结构 weixin 2023-12-06 17:14:18 +08:00
• 89107d019d add 直升机图片 zk 2023-12-06 16:28:08 +08:00
• 80baa0c7c6 update 看板接口对接 增加路由依赖 zk 2023-12-06 16:19:47 +08:00
• 458009709e update 更换背景图 看板接口对接 zk 2023-12-05 18:33:24 +08:00
• df5d0ec8e4 update zk 2023-12-04 16:11:17 +08:00
• deefed16b9 Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-12-04 13:59:23 +08:00
• a5d6f4d573 服务详情数据 zhaotiantian 2023-12-04 13:59:16 +08:00
• 59a8f83a91 增加配置文件，修改request请求 zk 2023-12-04 13:22:58 +08:00
• fc4153534c 文件 zhaotiantian 2023-12-04 09:17:15 +08:00
• 8f37ef9b78 Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-12-01 18:21:46 +08:00
• 2319af2203 接口 zhaotiantian 2023-12-01 18:21:40 +08:00
• e3be6460d9 update zk 2023-12-01 17:39:44 +08:00
• 9ab26f4915 Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-11-28 16:59:15 +08:00
• e3feba62a8 主诉分类 zhaotiantian 2023-11-28 16:59:09 +08:00
• 95e675a019 update zk 2023-11-28 15:11:30 +08:00
• 86ab4a706c Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-11-28 10:35:47 +08:00
• 89f69da977 表格滚动样式 zhaotiantian 2023-11-28 10:35:39 +08:00
• 9530c298fe update zk 2023-11-28 10:34:24 +08:00
• 75d2f7e296 解决冲突 zhaotiantian 2023-11-27 18:16:54 +08:00
• 773f9067f3 终端弹窗 zhaotiantian 2023-11-27 18:10:59 +08:00
• 975d0e71a2 update 地图 zk 2023-11-27 18:09:59 +08:00
• c28a49e45c update zk 2023-11-27 14:34:08 +08:00
• 462dd54ce1 update：1.自定义事件 zk 2023-11-27 14:17:57 +08:00
• 6a2d442c79 update：更新格式化配置 zk 2023-11-27 10:38:51 +08:00
• 29cd60a2f2 update zk 2023-11-27 09:47:45 +08:00
• 35b6d2f9d2 update zk 2023-11-27 09:39:06 +08:00
• 0b0039dc4a Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-11-24 18:23:31 +08:00
• db8f639ca1 弹窗 zhaotiantian 2023-11-24 18:23:26 +08:00
• 075ede2b9c update zk 2023-11-24 18:18:10 +08:00
• 07f940a56f update zk 2023-11-24 18:16:33 +08:00
• ad00a9b844 Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-11-24 16:11:46 +08:00
• 143f272da8 弹窗 zhaotiantian 2023-11-24 16:11:39 +08:00
• e49a242dc1 update 1.修改公共头部 weixin 2023-11-24 16:10:50 +08:00
• ee46164e93 Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen zhaotiantian 2023-11-24 14:59:06 +08:00
• a3c85846fc 终端报警 zhaotiantian 2023-11-24 14:58:59 +08:00
• 752b2c7fb8 update zk 2023-11-24 14:56:55 +08:00
• dee509dcba init 1.修改项目基础结构 weixin 2023-11-24 14:43:00 +08:00
• 7299e96d20 add zk 2023-11-24 13:53:11 +08:00
• 2648d8f694 update zk 2023-11-24 13:39:31 +08:00
• d34bc593a2 update zk 2023-11-24 13:37:22 +08:00