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 |
qiaochuLei
|
7791712a3f
|
fix: bug#20211
* fix: bug#20211
|
2023-11-15 14:04:12 +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 |
|
XieYongHong
|
1575690166
|
Merge branch 'dev' into dev-dictionary
|
2023-11-09 16:03:42 +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 |
|
leiqiaochu
|
592c4f116e
|
fix: bug#19771
|
2023-11-09 14:19:50 +08:00 |
|
XieYongHong
|
086df3e2e1
|
fix: 优化工作流菜单权限
|
2023-11-08 11:25:10 +08:00 |
|
XieYongHong
|
7c67618dce
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-11-07 17:32:04 +08:00 |
|
XieYongHong
|
a087566f4d
|
fix: 优化工作流菜单权限
|
2023-11-07 17:31:50 +08:00 |
100011797
|
ce1260d561
|
fix: 19361、19656
|
2023-11-07 14:22:51 +08:00 |
|
XieYongHong
|
0ffb6a92c9
|
fix: 优化工作流菜单权限
|
2023-11-07 09:57:58 +08:00 |
|
XieYongHong
|
9dabe5c103
|
fix: 优化store中权限类型
|
2023-11-06 19:23:28 +08:00 |
|
XieYongHong
|
8aa0c7365f
|
fix: 优化初始权限
|
2023-11-06 19:19:35 +08:00 |
|
XieYongHong
|
8c8911b580
|
fix: 删除多余权限
|
2023-11-03 17:34:22 +08:00 |
|
XieYongHong
|
5e3c603bb5
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-11-03 16:56:56 +08:00 |
|
XieYongHong
|
2635f78890
|
fix: 修改初始化数据
|
2023-11-03 16:54:30 +08:00 |
|
leiqiaochu
|
bdb150609b
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-11-03 14:04:27 +08:00 |
|
leiqiaochu
|
44ad3ccab5
|
fix: bug#19699、19666、19655
|
2023-11-03 14:03:51 +08:00 |
|
XieYongHong
|
82aeb6b522
|
fix: 修改订阅关于工作流的标识
|
2023-11-02 10:47:01 +08:00 |
|
XieYongHong
|
3fc10962ae
|
Merge branch 'dev' into dev-dictionary
|
2023-11-02 10:37:40 +08:00 |
|
XieYongHong
|
09704d42a9
|
fix: 优化初始化菜单配置
|
2023-11-02 10:37:10 +08:00 |
|
XieYongHong
|
e1e1ed4a27
|
fix: 优化初始化菜单配置
|
2023-11-02 10:13:57 +08:00 |
|
qiaochuLei
|
8d941fd875
|
fix: bug#19588
* fix: 菜单bug
* fix: bug#19588
|
2023-11-02 10:09:32 +08:00 |
|
leiqiaochu
|
33c92b72e1
|
feat: 站内信工作流通知
|
2023-11-01 11:32:50 +08:00 |
|
XieYongHong
|
b79e345cc5
|
Merge branch 'dev' into dev-dictionary
|
2023-10-31 14:57:31 +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 |
|
leiqiaochu
|
28a5c230e4
|
fix: bug#19251
|
2023-10-30 17:23:55 +08:00 |
|
leiqiaochu
|
d3835c3184
|
fix: bug#19355
|
2023-10-30 13:57:09 +08:00 |
|
XieYongHong
|
22d1022189
|
Merge branch 'dev' into dev-dictionary
|
2023-10-30 11:51:22 +08:00 |
|
XieYongHong
|
5dd01e5863
|
fix: iframe组件优化没有参数时，url格式
|
2023-10-30 11:28:36 +08:00 |
|
XieYongHong
|
2abc3362c8
|
Merge branch 'dev' into dev-dictionary
# Conflicts:
# package.json
# src/store/menu.ts
# src/utils/menu.ts
# src/views/device/Instance/Detail/components/BindParentDevice/index.vue
# src/views/system/Menu/Detail/BasicInfo.vue
# src/views/system/Menu/index.vue
# yarn.lock
|
2023-10-27 15:15:58 +08:00 |