xieyonghong
|
d3ea02c0f6
|
style: 优化组织管理样式
|
2023-03-30 13:42:16 +08:00 |
|
xieyonghong
|
a3cb28ed5b
|
fix: bug#11192
|
2023-03-30 13:42:15 +08:00 |
|
xieyonghong
|
e3c9884606
|
fix: 修复触发规则-功能调用验证失败
|
2023-03-30 13:42:14 +08:00 |
JiangQiming
|
57af547bfb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 11:50:49 +08:00 |
|
JiangQiming
|
c6ec16350e
|
fix: bug#11221
|
2023-03-30 11:50:32 +08:00 |
leiqiaochu
|
92315c3c39
|
fix: bug#10777
|
2023-03-30 11:45:09 +08:00 |
|
leiqiaochu
|
77d8044cf2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 11:32:46 +08:00 |
|
leiqiaochu
|
18d950d63f
|
fix: bug#10777 11128 11212
|
2023-03-30 11:32:15 +08:00 |
|
JiangQiming
|
de904854e5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 11:27:28 +08:00 |
|
JiangQiming
|
ceec8a65e3
|
fix: bug#10954
|
2023-03-30 11:27:09 +08:00 |
100011797
|
0675fcff7b
|
fix: 修改设备功能
|
2023-03-30 11:22:52 +08:00 |
|
JiangQiming
|
d7790f203f
|
fix: bug#11139、11214
|
2023-03-30 10:56:51 +08:00 |
|
xieyonghong
|
4447e11d7c
|
update: 优化数据权限
|
2023-03-29 23:01:55 +08:00 |
jackhoo_98
|
d0c53252ec
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 22:08:54 +08:00 |
|
JiangQiming
|
e61efa5832
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 22:06:43 +08:00 |
|
JiangQiming
|
cea070b35c
|
fix: bug#10766
|
2023-03-29 22:06:27 +08:00 |
|
100011797
|
55cd57269d
|
fix: ico改变
|
2023-03-29 22:04:09 +08:00 |
|
leiqiaochu
|
922624cbc2
|
fix: bug#10781
|
2023-03-29 21:57:36 +08:00 |
|
jackhoo_98
|
a422769c2f
|
fix: bug#11200、11201、11206、11207
|
2023-03-29 21:49:50 +08:00 |
|
JiangQiming
|
e9f84f959a
|
fix: bug#10803
|
2023-03-29 21:39:39 +08:00 |
|
JiangQiming
|
4424b56d4c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 21:29:46 +08:00 |
|
JiangQiming
|
b7034c5ca4
|
fix: bug#11037、11057
|
2023-03-29 21:29:30 +08:00 |
|
leiqiaochu
|
3aa73c4f08
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 20:55:07 +08:00 |
|
JiangQiming
|
ee323a1a7d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 20:52:50 +08:00 |
|
JiangQiming
|
95c0409c21
|
fix: bug#11157
|
2023-03-29 20:52:33 +08:00 |
|
leiqiaochu
|
382f0bff44
|
fix: bug#11195
|
2023-03-29 20:45:34 +08:00 |
|
100011797
|
ecd956b4fd
|
fix: 修改场景联动执行动作设备查询排序
|
2023-03-29 20:38:24 +08:00 |
|
leiqiaochu
|
8187e27a43
|
fix: bug#11128
|
2023-03-29 20:24:43 +08:00 |
|
xieyonghong
|
b283c729d9
|
fix: bug#10938
|
2023-03-29 20:22:54 +08:00 |
|
xieyonghong
|
81f7e58c01
|
fix: bug#11087
|
2023-03-29 20:22:54 +08:00 |
|
xieyonghong
|
5cf8ce8aff
|
fix: bug#11191
|
2023-03-29 20:22:53 +08:00 |
|
xieyonghong
|
09267955f5
|
fix: bug#11193、11190、11189
|
2023-03-29 20:22:53 +08:00 |
|
xieyonghong
|
c6717f6be0
|
fix: bug#11035
|
2023-03-29 20:22:52 +08:00 |
|
xieyonghong
|
2588145b96
|
fix: bug#11138
|
2023-03-29 20:22:51 +08:00 |
|
jackhoo_98
|
a1affe20a8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 20:21:15 +08:00 |
|
jackhoo_98
|
384930fa4e
|
fix: bug#11006、11093
|
2023-03-29 20:20:54 +08:00 |
|
100011797
|
542f201175
|
fix: 物联网卡导入
|
2023-03-29 20:20:24 +08:00 |
|
100011797
|
43a8d39655
|
fix: 物联网卡
|
2023-03-29 20:15:11 +08:00 |
|
JiangQiming
|
9f0bc42fb9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 20:01:36 +08:00 |
|
JiangQiming
|
16dc7b7aa7
|
fix: bug#10762
|
2023-03-29 20:01:18 +08:00 |
|
jackhoo_98
|
18abd85100
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 19:16:08 +08:00 |
|
jackhoo_98
|
2c46649750
|
fix: bug#11008、11180、11184、11198、11097
|
2023-03-29 19:15:48 +08:00 |
|
100011797
|
d4dbc450ea
|
fix: 修改场景联动
|
2023-03-29 18:56:23 +08:00 |
|
leiqiaochu
|
ad64371a04
|
fix: bug#11199
|
2023-03-29 17:59:17 +08:00 |
|
JiangQiming
|
0ce7fd5a59
|
fix: bug#11062、11139
|
2023-03-29 17:54:23 +08:00 |
|
JiangQiming
|
22d326337b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 16:34:27 +08:00 |
|
JiangQiming
|
b676b2bba3
|
fix: bug#11187
|
2023-03-29 16:34:12 +08:00 |
|
100011797
|
6abbe34663
|
fix: 修改场景联动
|
2023-03-29 16:16:06 +08:00 |
|
jackhoo_98
|
6d4a442ee8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 16:15:04 +08:00 |
|
jackhoo_98
|
227eaae3a2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 16:14:34 +08:00 |
|
JiangQiming
|
d0c7f9dc9c
|
fix: 解决冲突
|
2023-03-29 16:14:24 +08:00 |
|
jackhoo_98
|
51da808ae7
|
fix: bug#10965
|
2023-03-29 16:14:16 +08:00 |
|
JiangQiming
|
ba3661ae49
|
fix: 解决冲突
|
2023-03-29 16:12:10 +08:00 |
|
jackhoo_98
|
f41fa6d279
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 16:09:17 +08:00 |
|
jackhoo_98
|
f2899f5782
|
fix: bug#10715、10884、11178
|
2023-03-29 16:08:48 +08:00 |
|
xieyonghong
|
64a19a4bc1
|
update: 优化数据隔离间接控制
|
2023-03-29 16:07:22 +08:00 |
|
xieyonghong
|
6d04a6445f
|
fix: bug#10987
|
2023-03-29 16:07:22 +08:00 |
|
xieyonghong
|
21f3d7cb9a
|
fix: bug#10971、11141
|
2023-03-29 16:07:21 +08:00 |
|
xieyonghong
|
a9537163ae
|
fix: bug#10997
|
2023-03-29 16:07:21 +08:00 |
|
JiangQiming
|
f9271d4f99
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 16:04:20 +08:00 |
|
JiangQiming
|
4611f83841
|
fix: bug#11174
|
2023-03-29 16:02:12 +08:00 |
|
leiqiaochu
|
3ae54f459d
|
fix: bug#11125
|
2023-03-29 15:51:44 +08:00 |
|
100011797
|
b21e055746
|
fix: 启用全部设备
|
2023-03-29 15:22:10 +08:00 |
|
jackhoo_98
|
1b596d4599
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 15:14:24 +08:00 |
|
jackhoo_98
|
162b7596da
|
fix: bug#10715、10884
|
2023-03-29 15:14:05 +08:00 |
|
100011797
|
fdc09d73d3
|
fix: 边缘端映射
|
2023-03-29 15:01:25 +08:00 |
|
leiqiaochu
|
00f7ca8824
|
fix: bug#11171 11169
|
2023-03-29 14:55:04 +08:00 |
|
JiangQiming
|
d690240184
|
fix: bug#10692
|
2023-03-29 14:47:58 +08:00 |
|
JiangQiming
|
0e5ba309fc
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 14:43:15 +08:00 |
|
JiangQiming
|
ac63d41f0b
|
fix: bug#10776、10778
|
2023-03-29 14:42:55 +08:00 |
|
leiqiaochu
|
78c5fb941d
|
fix: bug告警配置卡片跳转 设备禁用选择
|
2023-03-29 13:36:32 +08:00 |
|
jackhoo_98
|
14634e0fec
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-29 12:30:01 +08:00 |
|
jackhoo_98
|
f1f4b697a7
|
fix: bug#11091、11167、11166、11026
|
2023-03-29 12:29:44 +08:00 |
|
JiangQiming
|
6cb8e67da2
|
fix: bug#11071、11075、11058、11062、11151
|
2023-03-29 10:53:16 +08:00 |
|
xieyonghong
|
381ea887e8
|
fix: bug#11035
|
2023-03-28 22:14:39 +08:00 |
|
xieyonghong
|
43edb14f16
|
fix: 修复图片引入路径
|
2023-03-28 22:14:39 +08:00 |
|
xieyonghong
|
ad14983d9c
|
fix: bug#10985
|
2023-03-28 22:14:38 +08:00 |
|
jackhoo_98
|
d93504a59b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-28 22:07:02 +08:00 |
|
jackhoo_98
|
a70749f5e9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-28 22:06:32 +08:00 |
|
100011797
|
c73e9746b1
|
fix: running的loading
|
2023-03-28 22:06:30 +08:00 |
|
jackhoo_98
|
9e7242c27d
|
fix: bug#11161 修复采集器扫描table样式异常
|
2023-03-28 22:06:04 +08:00 |
|
100011797
|
f9d5a017f9
|
fix: 运行状态bug
|
2023-03-28 22:02:53 +08:00 |
|
jackhoo_98
|
f16bc40373
|
fix: bug#10884 修复设备接入网关 国标视频编辑问题
|
2023-03-28 21:26:43 +08:00 |
|
jackhoo_98
|
60edb1d11b
|
fix: bug#11085、11130、11081、11078、11162 采集器修复部分bug
|
2023-03-28 21:05:15 +08:00 |
|
leiqiaochu
|
29adc3c207
|
fix: 设备诊断跳转bug
|
2023-03-28 20:55:16 +08:00 |
|
JiangQiming
|
dd8d6c1820
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-28 20:53:59 +08:00 |
|
JiangQiming
|
6583d268b0
|
fix: bug#11153
|
2023-03-28 20:53:43 +08:00 |
|
leiqiaochu
|
5fabc8272f
|
fix: bug#11154
|
2023-03-28 20:30:36 +08:00 |
|
JiangQiming
|
d8f19671c2
|
fix: bug#10953
|
2023-03-28 19:45:37 +08:00 |
|
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
|
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 |
|
leiqiaochu
|
0ca94c11eb
|
fix: #bug11090
|
2023-03-28 09:28:07 +08:00 |
|
JiangQiming
|
ffff3debad
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-28 09:27:31 +08:00 |
|
JiangQiming
|
067e471b4c
|
fix: bug#11028、11030、11068、10924、11056、10941
|
2023-03-28 09:27:12 +08:00 |
|
xieyonghong
|
f920b55436
|
fix: bug#11042
|
2023-03-28 09:25:15 +08:00 |
|
xieyonghong
|
89e6a348e2
|
fix: bug#11076
|
2023-03-28 09:25:14 +08:00 |
|
xieyonghong
|
2a3e5c1e02
|
fix: bug#11038
|
2023-03-28 09:25:13 +08:00 |
|
xieyonghong
|
1497d1e1de
|
fix: bug#11035
|
2023-03-28 09:25:13 +08:00 |
|
100011797
|
0b126ad548
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-28 09:20:46 +08:00 |
|
xieyonghong
|
300a09a7a1
|
fix: bug#10880
|
2023-03-28 08:51:30 +08:00 |
|
xieyonghong
|
042d07f61f
|
fix: bug#10879
|
2023-03-28 08:51:29 +08:00 |
|
xieyonghong
|
ba326d6532
|
fix: bug#10872、10854
|
2023-03-28 08:51:29 +08:00 |
|
xieyonghong
|
de51d8a0eb
|
fix: bug#10839
|
2023-03-28 08:51:29 +08:00 |
|
xieyonghong
|
fb1478a181
|
fix: bug#10839
|
2023-03-28 08:51:29 +08:00 |
|
xieyonghong
|
b6bf92a577
|
fix: bug#10785
|
2023-03-28 08:51:28 +08:00 |
|
xieyonghong
|
a33e3dd3f9
|
fix: bug#10767
|
2023-03-28 08:51:28 +08:00 |
|
xieyonghong
|
6eadc45786
|
fix: bug#10396
|
2023-03-28 08:51:28 +08:00 |
|
xieyonghong
|
c34647fad5
|
fix: bug#10824
|
2023-03-28 08:51:27 +08:00 |
|
jackhoo_98
|
c366f4a2cc
|
fix: bug#11010、11021、11029、11031、11032 修复通道管理部分bug
|
2023-03-27 21:59:12 +08:00 |
|
jackhoo_98
|
7b17adc477
|
fix: bug#11023 修复采集器点位新增无反应
|
2023-03-27 21:39:36 +08:00 |
|
jackhoo_98
|
facafcfae6
|
fix: 修复采集器仪表盘 时间计算问题
|
2023-03-27 21:02:34 +08:00 |
|
jackhoo_98
|
45f634b37c
|
Merge branch 'dev' into dev-hub
|
2023-03-27 20:34:08 +08:00 |
|
jackhoo_98
|
4a561741c8
|
fix: bug#11004
|
2023-03-27 20:33:27 +08:00 |
|
100011797
|
7b83732170
|
fix: 边缘网关和设备诊断
|
2023-03-27 20:30:07 +08:00 |
|
JiangQiming
|
f6947dd3e5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 20:00:36 +08:00 |
|
JiangQiming
|
1aae61582e
|
fix: bug#10766
|
2023-03-27 20:00:18 +08:00 |
|
jackhoo_98
|
5f5b3e5b41
|
fix: bug#10945 修复菜单管理部分bug
|
2023-03-27 19:45:28 +08:00 |
|
jackhoo_98
|
478fac0cac
|
fix: 修复网络组件 编辑查看页面空白问题
|
2023-03-27 19:10:56 +08:00 |
|
xieyonghong
|
4778b558d7
|
fix: bug#10822
|
2023-03-27 18:51:19 +08:00 |
|
leiqiaochu
|
4e8c6dfe9d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 17:58:39 +08:00 |
|
leiqiaochu
|
ace81f616d
|
fix: bug#11037 11041 11051 11066
|
2023-03-27 17:56:47 +08:00 |
|
100011797
|
324d78a213
|
fix: 北向输出
|
2023-03-27 17:48:47 +08:00 |
|
100011797
|
9b32fbd21d
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 17:47:34 +08:00 |
|
jackhoo_98
|
e2bcffe771
|
Merge branch 'dev' into dev-hub
|
2023-03-27 17:24:37 +08:00 |
|
jackhoo_98
|
bc95eda133
|
fix: bug#11026、11048、11046、11049、11045、11039 采集器解决部分bug
|
2023-03-27 17:23:35 +08:00 |
|
wangshuaiswim
|
4d41f82b75
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 17:15:01 +08:00 |
|
wangshuaiswim
|
3fc1e30027
|
fix: 修改物模型属性提交时添加type默认值
|
2023-03-27 17:14:42 +08:00 |
|
100011797
|
9fb80e4123
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 17:05:09 +08:00 |
|
100011797
|
ee7c4e11f7
|
fix: 修改场景联动
|
2023-03-27 17:04:08 +08:00 |
|
JiangQiming
|
f54b498053
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 16:11:23 +08:00 |
|
JiangQiming
|
dbd14ce4d6
|
fix: bug#10924、11001
|
2023-03-27 16:11:06 +08:00 |
|
xieyonghong
|
2cad9d7f4e
|
update: 替换Ellipsis为组件库中的Ellipsis组件
|
2023-03-27 15:59:04 +08:00 |
|
xieyonghong
|
ffdee18c34
|
fix: bug#10833
|
2023-03-27 15:59:03 +08:00 |
|
xieyonghong
|
c0d72a3863
|
update: 补全数据权限
|
2023-03-27 15:59:02 +08:00 |
|
xieyonghong
|
8b9330a58d
|
style: 优化场景联动回显校验
|
2023-03-27 15:59:02 +08:00 |
|
JiangQiming
|
9594893a50
|
fix: bug#10909、10912
|
2023-03-27 15:44:48 +08:00 |
|
JiangQiming
|
d58bef5897
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 15:29:39 +08:00 |
|
JiangQiming
|
6c47f20f9d
|
fix: bug#10892、10953
|
2023-03-27 15:29:23 +08:00 |
|
jackhoo_98
|
414a9987d2
|
Merge branch 'dev' into dev-hub
|
2023-03-27 15:27:01 +08:00 |
|
jackhoo_98
|
049bf99395
|
fix: 菜单管理 完成菜单配置
|
2023-03-27 15:25:53 +08:00 |
|
leiqiaochu
|
b8dac68cfa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 14:20:25 +08:00 |
|
leiqiaochu
|
5ac6df4ffb
|
fix: bug#11022
|
2023-03-27 14:20:04 +08:00 |
|
JiangQiming
|
5d19f58f59
|
fix: bug#10967、10974
|
2023-03-27 14:13:52 +08:00 |
|
leiqiaochu
|
ca9f2a66c0
|
fix: bug#10999 10977 10964 10957 10951 10940 10868
|
2023-03-27 11:16:20 +08:00 |
|
wangshuaiswim
|
1afe27ca91
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-27 11:08:38 +08:00 |
|
wangshuaiswim
|
38a0bc418a
|
fix: 修改布尔类型组件在chrome浏览器下的排版问题
|
2023-03-27 11:07:59 +08:00 |
|
JiangQiming
|
71fe3f81bd
|
fix: bug#10894
|
2023-03-27 10:47:50 +08:00 |
|
xieyonghong
|
fed5c348e0
|
style: 优化场景联动卡片的省略内容显示样式
|
2023-03-27 09:24:45 +08:00 |
|
xieyonghong
|
9b459f2507
|
update: 优化useParams
|
2023-03-27 09:22:24 +08:00 |
|
xieyonghong
|
6919d41b93
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-26 22:27:49 +08:00 |
|
xieyonghong
|
0dfbac22c5
|
fix: bug#10937
|
2023-03-26 22:20:01 +08:00 |
|
xieyonghong
|
dcd584c9c7
|
fix: bug#10946
|
2023-03-26 21:42:23 +08:00 |
|
xieyonghong
|
3810046bee
|
fix: bug#10947
|
2023-03-26 21:18:03 +08:00 |