Commits · fcd44d15badadbcc14ab6bb7c0a286cb3571155a · dws / dwsproject · GitLab

20 Jun, 2025 21 commits
- 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
- 天合堂设备实时状态页面修改 · d67f5b13
  guibin committed Jun 20, 2025
  
  d67f5b13 Browse Files
- 合并分支 'tht-project' 到 'master' · 225ba05e
```
Tht project

查看合并请求 !18
```
  龚桂斌 committed Jun 20, 2025
  225ba05e Browse Files
- Merge branch 'master' into 'tht-project' · ed5de1a0
```
# Conflicts:
#   tht_project/static/src/view/equipment_status.html
```
  龚桂斌 committed Jun 20, 2025
  ed5de1a0 Browse Files
- 天合堂设备实时状态页面修改 · 6f51b7e9
  guibin committed Jun 20, 2025
  
  6f51b7e9 Browse Files
19 Jun, 2025 7 commits
- 地址更改 · bb40424e
  nningxx committed Jun 19, 2025
  
  bb40424e Browse Files
- emd · ea20e945
  nningxx committed Jun 19, 2025
  
  ea20e945 Browse Files
- 大屏菜单调整 · b48c70c8
  nningxx committed Jun 19, 2025
  
  b48c70c8 Browse Files
- 修改动画效果，去除固定环境访问 · 2a2c8198
  冀忠欣 committed Jun 19, 2025
  
  2a2c8198 Browse Files
- 大屏接口-2 · 4d4e63aa
  nningxx committed Jun 19, 2025
  
  4d4e63aa Browse Files
- 大屏接口-1 · 131bf153
  nningxx committed Jun 19, 2025
  
  131bf153 Browse Files
- 看板增加全屏功能 · 4ba1c53b
  冀忠欣 committed Jun 19, 2025
  
  4ba1c53b Browse Files
18 Jun, 2025 1 commit
- 增加单位展示 · 4966f52c
  冀忠欣 committed Jun 18, 2025
  
  4966f52c Browse Files
10 Jun, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · faff2243
  wangkangjie committed Jun 10, 2025
  
  faff2243 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · ab49a5f5
  guibin committed Jun 10, 2025
  
  ab49a5f5 Browse Files
- 将/roke/workstation/plant/tree接口设置成无需登录 · bbf327f5
  guibin committed Jun 10, 2025
  
  bbf327f5 Browse Files
09 Jun, 2025 2 commits
- add 大屏页面-1 · d9e064f0
  nningxx committed Jun 09, 2025
  
  d9e064f0 Browse Files
- add 大屏页面 · 50d6d346
  nningxx committed Jun 09, 2025
  
  50d6d346 Browse Files
05 Jun, 2025 4 commits
- add 设备sort · f8b6d9cd
  nningxx committed Jun 05, 2025
  
  f8b6d9cd Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · de1c5bbf
  wangkangjie committed Jun 05, 2025
  
  de1c5bbf Browse Files
- 合并分支 'jzjx_project' 到 'master' · 852cd7dc
```
Jzjx project

查看合并请求 !17
```
  龚桂斌 committed Jun 05, 2025
  852cd7dc Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · e6315c8d
  wangkangjie committed Jun 05, 2025
  
  e6315c8d Browse Files
04 Jun, 2025 2 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · d9373859
  guibin committed Jun 04, 2025
  
  d9373859 Browse Files
- 修改荏原模块名称 · 4abcdfdc
  guibin committed Jun 04, 2025
  
  4abcdfdc Browse Files