0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,449 Commits 1 Branch 0 Tags 33 MiB
Commit Graph

2449 Commits

Author SHA1 Message Date
XieYongHong 7a226b7af3 fix: 优化docker 2023-12-12 15:06:10 +08:00
XieYongHong a41f2db435 fix: 优化nginx配置server_name 2023-12-12 15:05:52 +08:00
XieYongHong 4b05fa0c8c fix: 优化lodash-es 2023-12-12 15:05:15 +08:00
XieYongHong be6bafa29f fix: 优化iframe样式 2023-12-05 15:57:59 +08:00
XieYongHong 262a591cfd fix: bug#20763、20736、20731 2023-12-05 11:01:57 +08:00
XieYongHong 9e59fd19bc fix: 优化菜单管理查询 2023-12-05 10:44:57 +08:00
qiaochuLei 2b57d81eb9
fix: bug#20731 
* fix: 修改lodash依赖包

* fix: bug#20731
 2023-11-30 17:09:50 +08:00
XieYongHong 4eedc5812c fix: 优化第三方应用菜单集成 2023-11-29 19:33:07 +08:00
qiaochuLei 506ac2702d
fix: bug#20708 
* fix: bug#物模型新增改造

* fix: bug#20708
 2023-11-29 09:45:37 +08:00
XieYongHong e6cba52cf3 fix: bug#20430 2023-11-28 15:52:17 +08:00
qiaochuLei 95f6f45e88
fix: bug#物模型新增改造 
* fix: bug#物模型新增改造
 2023-11-28 15:45:58 +08:00
qiaochuLei 809a66956c
fix: 用户管理用户名不包含中文 
* fix: 用户管理用户名不包含中文
 2023-11-25 17:33:58 +08:00
qiaochuLei 9cc9e268ed
feat: 第三方集成新增菜单 
* feat: 第三方集成新增菜单
 2023-11-25 14:02:23 +08:00
XieYongHong 97aa65dd98 fix: 优化集成页面路径 2023-11-23 13:55:57 +08:00
qiaochuLei 2aecee7be3
fix: s7修改导入图标 
* fix: 修改导入图标
 2023-11-23 10:19:33 +08:00
XieYongHong 4bd1bcceda fix: bug#20430 2023-11-23 10:16:34 +08:00
qiaochuLei 6c8e8f3608
feat: 集成菜单新增菜单功能 
* feat: api新增菜单

* feat: 集成菜单新增菜单功能

* feat: 集成菜单应用新增菜单

* fix: bug#20293
 2023-11-23 10:09:19 +08:00
qiaochuLei 708078e03b
bug#20101 
* fix: bug#20449

* fix: bug#20488

* fix: bug#20495

* fix: bug#20101
 2023-11-23 09:57:02 +08:00
qiaochuLei c3195997a0
* fix: 修改导入图标 
* fix: 修改导入图标
 2023-11-21 10:52:05 +08:00
XieYongHong f61630df8f fix: 优化内部应用页面集成 2023-11-17 17:15:00 +08:00
XieYongHong 9f95f3034d Merge branch 'dev' into dev-dictionary 2023-11-17 13:57:39 +08:00
qiaochuLei 9517cbb954
feat: 导入通道校验 
* feat(s7): 数据采集增加S7协议

* fix: s7点位死区校验

* fix: s7点位配置

* fix: 修复s7点位bug

* fix: s7点位bug修复

* feat: 新增点位导入功能

* feat: 新增导入功能

* feat: 导入通道校验
 2023-11-17 13:48:46 +08:00
leiqiaochu 70d84cefd3 fix: bug#19649 2023-11-16 15:33:55 +08:00
leiqiaochu ebee9f9e71 fix: bug#19996 2023-11-16 14:51:55 +08:00
leiqiaochu 6252259ff0 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary 2023-11-16 14:41:13 +08:00
leiqiaochu 057ab09612 fix: bug#20382 2023-11-16 14:39:59 +08:00
XieYongHong dcc6afc6b7 Merge branch 'dev' into dev-dictionary 2023-11-15 18:12:24 +08:00
hear d304baf94f
fix: s7点位bug修复 
* fix: s7点位bug修复
 2023-11-15 18:11:46 +08:00
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