110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zk	ecbd690117	Merge branch 'test' into dev ... # Conflicts: # src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue	2023-12-28 17:19:53 +08:00
zk	88c9ac1576	update	2023-12-28 17:16:08 +08:00
weixin	861d9e4798	update ... 1.睡眠图标缺失字段	2023-12-28 17:13:53 +08:00
zk	1d28db6839	Merge branch 'dev' into test	2023-12-27 18:34:47 +08:00
zk	f93e2dccae	update	2023-12-27 18:34:06 +08:00
zk	6352e5dd21	Merge branch 'dev' into test	2023-12-27 18:05:16 +08:00
zk	36f484d028	update	2023-12-27 18:00:39 +08:00
weixin	63eb01d641	update ... 1.用户数据左侧没有工号 2.样式问题	2023-12-27 17:55:35 +08:00
weixin	a0ffce1fa7	update ... 1.睡眠模块：深睡、浅水颠倒问题	2023-12-27 16:05:46 +08:00
weixin	626fbf9085	update ... 1.压力模块接口调用错误	2023-12-27 14:44:13 +08:00
weixin	c1474f0c64	update ... 1.体温模块字段变更	2023-12-27 10:59:49 +08:00
zk	dfcf737258	update	2023-12-27 09:14:48 +08:00
zk	98abe8d9ca	Merge branch 'dev' into test	2023-12-27 09:14:17 +08:00
zk	2e106c4731	update	2023-12-27 09:13:09 +08:00
zk	dd89375d40	update	2023-12-26 17:39:59 +08:00
zk	541fbb4b0a	update	2023-12-22 17:42:54 +08:00
zk	22a4132300	update	2023-12-22 17:15:26 +08:00
zk	b9f2b3b521	update	2023-12-22 16:57:16 +08:00
zk	dd5a47e7fb	update	2023-12-21 16:42:22 +08:00
zk	5a33aa1df4	update	2023-12-21 14:07:18 +08:00
zk	568c0132e7	update	2023-12-21 09:04:17 +08:00
zk	9230f659c1	update	2023-12-21 09:02:45 +08:00
weixin	1c65f18bab	update ... 1.修改样式	2023-12-20 10:36:22 +08:00
zk	3cc95902ae	update	2023-12-20 10:25:06 +08:00
zk	ce85f39c11	update	2023-12-20 09:08:13 +08:00
zk	26f4a6ad81	update	2023-12-20 09:05:44 +08:00
zk	8dccce0208	update	2023-12-19 18:10:46 +08:00
zk	3e53c75a6f	update	2023-12-19 14:41:00 +08:00
zk	e732938a34	update	2023-12-19 14:26:27 +08:00
zk	cf29ea07c1	update	2023-12-19 12:49:00 +08:00
zk	5342774ca5	update	2023-12-19 12:41:15 +08:00
zk	9b5be1af25	update	2023-12-19 10:46:50 +08:00
zk	8cb7d4baf8	update	2023-12-19 09:09:11 +08:00
zk	12ae90f274	add svg	2023-12-19 09:04:24 +08:00
SkyJourney	2501a5e6be	构建去掉ts类型检测	2023-12-19 05:58:37 +08:00
SkyJourney	6c2510147f	更新自动化脚本	2023-12-19 05:51:36 +08:00
SkyJourney	6c5e3e8f06	添加开发环境和测试环境自动化配置，修正eslint配置和依赖	2023-12-19 05:37:04 +08:00
zk	580a4fc5c6	update	2023-12-18 18:34:19 +08:00
zk	2cc8886c2d	update	2023-12-15 18:33:04 +08:00
zk	d614f10bb5	update	2023-12-14 09:23:58 +08:00
zk	825d10fc35	update	2023-12-12 14:24:48 +08:00
zhaotiantian	c5e1dd5d19	update	2023-12-12 09:43:01 +08:00
zk	8b2c82dc6b	update	2023-12-11 18:37:58 +08:00
zk	35f21a4342	update	2023-12-11 18:34:15 +08:00
zhaotiantian	e449d5687b	组件调整	2023-12-11 18:28:52 +08:00
zhaotiantian	d4f668548c	预警表格样式修改	2023-12-11 14:18:29 +08:00
zhaotiantian	d20335eb4c	Merge branch 'master' of https://gitee.com/ant-bear/cqyt-emergency-screen	2023-12-11 13:27:32 +08:00
zhaotiantian	66175f4b4b	表格样式	2023-12-11 13:27:27 +08:00
zk	c9663bb3ba	update	2023-12-11 13:25:13 +08:00
zk	bc15167485	update	2023-12-11 10:19:17 +08:00