|
|
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 |
|
|
|
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 |
|
|
|
db7d4745dd
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-29 16:55:52 +08:00 |
|
|
|
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 |
|
|
|
33782e189c
|
add_infra_job_log_route
|
2024-03-28 18:57:44 +08:00 |
|
|
|
ee828ec4a7
|
're_infra'
|
2024-03-28 18:40:27 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fa746ab9b0
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-28 15:12:56 +08:00 |
|
|
|
08d2d7f5d3
|
update 权限
|
2024-03-28 14:16:27 +08:00 |
|
|
|
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 |
|
|
|
65f42828b8
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-27 16:53:45 +08:00 |
|
|
|
312ed7ecb7
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-27 16:47:08 +08:00 |
|
|
|
b367bfcbe4
|
bugfix zentao
|
2024-03-27 16:46:06 +08:00 |
|
|
|
1c301215d1
|
purge
|
2024-03-27 16:34:55 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
abfd448247
|
删除+优化特殊设备
|
2024-03-25 14:37:03 +08:00 |
|
|
|
2d6701ce54
|
update
|
2024-03-25 09:08:00 +08:00 |
|
|
|
afa3f7c6f5
|
update 巡检提示
|
2024-03-22 17:16:30 +08:00 |
|
‘937886381’
|
649be9a18b
|
修改bug
|
2024-03-22 17:14:34 +08:00 |
|
‘937886381’
|
95abfcf158
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-22 16:45:56 +08:00 |
|
‘937886381’
|
ba2aa7b1b8
|
修改bug
|
2024-03-22 16:45:17 +08:00 |
|
|
|
35bd7ab57e
|
更新成本bug
|
2024-03-22 16:23:08 +08:00 |
|
|
|
21f7542695
|
删除一些多余的文件夹
|
2024-03-22 16:04:51 +08:00 |
|
‘937886381’
|
974ebc53df
|
解决冲突
|
2024-03-22 14:18:47 +08:00 |
|
‘937886381’
|
f8829ec3b7
|
修改bug
|
2024-03-22 14:17:57 +08:00 |
|
helloDy
|
b303dbda0c
|
pie
|
2024-03-22 14:12:52 +08:00 |
|
helloDy
|
f1fd854567
|
merge
|
2024-03-22 10:29:41 +08:00 |
|
helloDy
|
99fd016703
|
bug 3
|
2024-03-22 10:27:57 +08:00 |
|
‘937886381’
|
ab6ea3f404
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-22 10:20:40 +08:00 |
|
‘937886381’
|
60b3695a37
|
修改bug
|
2024-03-22 10:20:08 +08:00 |
|
|
|
7597047220
|
更新成本bug
|
2024-03-22 10:17:03 +08:00 |
|
|
|
dc94bfd51f
|
1
|
2024-03-22 10:10:57 +08:00 |
|
|
|
e45c14de30
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-22 10:01:53 +08:00 |
|
|
|
14afb6d4b1
|
update 设备状态时序图设备名长度
|
2024-03-22 10:01:14 +08:00 |
|
‘937886381’
|
96de42dc6a
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-21 16:35:02 +08:00 |
|
‘937886381’
|
f7aa5375d0
|
修改bug
|
2024-03-21 16:34:34 +08:00 |
|
|
|
d70887fef0
|
修改成本bug
|
2024-03-21 13:43:09 +08:00 |
|
|
|
4801287c01
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-21 13:35:43 +08:00 |
|
|
|
57071bc24a
|
bugfix zentao
|
2024-03-21 10:45:06 +08:00 |
|
|
|
300a33dca4
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zjl
|
2024-03-21 08:28:26 +08:00 |
|
|
|
6f937e1976
|
改bug
|
2024-03-21 08:27:35 +08:00 |
|
‘937886381’
|
aa582495de
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-20 15:55:25 +08:00 |
|
‘937886381’
|
6adbdac0a4
|
修改bug
|
2024-03-20 15:54:57 +08:00 |
|
helloDy
|
e211e585af
|
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
|
2024-03-20 08:48:34 +08:00 |
|
helloDy
|
630e7a95b3
|
bug 2
|
2024-03-20 08:48:02 +08:00 |
|
|
|
8fcf6516a3
|
能源bug
|
2024-03-19 14:08:34 +08:00 |
|
‘937886381’
|
a0a9107863
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-18 16:01:32 +08:00 |
|
‘937886381’
|
94886eedde
|
修改bug
|
2024-03-18 16:00:56 +08:00 |
|
|
|
0c5245ef9b
|
订单详情修改字段
|
2024-03-18 08:27:05 +08:00 |
|
|
|
549d66f753
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-15 17:04:29 +08:00 |
|
|
|
ca129f5434
|
update core-worker的全列表获取地址
|
2024-03-15 17:03:52 +08:00 |
|
‘937886381’
|
a4994ca5ae
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-15 13:44:27 +08:00 |
|
‘937886381’
|
448467ed61
|
修改bug
|
2024-03-15 13:43:59 +08:00 |
|
|
|
73928a0ed0
|
厂务订单里改个工单接口
|
2024-03-15 13:33:58 +08:00 |
|
helloDy
|
db2cbb64c9
|
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
|
2024-03-14 20:20:18 +08:00 |
|
helloDy
|
67948c10cb
|
bug --
|
2024-03-14 20:19:42 +08:00 |
|
|
|
e3133cef1f
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-14 17:08:39 +08:00 |
|
‘937886381’
|
eba9d2ba60
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-14 14:54:37 +08:00 |
|
‘937886381’
|
6b96f84150
|
修改bug
|
2024-03-14 14:54:03 +08:00 |
|
|
|
526bb8c534
|
班组bug
|
2024-03-14 14:47:57 +08:00 |
|
|
|
7b4cd85ba0
|
1
|
2024-03-14 14:36:52 +08:00 |
|
|
|
764030a8da
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-14 09:01:45 +08:00 |
|
|
|
d2e38be1e1
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-13 18:16:15 +08:00 |
|
|
|
26d2e2b7e5
|
ui drawer ui change
|
2024-03-13 18:14:06 +08:00 |
|
|
|
25f3c5d13b
|
update 项目群更新
|
2024-03-13 17:04:36 +08:00 |
|
‘937886381’
|
224625e10f
|
修改bug
|
2024-03-13 15:30:08 +08:00 |
|
‘937886381’
|
680f852057
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2024-03-13 14:55:00 +08:00 |
|
‘937886381’
|
6025c8fbf7
|
修改bug
|
2024-03-13 14:54:35 +08:00 |
|
helloDy
|
149ec4c844
|
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
|
2024-03-12 18:02:52 +08:00 |
|
helloDy
|
8045c303ee
|
维修
|
2024-03-12 18:02:16 +08:00 |
|
‘937886381’
|
0457514f1e
|
修改bug
|
2024-03-12 11:18:06 +08:00 |
|
‘937886381’
|
bddb182b73
|
修改bug
|
2024-03-11 17:06:38 +08:00 |
|
‘937886381’
|
df75aa04a1
|
修改bug
|
2024-03-11 15:47:46 +08:00 |
|
‘937886381’
|
2e214b52a6
|
修改bug
|
2024-03-08 16:20:03 +08:00 |
|
‘937886381’
|
39493549b9
|
修改bug
|
2024-03-07 16:28:23 +08:00 |
|
‘937886381’
|
e6e280c930
|
修改bug
|
2024-03-06 11:01:31 +08:00 |
|
‘937886381’
|
a80ce13de1
|
解决冲突
|
2024-03-05 09:49:01 +08:00 |
|
‘937886381’
|
a027c4ca63
|
修改bug
|
2024-03-05 09:48:16 +08:00 |
|
|
|
9a6aa75171
|
merge test
|
2024-03-04 14:09:07 +08:00 |
|
Melete
|
0a1175075d
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2024-03-04 14:04:37 +08:00 |
|
Melete
|
50cfcc3af2
|
update
|
2024-03-04 14:01:53 +08:00 |
|
