|
|
54b63a7f53
|
update drawer and edit
|
2023-11-24 10:41:11 +08:00 |
|
helloDy
|
8004c85c32
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-24 09:14:32 +08:00 |
|
helloDy
|
9041428003
|
部分bug
|
2023-11-24 09:13:56 +08:00 |
|
|
|
d79ba71bd7
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 08:51:18 +08:00 |
|
|
|
0225be1c94
|
fix bugs
|
2023-11-23 17:07:57 +08:00 |
|
|
|
960751a264
|
merge test
|
2023-11-23 16:57:39 +08:00 |
|
|
|
978aa3a1d1
|
ui修改
|
2023-11-23 16:56:08 +08:00 |
|
|
|
8cd53915c1
|
修改仓库UI测试bug
|
2023-11-23 16:42:09 +08:00 |
|
helloDy
|
8dbc1d512d
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-23 15:10:26 +08:00 |
|
helloDy
|
8af06c6c42
|
bug
|
2023-11-23 15:09:46 +08:00 |
|
‘937886381’
|
afafbccc0c
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-23 14:33:32 +08:00 |
|
‘937886381’
|
0948737f1a
|
修改bug
|
2023-11-23 14:32:53 +08:00 |
|
|
|
e318aa4f59
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-22 17:05:53 +08:00 |
|
|
|
ab09a2b08c
|
update zentao bugs
|
2023-11-22 17:04:22 +08:00 |
|
|
|
6940155e4f
|
merge test
|
2023-11-22 17:00:32 +08:00 |
|
|
|
dfc758bfae
|
订单监控图
|
2023-11-22 16:58:32 +08:00 |
|
|
|
de15716b7c
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-22 14:53:49 +08:00 |
|
|
|
c736992a34
|
'1'
|
2023-11-22 14:49:56 +08:00 |
|
helloDy
|
5492666b53
|
merge
|
2023-11-22 14:43:07 +08:00 |
|
|
|
cd55b4c860
|
update
|
2023-11-22 14:41:53 +08:00 |
|
helloDy
|
a7f811aa3e
|
bug
|
2023-11-22 14:41:10 +08:00 |
|
|
|
33188481bf
|
update login
|
2023-11-22 14:27:30 +08:00 |
|
‘937886381’
|
a22da566c3
|
解决冲突
|
2023-11-22 14:11:23 +08:00 |
|
‘937886381’
|
3c99ddc4c0
|
修改bug
|
2023-11-22 14:00:02 +08:00 |
|
|
|
ac28476024
|
update hints
|
2023-11-22 11:15:39 +08:00 |
|
|
|
b348a31b24
|
update some equipment bugs
|
2023-11-22 10:14:40 +08:00 |
|
|
|
c6d618b2b8
|
update bugs
|
2023-11-21 17:02:22 +08:00 |
|
|
|
c8fb8d7589
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-21 16:08:44 +08:00 |
|
|
|
51baca61cc
|
update equipment attach process
|
2023-11-21 15:07:33 +08:00 |
|
|
|
847e34fcc6
|
update
|
2023-11-21 11:48:17 +08:00 |
|
|
|
32a43fbc3b
|
update process equipment relation
|
2023-11-21 09:13:28 +08:00 |
|
|
|
20975948ef
|
update
|
2023-11-20 16:50:38 +08:00 |
|
|
|
685a3308db
|
更新仓库bug
|
2023-11-20 16:09:42 +08:00 |
|
|
|
ac041c2f4a
|
update bom-selector v1
|
2023-11-20 15:53:23 +08:00 |
|
|
|
dd23c49ba0
|
update 设备选择
|
2023-11-20 14:21:14 +08:00 |
|
|
|
44452f2e89
|
update
|
2023-11-20 11:26:27 +08:00 |
|
|
|
8ddef0de9d
|
update bomselector
|
2023-11-17 17:07:52 +08:00 |
|
|
|
7249abf5b1
|
add BomSelector
|
2023-11-17 16:57:55 +08:00 |
|
|
|
76f5385140
|
add Candidate
|
2023-11-17 16:05:57 +08:00 |
|
|
|
75f59c3279
|
更新-仓库-2级bug
|
2023-11-17 15:48:17 +08:00 |
|
|
|
bb731dfcd4
|
add custom tree
|
2023-11-17 14:56:43 +08:00 |
|
|
|
bad7175f87
|
merge test
|
2023-11-17 14:07:51 +08:00 |
|
|
|
231e9227a5
|
1
|
2023-11-17 14:04:53 +08:00 |
|
|
|
d3eb9d8fbc
|
update custom-transfer
|
2023-11-17 11:25:28 +08:00 |
|
|
|
9a7521e691
|
add CustomTrasfer
|
2023-11-17 11:15:18 +08:00 |
|
helloDy
|
40e7d6b6d8
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-17 10:26:21 +08:00 |
|
helloDy
|
1d9b97f1d0
|
设备信息bug
|
2023-11-17 10:24:53 +08:00 |
|
|
|
d1cbac481d
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-17 10:14:26 +08:00 |
|
|
|
c895975703
|
update
|
2023-11-17 10:12:00 +08:00 |
|
|
|
6ef90a8eba
|
merge test
|
2023-11-17 10:00:04 +08:00 |
|
|
|
c99393dd12
|
更新仓库bug
|
2023-11-17 09:55:09 +08:00 |
|
|
|
23c1b4b3c6
|
update
|
2023-11-17 09:48:39 +08:00 |
|
|
|
88615a52a4
|
'1'
|
2023-11-17 08:46:35 +08:00 |
|
Melete
|
010e51c0f6
|
update 工艺流程
|
2023-11-16 22:18:45 +08:00 |
|
Melete
|
a6b48280aa
|
update 工艺流程
|
2023-11-16 22:00:50 +08:00 |
|
helloDy
|
c4091b7181
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-16 21:07:59 +08:00 |
|
helloDy
|
34e6a73852
|
bug
|
2023-11-16 21:07:21 +08:00 |
|
‘937886381’
|
7523f98f84
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-16 18:54:43 +08:00 |
|
‘937886381’
|
b349432eaa
|
修改bug
|
2023-11-16 18:52:55 +08:00 |
|
|
|
42177846e8
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-16 17:25:39 +08:00 |
|
|
|
c5b5de7a78
|
update
|
2023-11-16 17:23:58 +08:00 |
|
|
|
0884159dd7
|
update login
|
2023-11-16 17:16:37 +08:00 |
|
|
|
d37c5881a5
|
2
|
2023-11-16 16:53:35 +08:00 |
|
|
|
2b0579dc70
|
merge test
|
2023-11-16 16:13:36 +08:00 |
|
|
|
6a10afd04e
|
1
|
2023-11-16 16:12:05 +08:00 |
|
helloDy
|
25d1ac8d90
|
merge
|
2023-11-16 14:07:50 +08:00 |
|
helloDy
|
3667b98da9
|
bug
|
2023-11-16 13:57:21 +08:00 |
|
|
|
bbdf0a75f0
|
update system
|
2023-11-16 13:47:18 +08:00 |
|
‘937886381’
|
3832aee028
|
解决冲突
|
2023-11-16 08:52:38 +08:00 |
|
‘937886381’
|
2fbc6ea5e7
|
修改bug
|
2023-11-16 08:50:59 +08:00 |
|
helloDy
|
4ce62c14ee
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-15 17:47:31 +08:00 |
|
helloDy
|
e5966c27a3
|
工单[
|
2023-11-15 17:46:54 +08:00 |
|
|
|
3e9f629888
|
Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: #82
|
2023-11-15 16:03:01 +08:00 |
|
‘937886381’
|
ecabeeeea9
|
修改bug
|
2023-11-15 15:47:45 +08:00 |
|
helloDy
|
aef062b4c9
|
merge
|
2023-11-15 14:37:52 +08:00 |
|
helloDy
|
952490f0d4
|
24h,设备
|
2023-11-15 14:30:28 +08:00 |
|
|
|
0ae68aacef
|
订单
|
2023-11-15 14:22:45 +08:00 |
|
|
|
a37fa65e8f
|
bug
|
2023-11-15 14:02:16 +08:00 |
|
|
|
5d054254f7
|
merge test
|
2023-11-15 10:17:35 +08:00 |
|
|
|
76cdc34af1
|
小bug
|
2023-11-15 10:13:54 +08:00 |
|
‘937886381’
|
ecc84a1c4b
|
合并冲突
|
2023-11-15 09:10:45 +08:00 |
|
‘937886381’
|
95f7004d1c
|
修改bug
|
2023-11-15 09:08:20 +08:00 |
|
|
|
de06dfddf4
|
仓库-bug修改
|
2023-11-14 16:02:16 +08:00 |
|
|
|
67612c79df
|
merge test
|
2023-11-14 15:47:06 +08:00 |
|
|
|
26862423c1
|
首页
|
2023-11-14 10:35:10 +08:00 |
|
|
|
d2c82fa692
|
更新-仓库-库位监控
|
2023-11-14 09:42:38 +08:00 |
|
|
|
ebae332674
|
update
|
2023-11-14 09:23:08 +08:00 |
|
|
|
7f6fa0af96
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-13 16:56:07 +08:00 |
|
|
|
ba92da2d5d
|
update login mobile
|
2023-11-13 16:55:16 +08:00 |
|
|
|
06c124a149
|
update login
|
2023-11-13 16:37:04 +08:00 |
|
helloDy
|
e6158cd59b
|
merge
|
2023-11-11 20:51:01 +08:00 |
|
helloDy
|
624ed7bc27
|
设备管理
|
2023-11-11 20:49:31 +08:00 |
|
‘937886381’
|
f7846f2767
|
Merge branch 'projects/mes-test' into projects/mes-zhp
|
2023-11-10 17:03:25 +08:00 |
|
‘937886381’
|
a8adb317c0
|
质量管理
|
2023-11-10 17:02:52 +08:00 |
|
|
|
3812eb38a9
|
修改订单bug
|
2023-11-09 15:01:50 +08:00 |
|
‘937886381’
|
1962ecc6df
|
质量管理
|
2023-11-07 19:10:45 +08:00 |
|
|
|
3ada2c5d08
|
merge test
|
2023-11-07 16:01:07 +08:00 |
|
|
|
9e8276d3a7
|
merge test
|
2023-11-07 15:55:19 +08:00 |
|
helloDy
|
f9741b07c0
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-07 15:53:53 +08:00 |
|
helloDy
|
fcb1885bf7
|
基础，物料，设备
|
2023-11-07 15:53:01 +08:00 |
|
|
|
97e6a665de
|
更新仓库
|
2023-11-07 15:49:33 +08:00 |
|
|
|
6e1bf994c2
|
bug
|
2023-11-07 15:49:07 +08:00 |
|
|
|
876f7d8f3c
|
merge test
|
2023-11-06 13:42:09 +08:00 |
|
|
|
5695c3db90
|
成品发货
|
2023-11-06 13:37:52 +08:00 |
|
helloDy
|
1d38a560ec
|
Merge branch 'projects/mes-test' into projects/mes-dy
|
2023-11-06 12:55:03 +08:00 |
|
helloDy
|
0ae3c66dc3
|
基础核心
|
2023-11-06 12:54:28 +08:00 |
|
|
|
0deb38647e
|
更新仓库管理
|
2023-11-04 16:40:16 +08:00 |
|
|
|
14d426b020
|
merge test
|
2023-11-03 17:01:14 +08:00 |
|
|
|
046a5eea32
|
成品发货
|
2023-11-03 16:59:07 +08:00 |
|
helloDy
|
e5978d1700
|
merge
|
2023-11-03 11:16:30 +08:00 |
|
helloDy
|
91eb13af26
|
客商信息、人事相关
|
2023-11-03 11:15:12 +08:00 |
|
|
|
2075b42427
|
'merge'
|
2023-11-01 09:39:25 +08:00 |
|
|
|
c851188989
|
update before hand over
|
2023-11-01 09:37:47 +08:00 |
|
Melete
|
0fa310609e
|
update 设备备品备件+巡检
|
2023-10-31 22:34:10 +08:00 |
|
|
|
57a4ca96e7
|
add
|
2023-10-31 17:49:39 +08:00 |
|
|
|
af868a7cd7
|
update 设备基础配置，设备保养
|
2023-10-30 16:51:37 +08:00 |
|
‘937886381’
|
34e8178ddc
|
解决合并冲突
|
2023-10-30 10:50:21 +08:00 |
|
‘937886381’
|
6c094b2a2e
|
修改bug
|
2023-10-30 10:48:32 +08:00 |
|
|
|
4a796130d0
|
update 设备采集配置
|
2023-10-30 10:47:06 +08:00 |
|
|
|
3bf8150764
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-10-30 10:36:13 +08:00 |
|
|
|
bacf2eab0b
|
update
|
2023-10-30 10:35:09 +08:00 |
|
|
|
013c08710c
|
merge test
|
2023-10-30 10:32:51 +08:00 |
|
|
|
00fba0a83b
|
2023.10.30提测能源&班组
|
2023-10-30 10:26:54 +08:00 |
|
helloDy
|
4615e975e8
|
merge
|
2023-10-27 16:17:28 +08:00 |
|
helloDy
|
e961bf6cfa
|
物料模块
|
2023-10-27 16:16:13 +08:00 |
|
|
|
216aa6291d
|
update 设备管理-基础配置-设备分组绑定
|
2023-10-27 14:24:47 +08:00 |
|
|
|
66660bfef7
|
update
|
2023-10-26 17:01:09 +08:00 |
|
|
|
d25261b256
|
move coreEquipment
|
2023-10-26 15:14:00 +08:00 |
|
|
|
583b934511
|
delete some files
|
2023-10-26 14:07:36 +08:00 |
|
|
|
503e988f7b
|
merge again
|
2023-10-26 11:32:29 +08:00 |
|
|
|
06e8a72f80
|
merge mes-test
|
2023-10-26 11:30:07 +08:00 |
|
|
|
6c348202a1
|
update extend process
|
2023-10-26 11:28:24 +08:00 |
|
|
|
5ba186b0c6
|
update
|
2023-10-25 17:02:43 +08:00 |
|
|
|
e153d7e077
|
update 流程图
|
2023-10-24 17:07:32 +08:00 |
|
|
|
3c31e5d63a
|
done 新建工序
|
2023-10-24 15:56:15 +08:00 |
|
|
|
392c1ea09b
|
merge test
|
2023-10-24 15:21:27 +08:00 |
|
|
|
ac4565e587
|
班组&能源基础
|
2023-10-24 15:16:20 +08:00 |
|
|
|
6006ae13d9
|
update flow
|
2023-10-24 11:17:07 +08:00 |
|
‘937886381’
|
2c3bdde403
|
包装管理
|
2023-10-23 08:42:46 +08:00 |
|
|
|
106d0ed89c
|
merge server
|
2023-10-20 17:03:06 +08:00 |
|
|
|
cfbd00b560
|
update process
|
2023-10-20 17:00:49 +08:00 |
|
|
|
a787935263
|
add process flow and process node
|
2023-10-20 16:03:40 +08:00 |
|
|
|
15da20fac7
|
add 添加一个缓存方案
|
2023-10-20 14:22:46 +08:00 |
|
|
|
6b4e906e75
|
update process flow
|
2023-10-19 16:40:36 +08:00 |
|
|
|
d121e408af
|
add 工艺流程列表
|
2023-10-19 11:13:37 +08:00 |
|
|
|
f8baaa8955
|
update ui
|
2023-10-17 17:02:53 +08:00 |
|
|
|
fe7821cbd8
|
update 核心模块-厂务-设备
|
2023-10-17 15:22:17 +08:00 |
|
|
|
a7e81ad8fb
|
Merge branch 'test' into lb
|
2023-10-16 17:04:34 +08:00 |
|
|
|
32cbf9076f
|
update 更新设备类型上传
|
2023-10-16 17:03:29 +08:00 |
|
helloDy
|
2b355aaf8f
|
ui
|
2023-10-16 15:47:31 +08:00 |
|
|
|
f60a46ed1d
|
update 设备信息上传
|
2023-10-16 15:36:26 +08:00 |
|
helloDy
|
4a67e226e1
|
merge
|
2023-10-13 17:09:07 +08:00 |
|
helloDy
|
46aaa47e07
|
bug
|
2023-10-13 17:05:01 +08:00 |
|
|
|
ca0f62b2eb
|
Merge branch 'test' into lb
|
2023-10-13 17:04:18 +08:00 |
|
|
|
5534104e87
|
update equipment edit
|
2023-10-13 17:01:49 +08:00 |
|
|
|
b72fe1bfed
|
update equipment edit
|
2023-10-13 16:08:31 +08:00 |
|
helloDy
|
d682ecc91c
|
Merge branch 'test' into dy
|
2023-10-12 17:05:03 +08:00 |
|
helloDy
|
2b76ef7d23
|
bug
|
2023-10-12 17:04:03 +08:00 |
|
|
|
9ec13b35b8
|
update equipment
|
2023-10-12 17:03:07 +08:00 |
|
|
|
7acccd3de0
|
bugfix zentao
|
2023-10-12 15:40:05 +08:00 |
|
|
|
9f53ea6981
|
10.12
|
2023-10-12 14:39:59 +08:00 |
|
|
|
8f634d012c
|
bugfix zentao
|
2023-10-12 11:08:51 +08:00 |
|
|
|
348714edaf
|
merge test
|
2023-10-11 14:33:37 +08:00 |
|
|
|
814fe4605a
|
UI样式修改能源&班组
|
2023-10-11 14:30:18 +08:00 |
|
|
|
0162f338ba
|
Merge branch 'test' into lb
|
2023-10-11 10:30:25 +08:00 |
|
|
|
8f99915720
|
add 设备看板
|
2023-10-11 10:29:26 +08:00 |
|
helloDy
|
69bdab75d4
|
bug
|
2023-10-10 17:06:39 +08:00 |
|
|
|
af5e0333ed
|
update ui
|
2023-10-10 17:01:57 +08:00 |
|
|
|
b2ee61b8cb
|
update 改为抽屉展示
|
2023-10-10 14:22:00 +08:00 |
|
|
|
723d83cc02
|
update 设备分组
|
2023-10-10 10:04:23 +08:00 |
|
|
|
769830c448
|
update 设备分组
|
2023-10-09 17:01:19 +08:00 |
|
|
|
907db90e93
|
update 设备分组的抽屉
|
2023-10-09 16:27:44 +08:00 |
|
|
|
6e390bf12a
|
update
|
2023-10-09 13:32:33 +08:00 |
|
|
|
b39f0625a1
|
update
|
2023-10-09 11:37:19 +08:00 |
|
|
|
e985c73e00
|
update gantt
|
2023-10-08 17:14:18 +08:00 |
|
helloDy
|
b1c0d21888
|
Merge branch 'test' into dy
|
2023-10-08 16:59:31 +08:00 |
|
helloDy
|
96d52fafee
|
pdf
|
2023-10-08 16:59:09 +08:00 |
|
|
|
4f7889ff60
|
done time sequence demo
|
2023-10-08 15:53:38 +08:00 |
|
|
|
bc2c5a4787
|
update time sequence status
|
2023-10-08 15:00:38 +08:00 |
|
|
|
ab8e9cb2a5
|
update
|
2023-10-08 14:30:50 +08:00 |
|
|
|
57960ff8bf
|
update print page
|
2023-10-08 10:18:08 +08:00 |
|
|
|
b9e39dacf1
|
bugfix zentao
|
2023-10-08 09:31:02 +08:00 |
|
|
|
80ad95be6e
|
add print module
|
2023-10-07 14:29:43 +08:00 |
|
|
|
cf2d7af94b
|
delete echarts
|
2023-09-27 17:00:33 +08:00 |
|
|
|
a48b31dcbe
|
Merge branch 'test' into lb
|
2023-09-27 16:58:28 +08:00 |
|
|
|
96b0a9e503
|
update 产品质量分析
|
2023-09-27 16:57:57 +08:00 |
|
|
|
9c257aa24a
|
update demo
|
2023-09-27 16:19:55 +08:00 |
|
|
|
7ab5f1b812
|
update demo
|
2023-09-27 14:42:38 +08:00 |
|
|
|
5c796cd44f
|
add custom echarts demo
|
2023-09-27 14:01:57 +08:00 |
|
|
|
fe0b5538a8
|
update 设备产量时序图
|
2023-09-27 13:22:09 +08:00 |
|
|
|
90695acefd
|
update 检测信息记录
|
2023-09-27 10:14:24 +08:00 |
|
|
|
4d7e3c0e04
|
merge test
|
2023-09-27 09:36:20 +08:00 |
|
|
|
ee40707d2c
|
修改bug及能源分析样式
|
2023-09-27 09:33:28 +08:00 |
|
|
|
20808c0975
|
update 产量时序图
|
2023-09-26 17:00:46 +08:00 |
|
|
|
87f56dd9ac
|
update responsejson
|
2023-09-26 15:12:41 +08:00 |
|
|
|
24ffea330d
|
update 设备产量分析
|
2023-09-26 14:56:00 +08:00 |
|
|
|
a4594426c3
|
bugfix
|
2023-09-26 14:38:30 +08:00 |
|
|
|
c899bb37e3
|
update quality inspection record
|
2023-09-26 11:03:34 +08:00 |
|
|
|
d907d2f341
|
Merge branch 'test' into lb
|
2023-09-25 17:13:47 +08:00 |
|
|
|
1116531aff
|
update
|
2023-09-25 16:58:35 +08:00 |
|
|
|
8dc5bbb4d8
|
update
|
2023-09-25 16:53:31 +08:00 |
|
|
|
c24d22aedd
|
update
|
2023-09-25 16:34:05 +08:00 |
|
|
|
bbbfa9644d
|
bugfix
|
2023-09-25 15:47:39 +08:00 |
|
helloDy
|
699810f40a
|
Merge branch 'test' into dy
|
2023-09-22 16:54:40 +08:00 |
|
helloDy
|
d454f20bd6
|
bug
|
2023-09-22 16:54:16 +08:00 |
|
|
|
56f209a27e
|
Merge branch 'test' into lb
|
2023-09-22 16:29:50 +08:00 |
|
|
|
980f3468b7
|
update homepage
|
2023-09-22 16:29:31 +08:00 |
|
|
|
42550264c8
|
merge test
|
2023-09-22 11:08:58 +08:00 |
|
|
|
727f7d57c3
|
能源bug
|
2023-09-22 11:06:43 +08:00 |
|
|
|
dcda3a6294
|
bugfix
|
2023-09-22 10:54:21 +08:00 |
|
|
|
f43b1c1eab
|
update 设备加工数量
|
2023-09-22 10:29:28 +08:00 |
|
|
|
ee3d6f9dc6
|
merge
|
2023-09-22 09:28:41 +08:00 |
|
|
|
e2a777069e
|
update 设备加工数量
|
2023-09-21 17:09:15 +08:00 |
|
|
|
06fa7d40b3
|
update 设备加工数量
|
2023-09-21 17:03:07 +08:00 |
|
|
|
f6f0480744
|
update 设备加工数量
|
2023-09-21 16:00:46 +08:00 |
|
|
|
45e7f337bf
|
update 设备加工数量
|
2023-09-21 15:54:11 +08:00 |
|
|
|
8e0d63839a
|
update 设备加工数量
|
2023-09-21 15:35:16 +08:00 |
|
|
|
6c21f01fd7
|
update 设备加工数量
|
2023-09-21 15:14:38 +08:00 |
|
|
|
52bc38499c
|
update 设备效率分析
|
2023-09-21 14:54:16 +08:00 |
|
|
|
c600d14f8f
|
update 设备产量时序图
|
2023-09-20 17:03:39 +08:00 |
|
|
|
a74242f3b3
|
mrege test
|
2023-09-20 16:59:13 +08:00 |
|
|
|
ebcf3d4d78
|
修改bug
|
2023-09-20 16:57:20 +08:00 |
|
|
|
8ad84a4d61
|
update 设备产量时序图
|
2023-09-20 14:44:39 +08:00 |
|
|
|
928258e509
|
update 设备状态时序图
|
2023-09-20 14:11:36 +08:00 |
|
helloDy
|
ee0affc78f
|
Merge branch 'test' into dy
|
2023-09-20 13:58:36 +08:00 |
|
helloDy
|
dfec94be17
|
表格
|
2023-09-20 13:58:14 +08:00 |
|
|
|
a12530b835
|
update 质量检测统计数据
|
2023-09-20 11:17:34 +08:00 |
|
|
|
b3db8dcae8
|
update 检测统计数据chart
|
2023-09-20 10:49:17 +08:00 |
|
|
|
24a0857808
|
update 质量检测统计数据
|
2023-09-20 09:50:38 +08:00 |
|
|
|
e0cc022e34
|
update 产品质量分析样式
|
2023-09-20 09:11:31 +08:00 |
|
|
|
71bcd14c72
|
update 产品质量分析chart
|
2023-09-19 17:06:19 +08:00 |
|
|
|
5a31498224
|
修bug
|
2023-09-19 15:45:16 +08:00 |
|
|
|
c965dfbc5a
|
bugfix
|
2023-09-18 17:01:44 +08:00 |
|
|
|
c364162a2a
|
update no-data-background
|
2023-09-18 15:14:18 +08:00 |
|
|
|
0371859d14
|
排班及bug
|
2023-09-18 14:49:03 +08:00 |
|
|
|
7407b97f5a
|
bugfix zentao
|
2023-09-18 13:52:36 +08:00 |
|
|
|
eff5e0d1e1
|
merge test
|
2023-09-18 08:50:53 +08:00 |
|
|
|
60dc449a27
|
排班
|
2023-09-18 08:41:14 +08:00 |
|
helloDy
|
bc5d3d44d5
|
页面
|
2023-09-16 17:51:09 +08:00 |
|
|
|
a6d8a7a9da
|
update
|
2023-09-15 15:45:37 +08:00 |
|
|
|
7d2bfaea18
|
bugfix zentao 2
|
2023-09-15 14:49:31 +08:00 |
|
helloDy
|
e9538744c3
|
冲突
|
2023-09-15 14:38:43 +08:00 |
|
helloDy
|
8cf2f9f7e9
|
生产监控
|
2023-09-15 14:37:30 +08:00 |
|
|
|
772a4b0633
|
bugfix zentao 1
|
2023-09-15 14:30:19 +08:00 |
|
|
|
27ebe39a96
|
update image
|
2023-09-13 17:06:02 +08:00 |
|
‘937886381’
|
f85cb9c50f
|
Merge branch 'test' into zhp
|
2023-09-13 16:01:18 +08:00 |
|
‘937886381’
|
e8cc1fc50b
|
生产分析
|
2023-09-13 16:00:43 +08:00 |
|
|
|
f341ec7b30
|
update router mode
|
2023-09-13 12:24:52 +08:00 |
|
|
|
d595bf2660
|
Merge branch 'test' into lb
|
2023-09-12 11:10:45 +08:00 |
|
|
|
529889fd07
|
update 工段设备绑定 dialogForm
|
2023-09-12 11:09:51 +08:00 |
|
|
|
2f18299b0b
|
add dialogForm of equipmentbind
|
2023-09-11 16:47:12 +08:00 |
|
‘937886381’
|
7d959e8ad3
|
Merge branch 'test' into zhp
|
2023-09-11 16:09:42 +08:00 |
|
‘937886381’
|
6f0040a0ae
|
生产监控更新
|
2023-09-11 16:09:07 +08:00 |
|
helloDy
|
f1bbdf82e5
|
冲突
|
2023-09-11 15:55:58 +08:00 |
|
helloDy
|
645ba2843f
|
生产监控
|
2023-09-11 15:53:43 +08:00 |
|
|
|
f2f3a9e850
|
update 设备全参数查询
|
2023-09-11 15:24:11 +08:00 |
|
|
|
4e05b3e3d6
|
merge from test
|
2023-09-11 15:04:16 +08:00 |
|
|
|
b91b8c3d3c
|
update 设备加工数量
|
2023-09-11 14:57:55 +08:00 |
|
|
|
df0dc6bfa0
|
能源分析
|
2023-09-08 16:01:54 +08:00 |
|
|
|
c44ec6f49c
|
update 基本完成设备全参数查询
|
2023-09-08 15:57:46 +08:00 |
|
|
|
6197b606f1
|
update 设备全参数
|
2023-09-08 08:42:16 +08:00 |
|
|
|
c7b32ab34e
|
add 设备全参数测试数据
|
2023-09-07 11:24:07 +08:00 |
|
|
|
e2527f2e30
|
remove 设备效率分析的查看趋势功能
|
2023-09-06 16:38:46 +08:00 |
|
|
|
76100ad07d
|
update 设备全参数
|
2023-09-06 16:37:22 +08:00 |
|
|
|
fa02c3933d
|
remove 产品质量监控可视化
|
2023-09-06 16:18:59 +08:00 |
|
|
|
d63d49ccc9
|
add pie chart
|
2023-09-06 15:18:02 +08:00 |
|
|
|
cd437ed7d3
|
update 效率分析
|
2023-09-06 15:02:16 +08:00 |
|
|
|
052f54833c
|
update 更新效率分析
|
2023-09-06 11:28:10 +08:00 |
|
|
|
e42b7035fe
|
update 完成时序图模块
|
2023-09-06 10:39:32 +08:00 |
|
|
|
a505f34abc
|
update 设备产量时序图
|
2023-09-06 09:56:05 +08:00 |
|
|
|
edc5d64acc
|
update 更新设备效率分析
|
2023-09-05 17:01:53 +08:00 |
|
|
|
e5fed36234
|
update 设备产量时序图
|
2023-09-05 16:35:31 +08:00 |
|
|
|
2dd40261a4
|
update 设备状态时序图
|
2023-09-05 16:26:52 +08:00 |
|
|
|
e16b6f8ec4
|
update 设备状态时序图
|
2023-09-05 16:07:50 +08:00 |
|
|
|
9c59a7e715
|
能源分析
|
2023-09-05 15:45:59 +08:00 |
|
|
|
55e8de1136
|
update 完成设备异常分析
|
2023-09-04 15:24:22 +08:00 |
|
|
|
ffedc7c256
|
add 设备异常分析
|
2023-09-04 14:50:52 +08:00 |
|
|
|
fbd78c6aa5
|
update 产品质量分析
|
2023-09-04 14:35:13 +08:00 |
|
|
|
6f71b6a7c0
|
add 产品质量分析-图形弹窗
|
2023-09-04 13:54:37 +08:00 |
|
|
|
55f90a7102
|
add 设备模块剩余部分页面
|
2023-09-04 09:41:31 +08:00 |
|
|
|
31dbc025c8
|
done 设备数采相关
|
2023-09-01 17:05:05 +08:00 |
|
|
|
63206d4769
|
add mockdata & update设备采集配置**
|
2023-09-01 15:08:36 +08:00 |
|
|
|
b23b5256f9
|
update 设备数据采集
|
2023-09-01 10:39:54 +08:00 |
|
|
|
0158a11644
|
update 设备分析-状态时序图
|
2023-08-31 16:58:17 +08:00 |
|
|
|
62256b57a5
|
update 设备全参数查询
|
2023-08-31 16:11:41 +08:00 |
|
|
|
0e6c01e578
|
update 设备状态和参数
|
2023-08-31 15:12:34 +08:00 |
|
|
|
0ec4238042
|
add 设备加工数量-图表，设备状态和参数，设备全参数查询
|
2023-08-31 14:26:18 +08:00 |
|
|
|
fd0c14ff1c
|
update 设备加工数量
|
2023-08-30 17:02:11 +08:00 |
|
|
|
72393caee1
|
update 设备加工数量
|
2023-08-30 15:36:16 +08:00 |
|
|
|
14eb83932e
|
done 设备24小时生产记录
|
2023-08-30 14:32:37 +08:00 |
|
|
|
0f6418fcf9
|
update 基本完成设备近24小时数据
|
2023-08-30 14:30:08 +08:00 |
|
|
|
100d28fd68
|
add 设备加工数量
|
2023-08-30 14:11:24 +08:00 |
|
|
|
bf52db3b6a
|
update more 设备24小时记录
|
2023-08-30 11:37:11 +08:00 |
|
|
|
0f5e4b8368
|
update 设备24小时记录
|
2023-08-30 10:27:49 +08:00 |
|
|
|
e37bb3f2ce
|
add 设备状态时序图组件
|
2023-08-29 14:47:32 +08:00 |
|
|
|
84ed13d58f
|
done equipmentAlarmLog
|
2023-08-29 10:17:27 +08:00 |
|
|
|
383f98e1d9
|
add 设备监控
|
2023-08-29 09:56:27 +08:00 |
|
|
|
6975c52062
|
add 设备绑定分组
|
2023-08-28 15:52:19 +08:00 |
|
|
|
4ad325c02c
|
done 设备分组报警
|
2023-08-28 14:56:56 +08:00 |
|
|
|
9dc580ddd2
|
update
|
2023-08-28 13:30:29 +08:00 |
|
|
|
3656a92f63
|
add 设备分组报警
|
2023-08-28 10:47:05 +08:00 |
|
|
|
573192d27a
|
add 设备工段绑定，设备分组
|
2023-08-28 09:22:28 +08:00 |
|
|
|
01fe2da523
|
能源监控
|
2023-08-25 16:27:46 +08:00 |
|
|
|
3d24159743
|
update 完成设备信息
|
2023-08-24 15:36:38 +08:00 |
|
|
|
54d22292c1
|
update equipment drawer的逻辑
|
2023-08-24 11:35:51 +08:00 |
|
|
|
9556cdfb0e
|
update 设备信息
|
2023-08-23 15:15:29 +08:00 |
|
|
|
fc2037a10a
|
update drawer
|
2023-08-22 17:00:43 +08:00 |
|
|
|
4eb9b321db
|
add EquipmentDrawer
|
2023-08-22 15:53:02 +08:00 |
|
|
|
1b055ebfa4
|
add 设备资产
|
2023-08-22 11:14:38 +08:00 |
|
|
|
fa2505d5a2
|
update EquipmentPIcs
|
2023-08-21 14:05:15 +08:00 |
|
|
|
6e39dd48ff
|
能源配置&能源抄表
|
2023-08-21 11:12:23 +08:00 |
|
|
|
a4c1438e59
|
update
|
2023-08-18 17:01:41 +08:00 |
|
|
|
577fcb53d2
|
add equipment assets
|
2023-08-18 16:56:53 +08:00 |
|
|
|
56191453af
|
调整目录结构，移动DialogForm组件，移动设备信息和设备类型至核心生产模块
|
2023-08-18 15:41:46 +08:00 |
|
|
|
84a055e605
|
Merge branch 'test' into lb
|
2023-08-18 15:21:10 +08:00 |
|
|
|
2cf0e718f7
|
update 完成质量-最近24小时记录
|
2023-08-18 14:41:52 +08:00 |
|
|
|
54ce9639ab
|
add 动态表结构处理相关工具
|
2023-08-18 14:06:44 +08:00 |
|
|
|
5cc3fb758e
|
update 设备分组
|
2023-08-17 09:37:39 +08:00 |
|
|
|
a312117ea3
|
update 设备信息
|
2023-08-16 16:06:32 +08:00 |
|
|
|
fc94d0cccc
|
update 设备类型
|
2023-08-15 14:57:37 +08:00 |
|
|
|
18a9a4f51b
|
能源类型
|
2023-08-14 16:19:12 +08:00 |
|
|
|
c11c32d7ee
|
update 设备类型
|
2023-08-11 16:49:28 +08:00 |
|
|
|
3900dcfbd8
|
add 设备相关
|
2023-08-10 16:52:47 +08:00 |
|
|
|
8f61e9a9d9
|
update recent 24
|
2023-08-09 16:11:06 +08:00 |
|
|
|
2a2ef5ab5c
|
update recent 24
|
2023-08-08 13:23:01 +08:00 |
|
|
|
ccfc4eacba
|
update 检测统计数据
|
2023-08-08 10:16:53 +08:00 |
|
|
|
4c829d21f5
|
TODO: fix graphPage build*()
|
2023-08-07 17:05:09 +08:00 |
|
|
|
6852bc8c85
|
add line chart
|
2023-08-07 16:38:52 +08:00 |
|
|
|
c755ecc105
|
update pie chart
|
2023-08-07 16:09:25 +08:00 |
|
|
|
9947b2fa37
|
add pie chart
|
2023-08-07 15:23:19 +08:00 |
|
|
|
48d208a539
|
update
|
2023-08-07 13:45:04 +08:00 |
|
|
|
2febe5a12a
|
update 检测统计数据 search time
|
2023-08-07 10:46:26 +08:00 |
|
|
|
8fd1504dc0
|
update 检测统计
|
2023-08-04 16:56:11 +08:00 |
|
|
|
1c7e908d2e
|
add DetailGraph
|
2023-08-04 16:37:12 +08:00 |
|
|
|
291197a28d
|
add 数据总览弹窗
|
2023-08-04 16:33:46 +08:00 |
|
|
|
c7c89e2243
|
update 检测统计数据
|
2023-08-04 15:58:44 +08:00 |
|
|
|
14a626b766
|
add 质量检测统计和最近24小时数据
|
2023-08-04 14:54:30 +08:00 |
|
|
|
cee4ebfd43
|
Merge pull request 'lb' (#12) from lb into test
Reviewed-on: #12
|
2023-08-04 14:34:51 +08:00 |
|
|
|
1e538579a8
|
更新生产基础
|
2023-08-04 14:32:01 +08:00 |
|
|
|
33ff942fc6
|
Merge branch 'test' into lb
|
2023-08-04 14:24:48 +08:00 |
|
|
|
bd56b12560
|
update 完成dialogForm的字段监听更新逻辑
|
2023-08-04 14:22:42 +08:00 |
|
|
|
61a6e7dafb
|
update 更新dialogForm的关联监听方案
|
2023-08-04 11:24:12 +08:00 |
|
|
|
f5fb852d5d
|
update 质量检查信息记录
|
2023-08-04 11:08:21 +08:00 |
|
|
|
810b4b87a8
|
add 质量检测记录
|
2023-08-03 15:48:24 +08:00 |
|
|
|
4350bafa23
|
更新生产管理-生产基础
|
2023-08-03 15:27:39 +08:00 |
|
|
|
ecfed2eddf
|
Merge remote-tracking branch 'origin/test' into lb
|
2023-08-03 15:13:56 +08:00 |
|
|
|
4d0c0ae91a
|
update 基本完成质量基础
|
2023-08-03 15:09:15 +08:00 |
|
|
|
7c665484a7
|
update getCode逻辑
|
2023-08-03 15:03:59 +08:00 |
|
|
|
1299ebd0c9
|
update 安灯按钮
|
2023-08-03 14:45:38 +08:00 |
|
|
|
78777d5d24
|
update
|
2023-08-03 13:37:24 +08:00 |
|
