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

2287 Commits

Author SHA1 Message Date
XieYongHong 9ba07046e3
fix: 优化第三方应用菜单集成 
* fix: 优化第三方应用菜单集成

* fix: bug#20731

* fix: 修改lodash依赖包

* fix: bug#20731
 2023-12-04 16:36:59 +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 feb8dcddb9
feat: 新增字典管理；新增s7；新增默认流程引擎菜单权限 
* fix: 优化初始化流程引擎菜单数据权限

* feat: 新增S7

* feat(s7): 数据采集增加S7协议

* fix: s7点位死区校验

* fix: bug#19996

* fix: bug#20211

* fix: bug#20211

* fix: s7点位配置

* fix: s7点位死区校验

* fix: s7点位配置

* fix: 优化流程引擎字段权限

* fix: 优化流程引擎字段权限

* fix: s7按钮权限

* fix: 修复s7点位bug

* fix: 修复s7点位bug

* fix: s7点位bug修复

* fix: s7点位bug修复

* fix: bug#20382

* fix: bug#19996

* fix: bug#19649

* feat: 导入通道校验

* feat(s7): 数据采集增加S7协议

* fix: s7点位死区校验

* fix: s7点位配置

* fix: 修复s7点位bug

* fix: s7点位bug修复

* feat: 新增点位导入功能

* feat: 新增导入功能

* feat: 导入通道校验

* fix: 优化内部应用页面集成

* * fix: 修改导入图标

* fix: 修改导入图标

* bug#20101

* fix: bug#20449

* fix: bug#20488

* fix: bug#20495

* fix: bug#20101

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

* feat: api新增菜单

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

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

* fix: bug#20293

* fix: bug#20430

* fix: s7修改导入图标

* fix: 修改导入图标

* fix: 优化集成页面路径
 2023-11-23 14:09:54 +08:00
XieYongHong 97aa65dd98 fix: 优化集成页面路径 2023-11-23 13:55:57 +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
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
XieYongHong 345be95d1d
fix: bug#19771、20134、20211 
* fix: bug#19771

* fix: bug#20134

* fix: bug#20211
 2023-11-14 13:55:05 +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
XieYongHong 0ff347fded
fix: bug#19588、19904、19950 
* fix: 菜单详情按钮管理编码改变权限回流bug

* fix: 菜单bug

* fix: bug#19588

* fix: bug#19904

* fix: bug#19950
 2023-11-09 17:48:28 +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 f473124ce8
fix: bug#19215、19214、19213、19183、19060、19090、19167、19090 
* fix: 优化物模型配置按钮样式

* fix: bug#18263

* fix: 优化iframe中hash地址

* fix: bug#19132

* fix: bug#19071

* Dev bug (#217)

* fix: bug#19215、19214、19213、19183

* fix: bug#19060、19090

* fix: bug#19167

* fix: bug#19080

* fix: bug#19181

* fix: bug#19060、19090

* fix: bug#19181

* fix: iframe组件优化没有参数时，url格式
 2023-10-30 16:42:00 +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
XieYongHong 6f59a150d3 fix: bug#19130 2023-10-18 18:13:30 +08:00
XieYongHong 2c891e7f49 fix: 优化设备批量导出查询条件 2023-10-16 15:45:31 +08:00
XieYongHong c4ddde59ab fix: 优化设备批量导出查询条件 2023-10-16 15:32:50 +08:00
qiaochuLei ad04405afb
fix: bug#18784 
* fix: bug#18784
 2023-10-12 18:00:27 +08:00
qiaochuLei e6205e6602
fix: bug#18996 
* fix: bug#16956

* fix: bug#18996
 2023-10-11 17:34:25 +08:00
XieYongHong 5f41a9a125 fix: 优化查询条件；合并dev部分代码 2023-10-10 10:25:30 +08:00
XieYongHong 035281ba06 fix: 优化查询条件 2023-10-10 10:20:15 +08:00
qiaochuLei 3b3f379c03
fix: bug#18975、18961、16956 
* fix: bug#16958

* fix: bug#18961、18962、18872

* fix: bug#18961、16956

* fix: bug#18975
 2023-10-10 09:50:25 +08:00
qiaochuLei 1e80c57181
fix: bug#18961、18962、18872 
* fix: bug#18772

* fix: bug#16958

* fix: bug#18961、18962、18872
 2023-10-08 18:31:01 +08:00
XieYongHong ac074990cb
fix: bug#16958、18772、系统菜单非选中状态不显示 
* fix: bug#视频回放加载bug

* fix: bug#18502

* fix: bug#视频回放加载bug

* fix: bug#18156

* fix: bug#16958、18772

* fix: bug#18674

* feat: 系统菜单非选中状态不显示bug

* fix: bug#18772

* fix: bug#16958
 2023-10-08 11:22:06 +08:00
qiaochuLei f55df1e8ca
fix: bug#16958、18772 
* fix: bug#18674

* feat: 系统菜单非选中状态不显示bug

* fix: bug#18772

* fix: bug#16958
 2023-10-08 09:50:10 +08:00
XieYongHong 90104848c1 fix: bug#18156 2023-10-07 15:11:39 +08:00
XieYongHong c3286b6661
fix: bug#视频回放加载bug 
* fix: 物联网卡首页图片加载失败

* fix: 边缘端映射bug

* fix: bug#18502

* fix: bug#视频回放加载bug
 2023-09-25 14:05:28 +08:00
qiaochuLei 41ea25f927
fix: bug#视频回放加载bug 
* fix: bug#18502

* fix: bug#视频回放加载bug
 2023-09-20 19:53:42 +08:00
qiaochuLei 566df47ce8
fix: 边缘端映射bug 
* fix: 物联网卡首页图片加载失败

* fix: 边缘端映射bug
 2023-09-20 10:04:14 +08:00
qiaochuLei d8f712471f
fix: bug#18148;解决合并冲突 
* fix: bug#13639、17665

* fix: bug#18148

* fix: 回退上次版本

* fix: 解决合并冲突
 2023-09-14 09:28:04 +08:00
XieYongHong ae4354f28a
fix: bug#18002、17889、17665、17684 
* fix: 放开设备区版中运维cpu、jvm

* fix: 添加产品物模型规则TS，添加 tcp粘拆包TS

* fix: bug#17584

* fix: bug#17605、规则属性脚本提示语

* fix: 系统管理菜单管理

* fix: tcp粘拆包TS

* fix: 产品物模型规则TS

* fix: bug#17631、17625、17578

* fix: bug#17631、17625、17578

* fix: 优化jetlinks-ui-components按需引入插件

* fix: bug#17651、17633、视频分享点位bug及样式

* fix: bug#17651、17633、视频分享点位bug及样式

* fix: 视频屏蔽RTC


* fix: bug#17668

* fix: 视频屏蔽RTC

* fix: 修改组件按需引入插件

* fix: bug#17687

 fix: bug#17687

* fix: bug#17715、17705、17699、17696

* fix: bug#17696、17694、17693、17691、17676

* fix: bug#17715、17705、17699、17696

* fix: bug#17758

* fix: 提取ipv4和ipv6校验

* fix: bug#17758

* fix: 社区版优化告警，菜单

fix: 社区版优化告警，菜单

* fix: bug#18002、17889、17665、17684

* fix: bug#17781、17791、17847、17849、17666、17667、17670

* fix: bug#17617

* fix: bug#17665、17684

* fix: bug#17889

* fix: bug#18002
 2023-09-08 19:07:44 +08:00
qiaochuLei 0dc60d125f
fix: bug#18002、17889、17665、17684 
* fix: bug#17781、17791、17847、17849、17666、17667、17670

* fix: bug#17617

* fix: bug#17665、17684

* fix: bug#17889

* fix: bug#18002
 2023-09-08 10:12:08 +08:00
qiaochuLei 7f0d66c486
fix: 社区版优化告警，菜单 
fix: 社区版优化告警，菜单
 2023-09-01 15:12:43 +08:00
qiaochuLei 6f41c16874
fix: bug#17758 
* fix: 提取ipv4和ipv6校验

* fix: bug#17758
 2023-09-01 10:31:20 +08:00
qiaochuLei c9a6e97795
fix: bug#17715、17705、17699、17696 
* fix: bug#17696、17694、17693、17691、17676

* fix: bug#17715、17705、17699、17696
 2023-08-31 15:51:07 +08:00
qiaochuLei 06a323e6f0
fix: bug#17687 
fix: bug#17687
 2023-08-30 10:59:48 +08:00
XieYongHong fa255488f2
fix: 修改组件按需引入插件 
* fix: bug#17668

* fix: 视频屏蔽RTC

* fix: 修改组件按需引入插件
 2023-08-29 19:03:11 +08:00
qiaochuLei 9bcda35de4
fix: 视频屏蔽RTC 
* fix: bug#17668

* fix: 视频屏蔽RTC
 2023-08-28 14:14:44 +08:00