Commit Graph

1407 Commits

Author SHA1 Message Date
JiangQiming ae1754fa94 fix: 文件名空格删除 2023-03-28 19:07:08 +08:00
JiangQiming 4dd6e5bffa fix: bug#11155 2023-03-28 18:59:48 +08:00
JiangQiming dfa9a5ac63 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:53:19 +08:00
JiangQiming 4db5abc096 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:52:54 +08:00
jackhoo_98 c98d22977a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 18:52:47 +08:00
JiangQiming ca901b45a0 fix: bug#11102 2023-03-28 18:52:39 +08:00
jackhoo_98 9a5436c94d fix: bug#11082 2023-03-28 18:52:02 +08:00
leiqiaochu 3d8e55623d fix: bug#11125 2023-03-28 18:00:33 +08:00
100011797 e3bcf52641 fix: 修改边缘网关 2023-03-28 17:59:40 +08:00
JiangQiming 7da4678231 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 17:52:26 +08:00
JiangQiming be224bbe5d fix: bug#11011、11072、11077、11079 2023-03-28 17:52:11 +08:00
leiqiaochu 40efd16e1f fix: bug#11094 2023-03-28 17:14:35 +08:00
leiqiaochu cb25adfde0 fix: 设备跳转设备接入bug 2023-03-28 16:51:56 +08:00
xieyonghong 28e850551b fix: 修复数据权限 2023-03-28 16:47:31 +08:00
xieyonghong eb21e64cc1 fix: bug#10921 2023-03-28 16:47:30 +08:00
xieyonghong 7474254a45 fix: bug#10935 2023-03-28 16:47:30 +08:00
xieyonghong 80a362e815 fix: bug#10741 2023-03-28 16:47:29 +08:00
xieyonghong f11f5e1729 fix: bug#11013 2023-03-28 16:47:29 +08:00
JiangQiming 0ea4214ee3 fix: bug#11114、10540、10783 2023-03-28 16:46:29 +08:00
jackhoo_98 da00041536 fix: 采集器仪表盘 运维管理仪表盘样式微调 2023-03-28 16:14:05 +08:00
JiangQiming 0bef99ca88 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 16:08:21 +08:00
JiangQiming f8006832e1 fix: bug#11108、10690、10754、10736、11118 2023-03-28 16:07:50 +08:00
leiqiaochu 0c46c38177 fix: bug#11127 11132 11133 11136 2023-03-28 15:57:50 +08:00
jackhoo_98 407f3a8758 Merge branch 'dev-hub' into dev 2023-03-28 15:44:46 +08:00
jackhoo_98 b1fbdcf30e fix: 采集器 左侧树新增状态 2023-03-28 15:39:48 +08:00
100011797 fed965488b fix: 11086 2023-03-28 15:25:15 +08:00
wangshuaiswim 166d99b019 fix: 修改物模型规则初始无法修改问题 2023-03-28 15:10:28 +08:00
100011797 716df45891 fix: 场景联动 2023-03-28 15:06:19 +08:00
jackhoo_98 da2126d874 fix: bug#11122、11120 修复网络组件详情部分bug 2023-03-28 15:01:40 +08:00
JiangQiming a1614752f2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 15:00:06 +08:00
JiangQiming be4b59de57 fix: bug#11001 2023-03-28 14:59:48 +08:00
jackhoo_98 551863ba2f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 14:37:55 +08:00
jackhoo_98 9d24bf8799 fix: bug#11117、11096、11095、11060、11061 修复采集器部分bug 2023-03-28 14:36:49 +08:00
JiangQiming 913560934d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 14:11:28 +08:00
JiangQiming 42828b295f fix: bug#10762 2023-03-28 14:11:13 +08:00
leiqiaochu 2ee291a7f0 fix: bug#11094 11099 11107 2023-03-28 14:05:13 +08:00
xieyonghong 1cf71a8e8c update: 更新组件库 2023-03-28 11:12:15 +08:00
xieyonghong 7a3b6c1c66 fix: bug#11020 2023-03-28 11:12:14 +08:00
xieyonghong 880d4f5241 fix: 优化初始化角色权限 2023-03-28 11:12:13 +08:00
100011797 0a93cd2926 fix:场景联动 2023-03-28 11:01:06 +08:00
jackhoo_98 2aaa3ae945 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 10:58:16 +08:00
jackhoo_98 c7137ea8e5 fix: bug#11021、11047、11088 2023-03-28 10:58:00 +08:00
JiangQiming c83fe499fa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 10:55:35 +08:00
JiangQiming 055de0750e fix: bug#10756 2023-03-28 10:55:19 +08:00
leiqiaochu f7977e3d98 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 10:54:13 +08:00
leiqiaochu 278e9310b4 fix: bug#11094 11099 2023-03-28 10:53:39 +08:00
JiangQiming 4b2439374a fix: bug#10740、11100 2023-03-28 10:07:17 +08:00
jackhoo_98 4782c510d5 fix: 菜单管理 更改初始菜单引用 2023-03-28 10:02:58 +08:00
xieyonghong f44985ba3f fix: 修复场景联动标签误删 2023-03-28 09:35:47 +08:00
leiqiaochu 838987b9da Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 09:28:36 +08:00