Commits · 0b6ef68d549d1cd5c4a840758ca85ea98470ae0e · dws / dwsproject · GitLab

26 Sep, 2025 4 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 0b6ef68d
  wangkangjie committed Sep 26, 2025
  
  0b6ef68d Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · ca3eefad
```
玖姿空值转换

See merge request !30
```
  马丽华 committed Sep 26, 2025
  ca3eefad Browse Files
- 玖姿空值转换 · ff93a123
  malihua committed Sep 26, 2025
  
  ff93a123 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 0e6dd7f1
  wangkangjie committed Sep 26, 2025
  
  0e6dd7f1 Browse Files
25 Sep, 2025 2 commits
- Merge branch 'mlh_jzjx_project' into 'master' · c7b10f38
```
收支表保存提速

See merge request !29
```
  马丽华 committed Sep 25, 2025
  c7b10f38 Browse Files
- 收支表保存提速 · d42fb772
  malihua committed Sep 25, 2025
  
  d42fb772 Browse Files
18 Sep, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 8e1ad18f
  wangkangjie committed Sep 18, 2025
  
  8e1ad18f Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 9802149c
```
结余字段存表

See merge request !28
```
  马丽华 committed Sep 18, 2025
  9802149c Browse Files
- 结余字段存表 · d0c23ebe
  malihua committed Sep 18, 2025
  
  d0c23ebe Browse Files
16 Sep, 2025 2 commits
- Merge branch 'hcw-dev' into 'master' · 3552e830
```
修改OEE计算公式

See merge request !27
```
  胡传伟 committed Sep 16, 2025
  3552e830 Browse Files
- 修改OEE计算公式 · 6327144f
  胡传伟 committed Sep 16, 2025
  
  6327144f Browse Files
15 Sep, 2025 4 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 4da2c6b6
  wangkangjie committed Sep 15, 2025
  
  4da2c6b6 Browse Files
- Merge branch 'jzjx_project' into 'master' · efd13e07
```
Jzjx project

See merge request !26
```
  马丽华 committed Sep 15, 2025
  efd13e07 Browse Files
- Merge branch 'mlh_jzjx_project' into 'jzjx_project' · 260a1d01
```
收入支出表接口换成SQL

See merge request !25
```
  马丽华 committed Sep 15, 2025
  260a1d01 Browse Files
- 收入支出表接口换成SQL · 9b8a20a0
  malihua committed Sep 15, 2025
  
  9b8a20a0 Browse Files
12 Sep, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · d7cef616
  wangkangjie committed Sep 12, 2025
  
  d7cef616 Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 034ca17e
```
收入支出表增加索引

See merge request !24
```
  马丽华 committed Sep 12, 2025
  034ca17e Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · ddebd0db
  wangkangjie committed Sep 12, 2025
  
  ddebd0db Browse Files
11 Sep, 2025 1 commit
- 时间利用率-设备默认选择一个 · f73f9799
  延飞李 committed Sep 11, 2025
  
  f73f9799 Browse Files
10 Sep, 2025 2 commits
- Merge branch 'mlh_jzjx_project' into 'jzjx_project' · 6a67ddfa
```
收入支出表增加索引

See merge request !23
```
  马丽华 committed Sep 10, 2025
  6a67ddfa Browse Files
- 收入支出表增加索引 · 85b49815
  malihua committed Sep 10, 2025
  
  85b49815 Browse Files
11 Aug, 2025 2 commits
- 荏原设备空闲率固定 · c0958ecb
  胡传伟 committed Aug 11, 2025
  
  c0958ecb Browse Files
- 荏原设备空闲率固定 · c2a9cb27
  胡传伟 committed Aug 11, 2025
  
  c2a9cb27 Browse Files
01 Aug, 2025 2 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 5502b037
  wangkangjie committed Aug 01, 2025
  
  5502b037 Browse Files
- OEE 时间利用率，都改成默认查看本月 · 794a91a5
  延飞李 committed Aug 01, 2025
  
  794a91a5 Browse Files
28 Jul, 2025 6 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 089cd798
  wangkangjie committed Jul 28, 2025
  
  089cd798 Browse Files
- 设备OEE时间利用率综合趋势，时间范围，默认选择月 · da511947
  延飞李 committed Jul 28, 2025
  
  da511947 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · abdbdfb9
  wangkangjie committed Jul 28, 2025
  
  abdbdfb9 Browse Files
- OEE 时间利用率中日均运行时间统计显示的百分比改为显示分钟 · 8814cb68
  延飞李 committed Jul 28, 2025
  
  8814cb68 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 05b3dd4b
  wangkangjie committed Jul 28, 2025
  
  05b3dd4b Browse Files
- OEE 时间使用率分析饼状图百分比显示优化 · 9d819237
  延飞李 committed Jul 28, 2025
  
  9d819237 Browse Files
25 Jul, 2025 4 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 40fdc7fa
  wangkangjie committed Jul 25, 2025
  
  40fdc7fa Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 5d8b76d7
  nningxx committed Jul 25, 2025
  
  5d8b76d7 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · e86ed4ef
  wangkangjie committed Jul 25, 2025
  
  e86ed4ef Browse Files
- oee table 修改 · 3d6611a7
  nningxx committed Jul 25, 2025
  
  3d6611a7 Browse Files
16 Jul, 2025 1 commit
- 更新金牛设备实时看板页面 · 15f1b20f
  guibin committed Jul 16, 2025
  
  15f1b20f Browse Files
11 Jul, 2025 2 commits
- 更新安灯数据看板 · c1835c7b
  guibin committed Jul 11, 2025
  
  c1835c7b Browse Files
- 更新安灯数据看板 · 78a4a8b1
  guibin committed Jul 11, 2025
  
  78a4a8b1 Browse Files
10 Jul, 2025 2 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 41241fc3
  wangkangjie committed Jul 10, 2025
  
  41241fc3 Browse Files
- qdry_project/static/src/view/oee_time_sequence_table.html · be33b028
  nningxx committed Jul 10, 2025
  
  be33b028 Browse Files