Commit Graph

918 Commits

Author SHA1 Message Date
‘937886381’
fef8824844 修改bug 2024-04-09 16:05:28 +08:00
84468cc883 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-09 13:06:21 +08:00
ea04d55fc1 驾驶舱 2024-04-09 13:04:40 +08:00
zwq
60f6c3a8fe 更新成本 2024-04-09 11:05:37 +08:00
helloDy
2592551e66 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-04-08 17:03:21 +08:00
helloDy
1fde96e677 工单bug,改动 2024-04-08 17:02:55 +08:00
0b16e1fe0d Merge pull request '驾驶舱修改' (#317) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #317
2024-04-08 16:39:30 +08:00
abcec3bcdc Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-08 16:38:59 +08:00
bdd14eec70 驾驶舱修改 2024-04-08 16:38:12 +08:00
‘937886381’
433618e71d 修改bug 2024-04-08 15:13:52 +08:00
‘937886381’
e7828fd277 修改bug 2024-04-08 14:49:20 +08:00
‘937886381’
6c54c223c5 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-08 13:55:56 +08:00
‘937886381’
b2cc509f8e 权限 2024-04-08 13:55:22 +08:00
cbc7cbc574 1 2024-04-08 12:25:44 +08:00
33ed9f15fa Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-08 10:42:42 +08:00
c85c6e4323 能源 2024-04-08 10:41:43 +08:00
zwq
3d3fa2ccee 成本按钮权限 2024-04-08 09:05:10 +08:00
f960ece594 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-07 16:14:52 +08:00
949675b3a2 1 2024-04-07 16:13:57 +08:00
‘937886381’
ac4cea0c7e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-07 16:07:30 +08:00
‘937886381’
93fea84c79 修改bug 2024-04-07 16:07:04 +08:00
e1773dae03 1 2024-04-07 15:39:26 +08:00
7fe8d7e72c 能源手动抄表 2024-04-07 12:18:52 +08:00
1e4a33a703 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-07 08:40:39 +08:00
‘937886381’
bf231f7157 修改ui 2024-04-03 18:13:31 +08:00
‘937886381’
8a54c046d9 修改ui 2024-04-03 17:20:14 +08:00
3fa702cc12 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:45:18 +08:00
‘937886381’
a6ffba4cf8 修改bug 2024-04-03 16:34:15 +08:00
3de4d5c5f2 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:33:32 +08:00
‘937886381’
073b4b8e20 修改bug 2024-04-03 16:30:09 +08:00
3ec82a6a41 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-03 16:27:32 +08:00
7c83268e0c 能源类型 2024-04-03 16:05:27 +08:00
‘937886381’
481dde003a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-04-03 16:01:37 +08:00
‘937886381’
43e54e8ee7 修改bug 2024-04-03 16:01:11 +08:00
helloDy
4571786780 merge 2024-04-03 11:22:32 +08:00
helloDy
21cef13168 table chart 2024-04-03 11:21:37 +08:00
4d0841bd32 1 2024-04-03 09:01:43 +08:00
dad71db912 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-02 16:55:29 +08:00
94c7f803cc 能源需求修改 2024-04-02 16:54:36 +08:00
‘937886381’
1fd547893f 修改bug 2024-04-02 15:01:56 +08:00
‘937886381’
c01106e389 修改bug 2024-04-02 14:56:02 +08:00
‘937886381’
412ec6ab0c 修改bug 2024-04-02 13:56:23 +08:00
‘937886381’
610090c2a0 修改bug 2024-04-02 09:47:52 +08:00
‘937886381’
b0f44c2332 修改ui 2024-04-01 09:25:54 +08:00
‘937886381’
dfabc9ed23 修改ui 2024-03-29 17:01:51 +08:00
‘937886381’
7944824ffe Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-29 16:59:36 +08:00
‘937886381’
7a14b2846a 修改bug 2024-03-29 16:56:21 +08:00
lb
db7d4745dd Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-29 16:55:52 +08:00
lb
6b99175574 update again 2024-03-29 16:30:37 +08:00
helloDy
34aeb029b5 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-29 14:38:26 +08:00
helloDy
caf614ca35 操作 2024-03-29 14:14:21 +08:00
‘937886381’
c8913f192c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-29 09:51:47 +08:00
‘937886381’
0fa651fccf 修改bug 2024-03-29 09:51:19 +08:00
gtz
33782e189c add_infra_job_log_route 2024-03-28 18:57:44 +08:00
gtz
ee828ec4a7 're_infra' 2024-03-28 18:40:27 +08:00
gtz
e75d2f1810 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-03-28 18:04:33 +08:00
gtz
ff9ee438ae 1 2024-03-28 18:04:26 +08:00
cea7fb622f Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-28 17:10:31 +08:00
6924566ab0 样式 2024-03-28 17:04:38 +08:00
‘937886381’
0d118d499f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-28 16:49:16 +08:00
‘937886381’
f00a972f32 修改ui 2024-03-28 16:48:42 +08:00
‘937886381’
04cea7a199 修改ui 2024-03-28 15:36:39 +08:00
lb
fa746ab9b0 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-28 15:12:56 +08:00
lb
08d2d7f5d3 update 权限 2024-03-28 14:16:27 +08:00
lb
e4948eb340 delete activated() 2024-03-28 09:06:09 +08:00
f80f648771 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-28 08:13:38 +08:00
5d16c37965 keep-alive缓存 2024-03-28 08:09:49 +08:00
‘937886381’
b8c39e8095 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 17:03:09 +08:00
‘937886381’
53526b5f78 修改bug 2024-03-27 17:02:44 +08:00
lb
65f42828b8 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-27 16:53:45 +08:00
lb
312ed7ecb7 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-27 16:47:08 +08:00
lb
b367bfcbe4 bugfix zentao 2024-03-27 16:46:06 +08:00
lb
1c301215d1 purge 2024-03-27 16:34:55 +08:00
lb
e0fac4556d update tableheight 2024-03-27 16:28:09 +08:00
‘937886381’
f025a2b77b Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 12:02:30 +08:00
‘937886381’
c361a8c519 修改bug 2024-03-27 12:01:25 +08:00
24a38689d4 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-27 09:45:56 +08:00
6ce3faf98d 1 2024-03-27 09:43:26 +08:00
‘937886381’
028cd07e1a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 09:30:38 +08:00
‘937886381’
0aa509e430 修改bug 2024-03-27 09:30:16 +08:00
lb
688c541074 merge 2024-03-27 09:14:28 +08:00
‘937886381’
8a7e124e46 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-26 18:01:14 +08:00
‘937886381’
88272e512e 修改bug 2024-03-26 18:00:49 +08:00
lb
7c242034e2 keep deleting & test docker, nginx & local deployment 2024-03-26 17:45:29 +08:00
98fc1953cf Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-26 17:18:39 +08:00
1c0dba7dbb ws心跳检查 2024-03-26 17:16:52 +08:00
helloDy
df2df6ed7a Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-26 16:52:28 +08:00
helloDy
a409a22bef time 2024-03-26 16:52:04 +08:00
‘937886381’
328ed8ae63 修改bug 2024-03-26 16:45:16 +08:00
‘937886381’
2f3376a2d5 修改bug 2024-03-26 12:33:47 +08:00
‘937886381’
f2b5598e14 修改bug 2024-03-26 10:47:46 +08:00
‘937886381’
774d51fdcf Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-26 09:43:18 +08:00
‘937886381’
7b0f03b76f 修改bug 2024-03-26 09:42:51 +08:00
zwq
5d2d510e23 修改成本表格 2024-03-26 09:04:17 +08:00
f844834453 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-26 08:19:15 +08:00
‘937886381’
a750e565e2 修改bug 2024-03-25 18:42:00 +08:00
d92d9fd594 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-25 17:19:45 +08:00
‘937886381’
3823c3cb3e 修改bug 2024-03-25 16:57:41 +08:00
lb
abfd448247 删除+优化特殊设备 2024-03-25 14:37:03 +08:00
lb
2d6701ce54 update 2024-03-25 09:08:00 +08:00