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 |
|
|
|
c357ab8005
|
update 质量检测信息
|
2023-08-03 11:35:16 +08:00 |
|
|
|
01f459e811
|
公共样式
|
2023-08-03 11:18:03 +08:00 |
|
|
|
a402a8bf63
|
update
|
2023-08-03 10:51:44 +08:00 |
|
|
|
d3760f5dee
|
update quality type
|
2023-08-02 15:25:44 +08:00 |
|
|
|
006e94a865
|
apply DialogForm & debug
|
2023-08-02 15:16:40 +08:00 |
|
|
|
b6e4767346
|
add mixin & dialog
|
2023-08-02 11:27:33 +08:00 |
|
|
|
77688fed77
|
update 质量信息
|
2023-08-02 09:49:14 +08:00 |
|
|
|
0719116cbc
|
班组
|
2023-08-02 09:17:46 +08:00 |
|
|
|
6d4f44fd68
|
update 质量信息
|
2023-08-01 17:01:59 +08:00 |
|
|
|
30e8548a0d
|
update 质量检测类型
|
2023-08-01 16:42:17 +08:00 |
|
|
|
63931b883c
|
update 质量类型
|
2023-08-01 14:02:36 +08:00 |
|
|
|
6fdc9b2826
|
update 质量类型
|
2023-08-01 11:20:37 +08:00 |
|
|
|
443ca29d3f
|
update 质量类型
|
2023-07-31 17:04:07 +08:00 |
|
|
|
3efb35d31d
|
update file structure
|
2023-07-27 15:37:53 +08:00 |
|
|
|
1c64bafdf8
|
add Files
|
2023-07-27 15:16:13 +08:00 |
|
|
|
b6dd73370d
|
add code-brick-zj
|
2023-07-26 15:28:41 +08:00 |
|
|
|
0fca3e1ec4
|
'init'
|
2023-07-26 09:54:50 +08:00 |
|
