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

492 Commits

Author SHA1 Message Date
XieYongHong 7ba89d6b69 Merge branch 'dev' into dev-edge 
# Conflicts:
#	yarn.lock
 2023-07-28 12:29:09 +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 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 992e9a0aab fix: 优化gateway的采集器新增，点位新增 2023-07-25 19:50:58 +08:00
XieYongHong 80aa27a14e feat: 修改设备接入网关Modbus、opcua为数采设备接入 2023-07-25 14:18:38 +08:00
100011797 8d874e27a6 fix: 修改订阅管理文字提示 2023-07-24 17:57:05 +08:00
XieYongHong b52119fc6e fix: 优化物模型映射保存请求异常 2023-07-24 13:44:40 +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 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
100011797 b03dd8846e fix: 修改jetlinks-store 2023-07-20 09:31:36 +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 dabc73b589 fix: 修改子设备绑定 2023-07-18 10:56:23 +08:00
XieYongHong e738908b0e fix: 修复物模型-规则无法回显 2023-07-17 11:39:15 +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
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 1949018900 fix: bug#16434 2023-07-15 21:10:10 +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
100011797 1e6a7e1588 fix: 修改bug 2023-07-15 19:31:28 +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 0d26cdbd93 fix: bug#16325 2023-07-15 17:37:44 +08:00
XieYongHong e2e9e3f702 Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 16:23:21 +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 9755d174fe Merge remote-tracking branch 'origin/dev' into dev 2023-07-15 14:20:35 +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
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 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