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

2291 Commits

Author SHA1 Message Date
100011797 3349285590 fix: 16802 2023-07-27 16:12:10 +08:00
XieYongHong ade8401638 fix: 新增通道添加circuitBreaker属性 2023-07-27 15:35:14 +08:00
100011797 a110003d87 fix: 修改bug 2023-07-27 15:08:34 +08:00
XieYongHong 94a2a2c5ec fix: bug#16782;修改数采值为COLLECTOR_GATEWAY; 2023-07-27 14:49:15 +08:00
XieYongHong 749c36bf48
fix: 修改物模型-指标值float,double值问题 
fix: 修改物模型-指标值float,double值问题
 2023-07-27 13:45:17 +08:00
XieYongHong a56083e0e3 fix: 修改物模型-指标值float,double值问题 2023-07-27 10:19:28 +08:00
XieYongHong 7faa15eb58 fix: 优化个人中心菜单 2023-07-27 10:15:24 +08:00
XieYongHong 9b9b316a5a
fix: 修改设备透传默认脚本 
* fix: 优化物模型-全屏编辑

* fix: 优化物模型-枚举校验

* fix: 修改设备透传默认脚本
 2023-07-27 09:52:39 +08:00
XieYongHong d3605ec8f0 fix: 修改设备透传默认脚本 2023-07-27 09:18:10 +08:00
XieYongHong d2122de264 fix: 优化物模型-枚举校验 2023-07-27 09:09:41 +08:00
XieYongHong 0742110e69 fix: 优化物模型-全屏编辑 2023-07-26 17:57:57 +08:00
XieYongHong f2514fce8f
fix: 处理额外子路由 
fix: 处理额外子路由
 2023-07-26 13:56:40 +08:00
XieYongHong bdc85b877a fix: 处理额外子路由 2023-07-26 13:42:54 +08:00
100011797 02b367561b fix: 16771、16774、16719 2023-07-26 11:38:28 +08:00
XieYongHong 49cf7c5594
fix: 优化monaco-editor编辑；修改我的订阅；修复运维管理仪表盘在暂无数据情况下切换导致无数据展示问题 
* fix: 优化菜单跳转

* fix: 优化菜单跳转

* fix: bug#16693

* feat: task#2572

* fix: 优化物模型映射保存请求异常

* fix: 修复运维管理仪表盘在暂无数据情况下切换导致无数据展示问题

* fix: 修改订阅管理文字提示

* fix: totalFlow

* fix: 修改我的订阅

* fix: 优化monaco-editor编辑
 2023-07-26 10:09:06 +08:00
XieYongHong 5205755817 fix: 优化设备接入新增类型 2023-07-25 20:02:45 +08:00
XieYongHong 992e9a0aab fix: 优化gateway的采集器新增，点位新增 2023-07-25 19:50:58 +08:00
100011797 49b3dce2e3 fix: 修改我的订阅 2023-07-25 14:58:38 +08:00
XieYongHong ccbdef9f3c fix: 修改菜单额外路由无法访问问题 2023-07-25 14:27:47 +08:00
XieYongHong 80aa27a14e feat: 修改设备接入网关Modbus、opcua为数采设备接入 2023-07-25 14:18:38 +08:00
100011797 e65a7c4c6d fix: totalFlow 2023-07-24 18:09:49 +08:00
100011797 8d874e27a6 fix: 修改订阅管理文字提示 2023-07-24 17:57:05 +08:00
XieYongHong 8a3662419f fix: 修复运维管理仪表盘在暂无数据情况下切换导致无数据展示问题 2023-07-24 14:45:57 +08:00
XieYongHong b52119fc6e fix: 优化物模型映射保存请求异常 2023-07-24 13:44:40 +08:00
XieYongHong 1a668326c3 feat: task#2572 2023-07-24 11:23:28 +08:00
XieYongHong 83bde12038 fix: bug#16693 2023-07-24 09:45:05 +08:00
XieYongHong 69dfc01b0d fix: 优化菜单跳转 2023-07-24 09:34:53 +08:00
XieYongHong d9f67af30b fix: 优化菜单跳转 2023-07-21 18:49:10 +08:00
XieYongHong 77dc3347a8 fix: bug#16654 2023-07-21 14:37:49 +08:00
XieYongHong 143144a64e
fix: 优化代码编辑器动态d.ts提示失效 
fix: 优化代码编辑器动态d.ts提示失效
 2023-07-21 11:07:25 +08:00
XieYongHong 83d150bb13 fix: 优化代码编辑器动态d.ts提示失效 2023-07-21 11:01:51 +08:00
XieYongHong bcc85f1dfe
fix: bug#15992、15977；优化设备管理、运维管理、告警中心仪表盘 
* fix: 修改jetlinks-store

* fix: 优化多余菜单显示

* fix: 设备管理、运维管理、告警中心仪表盘

* fix: bug#15992、15977

* fix: 修改角色管理-编辑接口请求类型
 2023-07-20 13:37:11 +08:00
XieYongHong 0f10da8404 fix: 修改角色管理-编辑接口请求类型 2023-07-20 11:58:00 +08:00
XieYongHong 511ce94d45 Merge remote-tracking branch 'origin/dev' into dev 2023-07-20 11:42:58 +08:00
fuhao b6f89216b4
fix: bug#15992、15977 2023-07-20 11:42:45 +08:00
XieYongHong f7f2ed9298 fix: 设备管理、运维管理、告警中心仪表盘 2023-07-20 11:39:34 +08:00
XieYongHong 58183fa597 fix: 优化多余菜单显示 2023-07-20 10:10:57 +08:00
100011797 b03dd8846e fix: 修改jetlinks-store 2023-07-20 09:31:36 +08:00
XieYongHong 2feafcb017 fix: 优化运维管理仪表盘展示 2023-07-19 18:16:18 +08:00
XieYongHong 1d238367be fix: 兼容物模型映射 2023-07-19 11:19:34 +08:00
XieYongHong 9170030d25
fix: bug#16459、16434、16453、16452、10936 
* fix: bug#16459、16434、16453、16452

* feat: 数据解析添加代码提示

* fix: bug#16451

* fix: 修改子设备绑定

* fix: 北向输出bug修复

* fix: 修改北向输出

* fix: 兼容物模型旧版数据

* fix: 修改订阅通知样式

* fix: 优化物模型规则窗口长度

* fix: 修改告警配置

* fix: providerName

* fix: bug#10936

* feat: docker:2.1.0-SNAPSHOT
 2023-07-18 18:11:44 +08:00
XieYongHong e3ef99cbe1
fix: bug#16459、16434、16453、16452、10936 
* fix: bug#16459、16434、16453、16452

* feat: 数据解析添加代码提示

* fix: bug#16451

* fix: 兼容物模型旧版数据

* fix: 优化物模型规则窗口长度

* fix: providerName

* fix: bug#10936
 2023-07-18 18:03:38 +08:00
100011797 bd966849c6 fix: 修改告警配置 2023-07-18 15:53:53 +08:00
100011797 e5e1d1e0bd fix: 修改订阅通知样式 2023-07-18 15:12:31 +08:00
100011797 c305f45727 fix: 修改北向输出 2023-07-18 13:36:08 +08:00
100011797 161c9f8ec1 fix: 北向输出bug修复 2023-07-18 12:00:01 +08:00
100011797 dabc73b589 fix: 修改子设备绑定 2023-07-18 10:56:23 +08:00
XieYongHong 7a8848360c
fix: 修复物模型-规则无法回显 
fix: 修复物模型-规则无法回显
 2023-07-17 11:42:44 +08:00
XieYongHong e738908b0e fix: 修复物模型-规则无法回显 2023-07-17 11:39:15 +08:00
XieYongHong 4561e03e96
feat: 2.1 
* feat: 优化物模型单个拷贝、新增编辑逻辑

* fix: 修改bug

* fix: 应用管理赋权接口报错

* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* feat: 优化物模型-标签去掉详情

* fix: 修改bug

* fix: 修改bug

* fix: 修复权限导入无法编辑问题

* fix: 修复物模型-功能无法编辑问题

* fix: 修复物模型-功能详情

* fix: 修改ui

* fix: 修改bug

* fix: 修复物模型-编辑表格

* fix: 优化物模型-编辑表格-时间、枚举

* fix: 修改bug

* fix: 优化物模型必填校验

* fix: 修改bug

* fix: 修改bug

* fix: 物模型映射搜索

* fix: 优化物模型-详情

* fix: 优化物模型-规则

* fix: 修改bug

* fix: 优化物模型-功能定义

* fix: 修改bug

* fix: 修改bug

* fix: 优化物模型-功能定义(输入、输出)

* fix: 优化物模型-功能定义(输入、输出)

* fix: 修改bug

* fix: 优化物模型-功能定义-输入

* fix: 优化物模型-事件定义

* fix: 修改bug

* fix: 优化物模型-功能定义-输出

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: 优化物模型-功能定义-输出

* fix: 优化物模型-功能定义-(输入、输出)

* fix: 修改bug

* fix: 优化物模型-编辑表格标识校验

* fix: 优化物模型-标签定义

* fix: 优化设备物模型

* fix: 修改bug

* fix: allow-scripts

* fix: 优化设备物模型

* fix: 修改bug

* fix: 修改bug

* fix: 修改message

* fix: bug#16085、16024、15967、15924、16072、16070、16067

* fix: 修改bug

* fix: 优化产品物模型编辑状态

* fix: bug#15155

* fix: bug#15531

* fix: bug#16173、16172、16138、15092

* fix: 修改bug

* fix: 去掉cancelSelect

* fix: bug#16110

* fix: 10080

* fix: bug#10080

* fix: 修改bug

* fix: bug#11210

* fix: bug#15718

* fix: 撤销bug#11210修改

* feat: 更新README

* feat: 更改顶部以及侧边菜单配置到store\system.ts

* feat: 新增README 更改配置 内容

* feat: 新增README 新增/编辑菜单

* feat: 新增README 去掉导航栏右上角jetlinks文档

* fix: 修复边缘端映射bug

* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* fix: 修复边缘端映射bug

* fix: 修改bug

* fix: bug#16191、16070、16087、15717、15420

* fix: bug#10551

* fix: bug#16097

* fix: 修改bug

* fix: bug#16195

* fix: bug#10750

* fix: bug#11076

* fix: 边缘网关绑定子设备

* fix: bug#11093

* fix: bug#15420、16072、16195、16208、16218、16220、16222

* fix: bug#16077

* fix: bug#16212、16217、16223

* fix: 修改dueros

* fix: bug#16092

* fix: bug#16233

* fix: bug#15649

* fix: bug#15933

* fix: 优化物模型属性-指标值

* fix: bug#15649、16087、16231、16254

* fix: 优化设备物模型属性保存

* fix: 修改bug

* fix: 删除多余showSizeChanger

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: bug#16210

* fix: bug#16267

* fix: 修改bug

* fix: bug#16277、16265

* fix: 修复物模型无法新增

* fix: 修改bug

* fix: bug#16275、16087

* fix: 角色管理编辑时新增用户表格增加筛选条件，过滤超级管理员

* fix: bug#16232

* fix: bug#16280

* fix: bug#16312

* fix: 优化视频回放进度无法显示

* fix: bug#16315

* fix: 修改bug

* fix: bug#15871、#16254、#16317

* fix: 优化物模型保存多次提交

* fix: bug#16329、16310、16287、16234、16135

* fix: bug#16316、#16314

* fix: bug#16263

* fix: 根据协议列表展示数据采集菜单

* fix: bug#16333

* fix: bug#16279

* fix: 协议列表提出公共变量

* fix: bug#16337、16338

* fix: bug#16325

* fix: bug

* fix: 修改bug

* fix: bug#16301

* fix: bug#16301

* fix: 修改调试

* fix: bug#16364

* fix: bug#16329

* fix: 修改bug

* fix: 修复物模型属性-规则窗口回显

* fix: 修改bug

* fix: bug#16356

* fix: bug#16279

* fix: 数据采集

* fix: bug#16356

* fix: bug#16365

* fix: bug#16365

* fix: bug#16362

* fix: bug#16358、16366、16374、16375、16379、16385

* fix: 修改bug

* fix: bug#16382

* fix: bug#16386

* fix: bug#16373

* fix: 修复bug

* fix: bug#16322

* fix: 修改bug

* fix: 修改bug

* fix: bug#16355、16323、16349

* fix: 优化物模型重置

* fix: bug#10823

* fix: bug#16404

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: bug#16395

* fix: bug#16326

* fix: bug#16382、16381、16384

* fix: 修改bug

* fix: bug#16351

* fix: 修改bug

* fix: 修改bug

* fix: bug#16417

* fix: bug#16423

* fix: bug#16325

* fix: 修改bug

* fix: 修改bug

* fix: bug#16114

* fix: 修复bug

* fix: 修改bug

* fix: bug#16114

* fix: bug#16430

* fix: bug#15968

* fix: bug#16325

* fix: 修改bug

* fix: 修改bug

* fix: bug#16179

* fix: bug#16434

* fix: 修改bug

* feat: 新增异步新建script标签

* fix: bug#16434

* fix: bug#16436

* fix: 修改bug

* fix: 微信登录

* fix: bug#16436

* fix: bug#16441

* fix: 修复TSL不展示虚拟属性

* fix: 修改bug

* fix: bug#16436

* fix: bug#16436

* fix: 修改微信

* fix: 修复登录页动态显示可视化
 2023-07-17 09:22:49 +08:00
XieYongHong d3149e7ca7 fix: 修复登录页动态显示可视化 2023-07-17 09:15:25 +08:00
XieYongHong d9ca944945 Merge remote-tracking branch 'origin/dev' into dev 2023-07-16 00:50:56 +08:00
100011797 9094f90a59 fix: 修改微信 2023-07-16 00:49:26 +08:00
XieYongHong d88fed78ed fix: bug#16436 2023-07-16 00:41:33 +08:00
XieYongHong 2ba9542748 Merge remote-tracking branch 'origin/dev' into dev 2023-07-16 00:02:04 +08:00
XieYongHong 89b4fbdbfe fix: bug#16436 2023-07-16 00:01:42 +08:00
leiqiaochu 3790e9c785 fix: 修改bug 2023-07-15 23:57:02 +08:00
XieYongHong be7b1bd283 fix: 修复TSL不展示虚拟属性 2023-07-15 22:52:46 +08:00
XieYongHong 387a37f5a4 fix: bug#16441 2023-07-15 22:36:18 +08:00
XieYongHong 69dad3807a Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 22:23:00 +08:00
XieYongHong 1e360775b0 fix: bug#16436 2023-07-15 22:21:51 +08:00
100011797 4319ea97e1 fix: 微信登录 2023-07-15 22:20:54 +08:00
leiqiaochu 1dc252d6f2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 22:13:19 +08:00
leiqiaochu 81524133ae fix: 修改bug 2023-07-15 22:12:56 +08:00
XieYongHong 3577a57c29 fix: bug#16436 2023-07-15 21:55:43 +08:00
XieYongHong 3fdd6da033 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 21:10:49 +08:00
XieYongHong 1949018900 fix: bug#16434 2023-07-15 21:10:10 +08:00
XieYongHong 70cf9c0268 feat: 新增异步新建script标签 2023-07-15 21:08:55 +08:00
100011797 f03572e374 fix: 修改bug 2023-07-15 20:21:39 +08:00
XieYongHong bd6f422610 fix: bug#16434 2023-07-15 19:58:41 +08:00
XieYongHong 6b9bf45825 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 19:47:07 +08:00
XieYongHong 6093e544b9 fix: bug#16179 2023-07-15 19:46:41 +08:00
leiqiaochu c35120f4d3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 19:44:51 +08:00
leiqiaochu 83b6297780 fix: 修改bug 2023-07-15 19:43:55 +08:00
100011797 1e6a7e1588 fix: 修改bug 2023-07-15 19:31:28 +08:00
XieYongHong 1b8168786e fix: bug#16325 2023-07-15 19:04:26 +08:00
XieYongHong e985249876 fix: bug#15968 2023-07-15 18:58:54 +08:00
XieYongHong 635fd513fc fix: bug#16430 2023-07-15 18:06:33 +08:00
XieYongHong e2170d8f50 fix: bug#16114 2023-07-15 17:58:08 +08:00
XieYongHong eb96f5afe4 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 17:54:48 +08:00
leiqiaochu 6e47932024 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 17:52:51 +08:00
100011797 a6c9a69eb3 fix: 修改bug 2023-07-15 17:52:36 +08:00
leiqiaochu 68fabed9b4 fix: 修复bug 2023-07-15 17:52:25 +08:00
XieYongHong 26502e78a5 fix: bug#16114 2023-07-15 17:52:15 +08:00
leiqiaochu 09471aebec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 17:50:46 +08:00
leiqiaochu ce0d23d07d fix: 修改bug 2023-07-15 17:50:16 +08:00
100011797 430abd8c6d fix: 修改bug 2023-07-15 17:44:44 +08:00
XieYongHong 0d26cdbd93 fix: bug#16325 2023-07-15 17:37:44 +08:00
XieYongHong 07d6499b03 fix: bug#16423 2023-07-15 17:22:19 +08:00
XieYongHong 0f36d7fa60 fix: bug#16417 2023-07-15 16:52:36 +08:00
leiqiaochu ae12ae34ec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 16:24:49 +08:00
leiqiaochu b9850e79b9 fix: 修改bug 2023-07-15 16:24:21 +08:00
XieYongHong e2e9e3f702 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 16:23:21 +08:00
100011797 439ac44e7e fix: 修改bug 2023-07-15 16:22:51 +08:00
XieYongHong 0e83e706fa fix: bug#16351 2023-07-15 16:21:29 +08:00
leiqiaochu e0c9fa623a fix: 修改bug 2023-07-15 16:18:05 +08:00
XieYongHong 291b65ba19 fix: bug#16382、16381、16384 2023-07-15 16:09:30 +08:00
XieYongHong 37868fd908 fix: bug#16326 2023-07-15 14:37:54 +08:00
XieYongHong 9755d174fe Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 14:20:35 +08:00
XieYongHong 48e2b3a320 fix: bug#16395 2023-07-15 14:15:08 +08:00
100011797 9ec6732b0d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-15 14:11:55 +08:00
100011797 488921d021 fix: 修改bug 2023-07-15 14:11:44 +08:00
leiqiaochu 108eb5f9b7 fix: 修改bug 2023-07-15 14:05:46 +08:00
XieYongHong 6ccdd9b7d3 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 14:03:50 +08:00
leiqiaochu 20337c378d fix: 修改bug 2023-07-15 13:51:43 +08:00
XieYongHong 6bfba98db6 fix: bug#16404 2023-07-15 13:51:28 +08:00
XieYongHong 1baa346733 fix: bug#10823 2023-07-15 11:42:26 +08:00
XieYongHong 4e46571076 fix: 优化物模型重置 2023-07-15 11:20:36 +08:00
XieYongHong 8b74fc76fc Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 10:51:40 +08:00
XieYongHong 6415602c0c fix: bug#16355、16323、16349 2023-07-15 10:47:17 +08:00
100011797 9c5baf9a7f fix: 修改bug 2023-07-15 10:18:31 +08:00
leiqiaochu 6bbd698bb5 fix: 修改bug 2023-07-14 18:19:10 +08:00
XieYongHong 6d34772678 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 18:16:58 +08:00
XieYongHong c941c8361c fix: bug#16322 2023-07-14 18:16:39 +08:00
leiqiaochu 711fc9f668 fix: 修复bug 2023-07-14 17:43:47 +08:00
XieYongHong bf5016fca2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 16:52:27 +08:00
XieYongHong 58091038b2 fix: bug#16373 2023-07-14 16:52:12 +08:00
leiqiaochu b0e83e7074 fix: bug#16386 2023-07-14 16:51:20 +08:00
XieYongHong d58353a939 fix: bug#16382 2023-07-14 16:43:49 +08:00
100011797 135f1626f7 fix: 修改bug 2023-07-14 16:42:37 +08:00
leiqiaochu 5998fe7409 fix: bug#16358、16366、16374、16375、16379、16385 2023-07-14 16:21:43 +08:00
XieYongHong 6dd7f7e387 fix: bug#16362 2023-07-14 15:27:53 +08:00
XieYongHong b1b09150ff Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 14:29:33 +08:00
XieYongHong 05844474a4 fix: bug#16365 2023-07-14 14:29:15 +08:00
XieYongHong 93182fbe10 fix: bug#16365 2023-07-14 14:28:48 +08:00
leiqiaochu cb314ecad8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-14 14:26:10 +08:00
leiqiaochu b583e70165 fix: bug#16356 2023-07-14 14:25:47 +08:00
XieYongHong 051a5082f3 Merge remote-tracking branch 'origin/dev' into dev 2023-07-14 14:25:22 +08:00
100011797 c017f82c36 fix: 数据采集 2023-07-14 14:24:35 +08:00
XieYongHong 10bed5a3e0 fix: bug#16279 2023-07-14 14:21:48 +08:00
leiqiaochu 94e92acfdf fix: bug#16356 2023-07-14 14:11:36 +08:00
100011797 c0bcccbfaf fix: 修改bug 2023-07-14 14:00:14 +08:00
XieYongHong 82a4e14963 fix: 修复物模型属性-规则窗口回显 2023-07-14 13:54:11 +08:00
100011797 30de9c322a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-14 13:51:43 +08:00
100011797 82089fb0a6 fix: 修改bug 2023-07-14 13:51:26 +08:00
leiqiaochu 9bd3a53b7f fix: bug#16329 2023-07-14 13:47:38 +08:00
XieYongHong 0cb8b8bb21 fix: bug#16364 2023-07-14 11:59:13 +08:00
100011797 a8c1bfb0ff fix: 修改调试 2023-07-14 11:05:46 +08:00
XieYongHong f7a29fcbb4 Revert "feat: 登录密码加密" 
This reverts commit 5bd178f909.
 2023-07-14 10:46:29 +08:00
XieYongHong 75098a4388 fix: bug#16301 2023-07-14 10:32:09 +08:00
XieYongHong 3e354f1a21 Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 20:19:15 +08:00
XieYongHong 4eb7d061e1 fix: bug#16301 2023-07-13 20:18:12 +08:00
100011797 9b465d8271 fix: 修改bug 2023-07-13 19:57:04 +08:00
haodd f7eef5e61a Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 19:46:48 +08:00
leiqiaochu e9df2bffd0 fix: bug 2023-07-13 19:39:15 +08:00
haodd bf94914248 fix: bug#16325 2023-07-13 18:43:23 +08:00
leiqiaochu f5bb758dca Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 17:52:50 +08:00
leiqiaochu 65df271660 fix: bug#16337、16338 2023-07-13 17:52:30 +08:00
haodd d9c6dc02a9 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 17:12:21 +08:00
haodd ff3a38880a fix: 协议列表提出公共变量 2023-07-13 17:12:05 +08:00
XieYongHong da7ec5332c Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 17:04:34 +08:00
XieYongHong 37267ae6d4 fix: bug#16279 2023-07-13 17:04:05 +08:00
leiqiaochu 8da129e6ca fix: bug#16333 2023-07-13 17:01:08 +08:00
haodd d4a5783555 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 16:55:12 +08:00
haodd 151ecb9fa7 fix: 根据协议列表展示数据采集菜单 2023-07-13 16:54:32 +08:00
leiqiaochu 6fee10c352 fix: bug#16263 2023-07-13 16:05:27 +08:00
haodd 1ce92713c1 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 15:39:26 +08:00
haodd afdbd3a3b4 fix: bug#16316、#16314 2023-07-13 15:36:59 +08:00
leiqiaochu cecbc3a78b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 14:44:34 +08:00
leiqiaochu fbc0381151 fix: bug#16329、16310、16287、16234、16135 2023-07-13 14:43:48 +08:00
XieYongHong f7310c0e9e Merge remote-tracking branch 'origin/dev' into dev 2023-07-13 14:04:23 +08:00
XieYongHong 816551c394 fix: 优化物模型保存多次提交 2023-07-13 14:03:56 +08:00
haodd aba42ad1aa Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-13 14:03:10 +08:00
haodd d1bbdef021 fix: bug#15871、#16254、#16317 2023-07-13 14:02:45 +08:00
100011797 f6ebb44f90 fix: 修改bug 2023-07-13 13:57:24 +08:00
haodd 8240776b24 fix: bug#16315 2023-07-13 13:48:15 +08:00
XieYongHong 5a845a0e1a fix: 优化视频回放进度无法显示 2023-07-13 13:42:08 +08:00
haodd 1d60415203 fix: bug#16312 2023-07-13 11:57:57 +08:00
haodd 089a7efbd7 fix: bug#16280 2023-07-13 11:54:06 +08:00
XieYongHong d99a07d1a4 fix: bug#16232 2023-07-13 11:34:46 +08:00
haodd 7e3a5c57f7 fix: 角色管理编辑时新增用户表格增加筛选条件，过滤超级管理员 2023-07-13 11:17:32 +08:00
leiqiaochu d63766fef6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-13 09:29:30 +08:00
leiqiaochu 3a90a25f3e fix: bug#16275、16087 2023-07-13 09:29:01 +08:00
100011797 3a46d3e979 fix: 修改bug 2023-07-12 20:56:13 +08:00
XieYongHong 8aeed477a9 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 17:01:38 +08:00
XieYongHong 2cefab5f60 fix: 修复物模型无法新增 2023-07-12 17:01:14 +08:00
leiqiaochu 42970df453 fix: bug#16277、16265 2023-07-12 17:00:19 +08:00
100011797 f35fd74006 fix: 修改bug 2023-07-12 16:57:10 +08:00
XieYongHong af6f78ebb2 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 15:51:09 +08:00
leiqiaochu 8e42e9e1d9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 15:50:35 +08:00
leiqiaochu 8956f8eae8 fix: bug#16267 2023-07-12 15:49:50 +08:00
XieYongHong 1d84c517d5 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 15:47:13 +08:00
XieYongHong 22888abd5f fix: bug#16210 2023-07-12 15:45:29 +08:00
100011797 84c743ac23 fix: 修改bug 2023-07-12 15:43:34 +08:00
100011797 a15b036639 fix: 修改bug 2023-07-12 13:49:08 +08:00
100011797 e4f97010cb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 11:58:15 +08:00
100011797 760d08ec45 fix: 修改bug 2023-07-12 11:58:07 +08:00
XieYongHong 5832c94fde fix: 删除多余showSizeChanger 2023-07-12 11:34:57 +08:00
100011797 0a80fd716c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-12 11:27:17 +08:00
100011797 47e11c4c26 fix: 修改bug 2023-07-12 11:27:09 +08:00
XieYongHong 763f9bbb93 Merge remote-tracking branch 'origin/dev' into dev 2023-07-12 11:25:13 +08:00
XieYongHong 29b6f02b73 fix: 优化设备物模型属性保存 2023-07-12 11:23:33 +08:00
leiqiaochu 6a1badafe6 fix: bug#15649、16087、16231、16254 2023-07-12 10:38:46 +08:00
XieYongHong 4da460a703 fix: 优化物模型属性-指标值 2023-07-12 10:14:45 +08:00
XieYongHong 1e71f066cc fix: bug#15933 2023-07-12 09:44:58 +08:00
leiqiaochu 4213e55996 fix: bug#15649 2023-07-12 09:28:27 +08:00
XieYongHong 7c978f31a7 fix: bug#16233 2023-07-11 18:16:23 +08:00
XieYongHong b73c9fdf92 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/media/Device/Channel/index.vue
 2023-07-11 18:09:00 +08:00
XieYongHong f4cf58d1e5 fix: bug#16092 2023-07-11 18:08:00 +08:00
100011797 57b5a08365 fix: 修改dueros 2023-07-11 18:05:24 +08:00
leiqiaochu 3dedcb8a5c fix: bug#16212、16217、16223 2023-07-11 17:45:15 +08:00
XieYongHong 42c8dfd695 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 17:40:23 +08:00
XieYongHong fa6bb1527f fix: bug#16077 2023-07-11 17:22:07 +08:00
leiqiaochu 5f680d23b9 fix: bug#15420、16072、16195、16208、16218、16220、16222 2023-07-11 16:52:07 +08:00
XieYongHong e8946b1aae fix: bug#11093 2023-07-11 16:50:28 +08:00
XieYongHong 54e5688309 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 16:32:04 +08:00
haodd 80651c4df8 Merge branch 'dev' of https://github.com/jetlinks/jetlinks-ui-vue into dev 2023-07-11 16:28:36 +08:00
haodd 530ac0421d fix: 边缘网关绑定子设备 2023-07-11 16:28:14 +08:00
XieYongHong f832e842db fix: bug#11076 2023-07-11 15:56:11 +08:00
XieYongHong 4f3099cc50 fix: bug#10750 2023-07-11 15:53:01 +08:00
XieYongHong bd34de8642 Merge remote-tracking branch 'origin/dev' into dev 2023-07-11 14:22:11 +08:00
leiqiaochu 4357cb93fa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-11 14:18:25 +08:00
leiqiaochu 41e7e842af fix: bug#16195 2023-07-11 14:17:42 +08:00
100011797 8db22171a3 fix: 修改bug 2023-07-11 14:12:56 +08:00
XieYongHong 0b961e49e3 fix: bug#16097 2023-07-11 13:46:23 +08:00
XieYongHong 1e3324859a fix: bug#10551 2023-07-11 13:32:41 +08:00
leiqiaochu 2f073b0413 fix: bug#16191、16070、16087、15717、15420 2023-07-11 11:53:42 +08:00
100011797 e4191da93e fix: 修改bug 2023-07-11 11:51:43 +08:00
XieYongHong cd4ce56618
fix: 修复边缘端映射bug 
* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* fix: 修复边缘端映射bug
 2023-07-11 11:26:10 +08:00
胡彪 8048e80aa6
feat: 更新README 
* feat: 更改顶部以及侧边菜单配置到store\system.ts

* feat: 新增README 更改配置 内容

* feat: 新增README 新增/编辑菜单

* feat: 新增README 去掉导航栏右上角jetlinks文档
 2023-07-11 11:14:01 +08:00
XieYongHong 86be3af92e fix: 撤销bug#11210修改 2023-07-11 11:11:29 +08:00
XieYongHong 87709f67bb fix: bug#15718 2023-07-11 11:10:09 +08:00
XieYongHong 035d311e07 fix: bug#11210 2023-07-11 10:09:55 +08:00
XieYongHong 19706fec7b Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 20:12:20 +08:00
leiqiaochu 8ec0b5a020 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 20:11:28 +08:00
XieYongHong 153c8c3556 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 20:11:16 +08:00
leiqiaochu f8b6a610e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 20:11:04 +08:00
100011797 d4f10e639f fix: 修改bug 2023-07-10 20:10:41 +08:00
leiqiaochu dbe58704d8 fix: bug#10080 2023-07-10 20:09:03 +08:00
leiqiaochu 4aa06e4ad1 fix: 10080 2023-07-10 20:08:31 +08:00
XieYongHong ce20383f7d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	yarn.lock
 2023-07-10 20:08:09 +08:00
XieYongHong d7d0329477 fix: bug#16110 2023-07-10 20:04:15 +08:00
100011797 91e6f1b8ab fix: 去掉cancelSelect 2023-07-10 19:56:54 +08:00
100011797 e42c6b34d1 fix: 修改bug 2023-07-10 19:46:43 +08:00
100011797 71af134d09 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 19:45:58 +08:00
leiqiaochu 458b5dd8f9 fix: bug#16173、16172、16138、15092 2023-07-10 19:25:44 +08:00
XieYongHong a9188563b7 fix: bug#15531 2023-07-10 19:10:46 +08:00
XieYongHong c0a7d9ce91 fix: bug#15155 2023-07-10 19:01:00 +08:00
XieYongHong 6596016642 Merge remote-tracking branch 'origin/dev' into dev 2023-07-10 18:56:57 +08:00
XieYongHong 9b00ebcc25 fix: 优化产品物模型编辑状态 2023-07-10 18:53:33 +08:00
100011797 7504dc3f88 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-07-10 17:55:44 +08:00
100011797 bd42cdd3fb fix: 修改bug 2023-07-10 17:55:36 +08:00
leiqiaochu 56b3b0acfb fix: bug#16085、16024、15967、15924、16072、16070、16067 2023-07-10 17:01:50 +08:00
100011797 a4aa193781 fix: 修改message 2023-07-10 15:42:28 +08:00
100011797 b3f194675b fix: 修改bug 2023-07-10 11:57:08 +08:00
100011797 fe9fe82e20 fix: 修改bug 2023-07-10 11:42:37 +08:00
XieYongHong cf4806738f fix: 优化设备物模型 2023-07-10 10:39:04 +08:00
100011797 7daaa88407 fix: allow-scripts 2023-07-10 10:19:51 +08:00
100011797 bee1c13d94 fix: 修改bug 2023-07-10 09:43:00 +08:00
xieyonghong a8338a5981 fix: 优化设备物模型 2023-07-09 19:34:16 +08:00