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

2142 Commits

Author SHA1 Message Date
XieYongHong 8ff3297523 fix: 修改设备物模型-属性来源可以选择规则 2023-08-02 10:38:19 +08:00
XieYongHong 2eb8031386 fix: 修改auth页面获取参数 2023-08-02 10:18:30 +08:00
XieYongHong daaf4bec20 fix: bug#16963 2023-08-01 18:13:07 +08:00
XieYongHong ca1cd1fd53 fix: bug#16796 2023-08-01 18:08:48 +08:00
XieYongHong 1016e27268 fix: 修改物模型页面路由跳转无法触发修改未保存提示 2023-08-01 16:27:28 +08:00
孙超 43a49e95fb
feat: 视频预置点位 
* refactor: 预置点位

* fix: 修改预置点位
 2023-08-01 15:38:24 +08:00
100011797 562223fec4 fix: 修改首页视图图片 2023-08-01 14:03:42 +08:00
XieYongHong 0680878a2d Merge branch 'dev-edge' into dev 2023-07-31 10:34:30 +08:00
100011797 2d0298116b fix: 16719 2023-07-28 17:23:17 +08:00
XieYongHong 7ba89d6b69 Merge branch 'dev' into dev-edge 
# Conflicts:
#	yarn.lock
 2023-07-28 12:29:09 +08:00
XieYongHong 2c30751eee fix: 修改通道状态 2023-07-28 12:26:15 +08:00
XieYongHong 92f5e1a8d9 Merge remote-tracking branch 'origin/dev-edge' into dev-edge 2023-07-28 09:50:30 +08:00
100011797 65f3141ed8 fix: 修改运维管理的dashboard颜色 2023-07-27 17:12:24 +08:00
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 a56083e0e3 fix: 修改物模型-指标值float,double值问题 2023-07-27 10:19:28 +08:00
XieYongHong 7faa15eb58 fix: 优化个人中心菜单 2023-07-27 10:15:24 +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 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 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 83d150bb13 fix: 优化代码编辑器动态d.ts提示失效 2023-07-21 11:01:51 +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 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 e738908b0e fix: 修复物模型-规则无法回显 2023-07-17 11:39:15 +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