XieYongHong
|
784034c5cb
|
Merge branch 'dev' into dev-dictionary
|
2023-11-15 16:26:59 +08:00 |
hear
|
7b727d5587
|
fix: 修复s7点位bug
* fix: 修复s7点位bug
|
2023-11-15 16:25:00 +08:00 |
XieYongHong
|
ec928a87c5
|
fix: s7按钮权限
|
2023-11-15 16:17:48 +08:00 |
XieYongHong
|
eb60514999
|
fix: 优化流程引擎字段权限
|
2023-11-15 16:14:42 +08:00 |
XieYongHong
|
3dd7a4d358
|
fix: 优化流程引擎字段权限
|
2023-11-15 16:03:13 +08:00 |
XieYongHong
|
697c13f713
|
Merge branch 'dev' into dev-dictionary
|
2023-11-15 14:05:14 +08:00 |
hear
|
884e8918e8
|
fix: s7点位配置
* fix: s7点位死区校验
* fix: s7点位配置
|
2023-11-15 14:04:49 +08:00 |
XieYongHong
|
8294b83437
|
fix: bug#19996
|
2023-11-15 09:39:16 +08:00 |
XieYongHong
|
7e550f4558
|
Merge branch 'dev' into dev-dictionary
|
2023-11-14 17:55:47 +08:00 |
hear
|
f23451be31
|
feat: 新增S7
* feat(s7): 数据采集增加S7协议
* fix: s7点位死区校验
|
2023-11-14 17:22:10 +08:00 |
XieYongHong
|
858f6ae275
|
fix: 优化初始化流程引擎菜单数据权限
|
2023-11-14 14:06:03 +08:00 |
qiaochuLei
|
f3c5ed3a23
|
fix: bug#20211
* fix: bug#20211
|
2023-11-14 13:39:34 +08:00 |
leiqiaochu
|
35db2f350e
|
fix: 解决冲突
|
2023-11-13 18:13:15 +08:00 |
XieYongHong
|
b83dcef019
|
Merge branch 'dev' into dev-dictionary
# Conflicts:
# src/views/system/User/components/EditUserDialog.vue
|
2023-11-13 17:50:25 +08:00 |
qiaochuLei
|
ed6ed70e7f
|
fix: bug#20134
* fix: bug#19771
* fix: bug#20134
|
2023-11-13 15:03:40 +08:00 |
leiqiaochu
|
35b574d7da
|
fix: bug#20093
|
2023-11-13 10:20:12 +08:00 |
leiqiaochu
|
2777cca778
|
fix: bug#19994
|
2023-11-10 14:34:42 +08:00 |
qiaochuLei
|
8c44d9704b
|
fix: bug#19950、19904、19588
* fix: 菜单详情按钮管理编码改变权限回流bug
* fix: 菜单bug
* fix: bug#19588
* fix: bug#19904
* fix: bug#19950
|
2023-11-09 17:35:43 +08:00 |
XieYongHong
|
6f169b327a
|
fix: 优化工作流菜单权限
|
2023-11-09 16:08:50 +08:00 |
qiaochuLei
|
8ec7f87924
|
fix: bug#19950
* fix: bug#19588
* fix: bug#19904
* fix: bug#19950
|
2023-11-09 16:01:49 +08:00 |
qiaochuLei
|
f9bc87a39d
|
fix: bug#19771
* fix: bug#19771
|
2023-11-09 15:34:31 +08:00 |
qiaochuLei
|
8d941fd875
|
fix: bug#19588
* fix: 菜单bug
* fix: bug#19588
|
2023-11-02 10:09:32 +08:00 |
qiaochuLei
|
d2fd316ef5
|
fix: bug#19117、19108
* fix: bug#19108
* fix: bug#19117
* fix: bug#19117
|
2023-10-31 14:53:57 +08:00 |
XieYongHong
|
56052135c0
|
fix: 优化菜单配置
|
2023-10-31 10:22:02 +08:00 |
XieYongHong
|
5dd01e5863
|
fix: iframe组件优化没有参数时,url格式
|
2023-10-30 11:28:36 +08:00 |
XieYongHong
|
ff98143f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-27 15:03:19 +08:00 |
qiaochuLei
|
e215fb57be
|
fix: bug#19181
* fix: bug#19060、19090
* fix: bug#19181
|
2023-10-27 15:01:07 +08:00 |
XieYongHong
|
5382aee3fe
|
fix: bug#19080
|
2023-10-27 15:00:05 +08:00 |
XieYongHong
|
aa0ffab927
|
fix: bug#19167
|
2023-10-27 14:32:40 +08:00 |
qiaochuLei
|
f2317db02d
|
Dev bug (#217)
* fix: bug#19215、19214、19213、19183
* fix: bug#19060、19090
|
2023-10-26 15:17:10 +08:00 |
XieYongHong
|
f319d4e0e2
|
fix: bug#19071
|
2023-10-24 18:26:36 +08:00 |
XieYongHong
|
f90ee686c1
|
fix: bug#19132
|
2023-10-24 15:48:13 +08:00 |
XieYongHong
|
7cae540c88
|
fix: 优化iframe中hash地址
|
2023-10-24 15:46:48 +08:00 |
XieYongHong
|
d255a0bc78
|
fix: bug#18263
|
2023-10-24 15:28:34 +08:00 |
XieYongHong
|
16d9f5a158
|
fix: 优化物模型配置按钮样式
|
2023-10-24 10:24:13 +08:00 |
XieYongHong
|
09d77f4b07
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-23 18:40:29 +08:00 |
qiaochuLei
|
d1dff88218
|
* fix: 子设备绑定与解绑
* fix: bug#19092、19086
* fix: 子设备绑定与解绑
|
2023-10-23 18:11:14 +08:00 |
XieYongHong
|
633316ac84
|
fix: bug#17054
|
2023-10-23 16:44:17 +08:00 |
XieYongHong
|
ec66a46e96
|
fix: bug#17054
|
2023-10-23 16:17:11 +08:00 |
XieYongHong
|
4ce90a88b5
|
fix: bug#19121
|
2023-10-23 15:20:22 +08:00 |
XieYongHong
|
8548138cf5
|
fix: bug#19087
* fix: bug#19087
|
2023-10-23 13:49:16 +08:00 |
XieYongHong
|
70a1cf2197
|
fix: 修复设备功能-执行包含object类型时异常
|
2023-10-23 11:51:17 +08:00 |
XieYongHong
|
057de400fe
|
fix: bug#18733
|
2023-10-23 09:36:46 +08:00 |
XieYongHong
|
50a9d83270
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-20 18:09:15 +08:00 |
qiaochuLei
|
0453eb669f
|
fix: bug#19118
* fix: bug#19118
|
2023-10-20 18:09:00 +08:00 |
XieYongHong
|
a00232ce24
|
fix: bug#19132
|
2023-10-20 18:07:29 +08:00 |
XieYongHong
|
369b8484ac
|
fix: 优化内部应用集成
|
2023-10-20 17:26:14 +08:00 |
qiaochuLei
|
cb4716f37d
|
fix: bug#19135、19137
* fix: bug#19125、19111
* fix: bug#19135、19137
|
2023-10-20 16:55:31 +08:00 |
XieYongHong
|
564ab3a0ea
|
fix: bug#19087
|
2023-10-19 18:08:56 +08:00 |
XieYongHong
|
283baa6816
|
fix: bug#19069
* fix: bug#19041
* fix: bug#19069
|
2023-10-19 10:54:21 +08:00 |