Commits · 7bd63c2e98eb5c0f3d1d5a1ad575803d6e60736e · dws / dwsproject · GitLab

26 Jun, 2025 6 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 7bd63c2e
  wangkangjie committed Jun 26, 2025
  
  7bd63c2e Browse Files
- 合并分支 'renyuan-oee' 到 'master' · d54af864
```
oee 时间表 修改-1

查看合并请求 !21
```
  柏宁宁 committed Jun 26, 2025
  d54af864 Browse Files
- oee 时间表修改-1 · a629d7b2
  nningxx committed Jun 26, 2025
  
  a629d7b2 Browse Files
- tht合并到master · 9d0fe1d7
  nningxx committed Jun 26, 2025
  
  9d0fe1d7 Browse Files
- 合并分支 'tht-nn' 到 'tht-project' · 3d3bbfe2
```
add 报警信息接口

查看合并请求 !20
```
  柏宁宁 committed Jun 26, 2025
  3d3bbfe2 Browse Files
- add 报警信息接口 · cb425818
  nningxx committed Jun 26, 2025
  
  cb425818 Browse Files
25 Jun, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 64505bea
  wangkangjie committed Jun 25, 2025
  
  64505bea Browse Files
- 荏原新增oee 时间利用率报表个性化需求 · a9d775ec
  nningxx committed Jun 25, 2025
  
  a9d775ec Browse Files
- 合并分支 'renyuan-oee' 到 'master' · a7dce4c0
```
荏原 新增oee 时间利用率报表 个性化需求

查看合并请求 !19
```
  柏宁宁 committed Jun 25, 2025
  a7dce4c0 Browse Files
24 Jun, 2025 1 commit
- 大屏看板电视适配 · f8f15897
  冀忠欣 committed Jun 24, 2025
  
  f8f15897 Browse Files
23 Jun, 2025 4 commits
- 添加金牛模块 · df835fc2
  guibin committed Jun 23, 2025
  
  df835fc2 Browse Files
- 天和堂注释报错视图 · d3e20d66
  guibin committed Jun 23, 2025
  
  d3e20d66 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 77a2b753
  guibin committed Jun 23, 2025
  
  77a2b753 Browse Files
- 天合堂设备模型添加序号字段 · 2effd657
  guibin committed Jun 23, 2025
  
  2effd657 Browse Files
21 Jun, 2025 2 commits
- 修改天合堂设备实时看板页面 · 06f00976
  冀忠欣 committed Jun 21, 2025
  
  06f00976 Browse Files
- 修改 uel · 1d22e10b
  nningxx committed Jun 21, 2025
  
  1d22e10b Browse Files
20 Jun, 2025 24 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 07afdc43
  wangkangjie committed Jun 20, 2025
  
  07afdc43 Browse Files
- oee report update -4 · 00cc86c9
  nningxx committed Jun 20, 2025
  
  00cc86c9 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 4c3b3b69
  wangkangjie committed Jun 20, 2025
  
  4c3b3b69 Browse Files
- oee report update -3 · 48f37839
  nningxx committed Jun 20, 2025
  
  48f37839 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · fcd44d15
  wangkangjie committed Jun 20, 2025
  
  fcd44d15 Browse Files
- oee report update -2 · 2f2cd7c1
  nningxx committed Jun 20, 2025
  
  2f2cd7c1 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 303d7201
  wangkangjie committed Jun 20, 2025
  
  303d7201 Browse Files
- oee report update · b02cc4a6
  nningxx committed Jun 20, 2025
  
  b02cc4a6 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · b10ef5d8
  wangkangjie committed Jun 20, 2025
  
  b10ef5d8 Browse Files
- 任原设备利用率设备添加排序 · d26a34b6
  guibin committed Jun 20, 2025
  
  d26a34b6 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 7bf81f54
  wangkangjie committed Jun 20, 2025
  
  7bf81f54 Browse Files
- 任原设备利用率设备添加排序 · b31afb4c
  guibin committed Jun 20, 2025
  
  b31afb4c Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 6ae615c8
  wangkangjie committed Jun 20, 2025
  
  6ae615c8 Browse Files
- 任原设备利用率设备添加排序 · 117c0c36
  guibin committed Jun 20, 2025
  
  117c0c36 Browse Files
- 任原设备利用率设备添加排序 · b5c0cd36
  guibin committed Jun 20, 2025
  
  b5c0cd36 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · ed7f991f
  wangkangjie committed Jun 20, 2025
  
  ed7f991f Browse Files
- 任原设备利用率设备添加排序 · 773095bb
  guibin committed Jun 20, 2025
  
  773095bb Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · c616b694
  wangkangjie committed Jun 20, 2025
  
  c616b694 Browse Files
- 任原设备利用率设备添加排序 · fa2d7452
  guibin committed Jun 20, 2025
  
  fa2d7452 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · a2415e75
  wangkangjie committed Jun 20, 2025
  
  a2415e75 Browse Files
- 任原设备利用率设备添加排序 · 0706a370
  guibin committed Jun 20, 2025
  
  0706a370 Browse Files
- 处理冲突 · 6d587a4e
  冀忠欣 committed Jun 20, 2025
  
  6d587a4e Browse Files
- 天合堂设备实时状态页面修改 · d67f5b13
  guibin committed Jun 20, 2025
  
  d67f5b13 Browse Files
- 合并分支 'tht-project' 到 'master' · 225ba05e
```
Tht project

查看合并请求 !18
```
  龚桂斌 committed Jun 20, 2025
  225ba05e Browse Files