Commit Graph

1062 Commits

Author SHA1 Message Date
easy d650757dc2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 17:29:05 +08:00
easy 37e381f961 fix: 个人中心 2023-03-09 17:28:35 +08:00
jackhoo_98 4e51d021eb feat: 采集器 MODBUS、OPCUA表单,读写以及批量操作 2023-03-09 16:57:11 +08:00
wangshuaiswim e7630bc7e2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 16:05:07 +08:00
wangshuaiswim 1642290608 fix: 修改物模型规则属性 2023-03-09 16:04:20 +08:00
JiangQiming a5d7c228c2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 16:02:53 +08:00
JiangQiming 57a2aceaa9 update: 视频中心组件替换测试 2023-03-09 16:02:39 +08:00
leiqiaochu d527cc09fe Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 15:57:30 +08:00
leiqiaochu c9b56626d5 feat: 子设备新增并绑定 2023-03-09 15:56:55 +08:00
xieyonghong 75eca7d0dc feat: 场景联动添加ParamsDropdown组件 2023-03-09 15:22:20 +08:00
JiangQiming c5018e631a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-09 15:16:53 +08:00
JiangQiming 257765cb50 update: 组件替换自测优化 2023-03-09 15:16:22 +08:00
easy 80faeb5f0f fix: 首页自测 优化 2023-03-09 15:05:05 +08:00
easy 4dcbf18939 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-08 19:43:58 +08:00
easy 58106e9fe4 update: 应用管理组件替换、弹窗优化 2023-03-08 19:43:36 +08:00
easy 68720f668c update: api配置组件替换、逻辑优化 2023-03-08 19:07:34 +08:00
100011797 d70956e1e1 fix: 修改北向输出 2023-03-08 18:16:59 +08:00
wangshuaiswim 23aff419a3 fix: 物模型组件修改 2023-03-08 18:00:07 +08:00
JiangQiming 56122ac90c update: 设备功能组件替换 2023-03-08 16:11:45 +08:00
JiangQiming 8622bfe8f1 update: 通知模板组件替换 2023-03-08 16:10:14 +08:00
JiangQiming f3bebd063b update: 通知配置组件更换 2023-03-08 16:04:38 +08:00
JiangQiming 25d44f841b update: 视频中心-国标级联组件更换 2023-03-08 15:43:47 +08:00
JiangQiming 749127730e update: 视频设备组件替换 2023-03-08 15:30:06 +08:00
JiangQiming dfdfbb30bd update: 视频中心组件替换 2023-03-08 14:59:21 +08:00
easy ae3f1a96ff update: 菜单-添加按钮弹窗组件修改 2023-03-08 14:18:01 +08:00
JiangQiming d6d989d4b8 update: 视频中心仪表盘组件更换 2023-03-08 14:15:18 +08:00
easy 1835b28105 update: 首页优化 剩跳转未对接 2023-03-08 14:00:01 +08:00
easy 759eb7a46a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-08 13:38:49 +08:00
easy 89f7b27e55 update: 首页组件优化 2023-03-08 13:38:27 +08:00
JiangQiming 6086a602ad update: 视频中心首页/仪表盘组件替换 2023-03-08 11:47:31 +08:00
easy 4d9249d2a4 update: 首页组件替换、权限判断方式调整 2023-03-08 11:25:59 +08:00
胡彪 d200ac9ace
Merge pull request #58 from jetlinks/dev-hub
feat: 采集器 左侧树全部功能,右侧卡片列表以及部分表单
2023-03-08 09:39:04 +08:00
jackhoo_98 ae959f9dcd fix: 合并冲突 2023-03-08 09:36:46 +08:00
jackhoo_98 de603868c4 Merge remote-tracking branch 'origin/dev' into dev-hub 2023-03-08 09:27:42 +08:00
jackhoo_98 a48a1f73c7 feat: 采集器 左侧树全部功能,右侧卡片列表以及部分表单 2023-03-08 09:27:22 +08:00
leiqiaochu c932dc015f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-08 09:14:31 +08:00
JiangQiming c05ce2d0af Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-07 20:05:23 +08:00
JiangQiming 9b5e6b21c6 feat: 新增权限按钮 2023-03-07 20:05:07 +08:00
leiqiaochu 21199a3d3a fix: 模态弹窗函数优化 2023-03-07 20:02:22 +08:00
easy 4d7b1e60f2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-07 19:48:26 +08:00
easy 57e481d949 update: 首页-设备接入视图组件替换、弹窗优化 2023-03-07 19:47:53 +08:00
xieyonghong 783088e1bd update: 删除props参数 2023-03-07 19:25:13 +08:00
xieyonghong 9a883cf7a9 feat: 场景联动新增Terms组件 2023-03-07 19:21:20 +08:00
easy 418c0e823e update: 首页调整 2023-03-07 17:15:14 +08:00
JiangQiming ef26b169d4 update: 回放优化 2023-03-07 16:55:46 +08:00
leiqiaochu 217b020344 feat: 告警中心仪表盘跳转 2023-03-07 16:53:33 +08:00
JiangQiming b262b50dd6 feat: 回放, 新增播放/暂停 2023-03-07 16:41:28 +08:00
JiangQiming 3a0e7dfd25 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-07 16:27:37 +08:00
JiangQiming e61d685e6b update: 视频播放插件更换 2023-03-07 16:24:40 +08:00
easy a0fd58e819 style: 右上角样式调整 2023-03-07 15:56:36 +08:00