admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,036 Commits 40 Branches 0 Tags
Commit Graph

2036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luck-Xiaomi
c024005c88 Merge branch 'dev-xiaole' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi 2022-06-15 17:10:34 +08:00
Luck-Xiaomi
7afa2b8554 . 2022-06-15 17:05:27 +08:00
杜海鹏
aad9d3f0ce Merge branch 'dev-xiaole' into 'master' 
Dev xiaole

See merge request !9
 2022-06-15 16:42:00 +08:00
骆乐
bbbca84b57 更改了全局样式 2022-06-15 16:40:46 +08:00
Luck-Xiaomi
14f1af9d6c Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi 2022-06-15 16:38:06 +08:00
Luck-Xiaomi
eb0ef35d0b Merge remote-tracking branch 'origin/dev-xiaole' into dev-xiaomi 2022-06-15 16:12:14 +08:00
杜海鹏
eb5593565f Merge branch 'dev-xiaomi' into 'master' 
Dev xiaomi

See merge request !8
 2022-06-15 16:08:25 +08:00
Luck-Xiaomi
a549a15d9a Merge branch 'master' into dev-xiaomi 2022-06-15 15:59:39 +08:00
Luck-Xiaomi
39bcd9ccc6 . 2022-06-15 15:56:28 +08:00
骆乐
81fe7735f6 Merge branch 'master' into dev-xiaole 2022-06-15 15:51:26 +08:00
骆乐
9c69803e87 登录页更改 2022-06-15 15:49:13 +08:00
杜海鹏
1d6bf0050a Merge branch 'dev-gmj' into 'master' 
Dev gmj

See merge request !6
 2022-06-15 15:48:23 +08:00
jxjgmj
da2edfc6f2 双碳管理及合约管理 2022-06-15 15:42:53 +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
jxjgmj
a7d141b2f7 拉取最新 2022-06-15 14:26:39 +08:00
jxjgmj
c0f7b6aee4 安全问题，质量问题 2022-06-15 14:18:32 +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