22 Commits

Author SHA1 Message Date
Luck-Xiaomi
39bcd9ccc6 . 2022-06-15 15:56:28 +08:00
Luck-Xiaomi
385cbf00b7 Merge branch 'master' into dev-xiaomi 2022-06-15 14:42:10 +08:00
Luck-Xiaomi
86ef8538a4 修改智慧建造部分样式 2022-06-15 14:40:05 +08:00
c828a8084f Merge branch 'dev-xiaole' into 'master'
添加cim双碳管理页面

See merge request !5
2022-06-15 14:02:35 +08:00
骆乐
3e21de25be 添加cim双碳管理页面 2022-06-15 13:59:02 +08:00
817fdfb6c7 Merge branch 'dev-xiaole' into 'master'
Dev xiaole

See merge request !4
2022-06-15 09:47:34 +08:00
骆乐
5b6b2cfe3c 更改了新的大屏路由 2022-06-15 09:41:40 +08:00
b34920a13b Merge branch 'dev-xiaole' into 'master'
Dev xiaole

See merge request !3
2022-06-15 09:07:58 +08:00
骆乐
03e73bb2b8 修复bug 2022-06-15 08:56:20 +08:00
骆乐
0905d004bb Merge branch 'master' into dev-xiaole 2022-06-09 19:42:40 +08:00
骆乐
ea6685dc38 Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun 2022-06-09 19:41:44 +08:00
骆乐
f152173165 优化 2022-06-09 19:40:49 +08:00
5f32332fc5 Merge branch 'dev-xiaomi' into 'master'
完善星璇 通过设备编号自动登录的功能

See merge request !2
2022-06-09 18:18:51 +08:00
Luck-Xiaomi
ec21d656ad 完善星璇 通过设备编号自动登录的功能 2022-06-09 18:11:53 +08:00
骆乐
525483bb98 Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun 2022-06-09 16:46:48 +08:00
骆乐
27a95d62a5 添加误操作代码 2022-06-09 16:46:05 +08:00
55aeb9c886 Merge branch 'duhaipeng' into 'master'
Duhaipeng

See merge request !1
2022-06-09 16:36:42 +08:00
776f3d0409 修改人员部分BUG 2022-06-09 14:01:13 +08:00
fa3b9b9e32 列表完成 2022-06-09 13:20:13 +08:00
242a897d22 添加人员培训列表页面 2022-06-09 12:55:22 +08:00
63431c0a8e Initial commit 2022-06-08 14:51:11 +08:00
MAC
a436327a32 init 2020-08-07 15:12:19 +08:00