JiangQiming
|
d3af662267
|
fix: bug#11249、11247、10637、11250
|
2023-03-30 20:24:05 +08:00 |
|
JiangQiming
|
f25468066b
|
fix: bug#11223
|
2023-03-30 19:58:28 +08:00 |
|
JiangQiming
|
735994f12f
|
fix: bug#11223
|
2023-03-30 19:24:00 +08:00 |
|
JiangQiming
|
4767863dda
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 19:16:01 +08:00 |
|
JiangQiming
|
a87a8d813b
|
fix: bug#11254
|
2023-03-30 19:15:46 +08:00 |
100011797
|
4e540b022d
|
fix: 资源库跳转
|
2023-03-30 18:24:03 +08:00 |
|
JiangQiming
|
d53f487d2c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 18:12:56 +08:00 |
|
JiangQiming
|
a3951bf202
|
fix: bug#11258
|
2023-03-30 18:12:40 +08:00 |
jackhoo_98
|
db06aa023b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 18:10:34 +08:00 |
|
jackhoo_98
|
74abf49b1e
|
fix: bug#11242
|
2023-03-30 18:09:37 +08:00 |
xieyonghong
|
84e5a57c67
|
fix: 优化场景联动布尔值
|
2023-03-30 18:08:49 +08:00 |
|
xieyonghong
|
683751af53
|
fix: 优化物联布局
|
2023-03-30 18:08:49 +08:00 |
|
jackhoo_98
|
f878cffe82
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 18:02:26 +08:00 |
|
jackhoo_98
|
f4f190fa01
|
fix: bug#11233、11240、11236
|
2023-03-30 18:01:58 +08:00 |
leiqiaochu
|
1826574d41
|
fix: bug 产品按钮权限
|
2023-03-30 18:01:00 +08:00 |
|
JiangQiming
|
8f992dd1f3
|
fix: bug#11243
|
2023-03-30 17:57:39 +08:00 |
|
JiangQiming
|
c31d38484a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 17:53:37 +08:00 |
|
JiangQiming
|
fff3922717
|
fix: bug#11239
|
2023-03-30 17:53:20 +08:00 |
|
100011797
|
f1e3c10468
|
fix: 设备图片显示
|
2023-03-30 17:45:55 +08:00 |
|
leiqiaochu
|
a69adc0033
|
fix: bug#11230
|
2023-03-30 17:24:26 +08:00 |
|
JiangQiming
|
352bcfe98f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 17:18:59 +08:00 |
|
JiangQiming
|
f08e28560a
|
update: 系统管理列表撑满高度
|
2023-03-30 17:18:43 +08:00 |
|
jackhoo_98
|
f5afc16a1f
|
update: 运维管理、数据采集添加FullPage组件
|
2023-03-30 17:08:30 +08:00 |
|
leiqiaochu
|
e98f168b20
|
fix: bug#11226 样式铺满
|
2023-03-30 17:07:33 +08:00 |
|
JiangQiming
|
881cc39e9b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 17:06:46 +08:00 |
|
JiangQiming
|
f960e2df76
|
update: 通知管理,视频中心所有页面表格撑满屏幕
|
2023-03-30 17:06:04 +08:00 |
|
100011797
|
c38923f468
|
fix: 加fullpage
|
2023-03-30 17:01:58 +08:00 |
|
JiangQiming
|
8239b2c308
|
fix: bug#11174、11227
|
2023-03-30 16:36:11 +08:00 |
|
JiangQiming
|
6c24474de2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 16:21:26 +08:00 |
|
JiangQiming
|
09544943f2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 16:20:55 +08:00 |
|
JiangQiming
|
a75f2a3fd6
|
fix: bug#11106
|
2023-03-30 16:20:16 +08:00 |
|
leiqiaochu
|
c694bf8222
|
fix: bug 设备接入权限
|
2023-03-30 16:19:41 +08:00 |
|
xieyonghong
|
7f4d01f2c0
|
fix: 优化FullPage取值
|
2023-03-30 16:14:56 +08:00 |
|
jackhoo_98
|
1b7a8a1b21
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 16:07:37 +08:00 |
|
xieyonghong
|
57e107c588
|
update: 新增FullPage组件
|
2023-03-30 16:05:18 +08:00 |
|
xieyonghong
|
a1b67ce45c
|
fix: 优化跳转初始化页面
|
2023-03-30 16:05:17 +08:00 |
|
leiqiaochu
|
ea4cb2492b
|
fix: bug#11226
|
2023-03-30 15:55:57 +08:00 |
|
JiangQiming
|
2bccd21378
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 15:51:41 +08:00 |
|
JiangQiming
|
c88706282f
|
fix: bug#11106
|
2023-03-30 15:51:16 +08:00 |
|
leiqiaochu
|
2dbd7e31b6
|
fix: bug路由校验 初始化跳转
|
2023-03-30 15:39:04 +08:00 |
|
jackhoo_98
|
7c1376f0ce
|
fix: 采集器 新增请求超时时间配置
|
2023-03-30 15:28:27 +08:00 |
|
jackhoo_98
|
3ea80b89c6
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 15:17:50 +08:00 |
|
jackhoo_98
|
2fbcc606e9
|
fix: 采集器 新增离散输入寄存器、单双高低位切换
|
2023-03-30 15:17:17 +08:00 |
|
100011797
|
04ad3d4689
|
fix: 修改按标签
|
2023-03-30 14:24:22 +08:00 |
|
100011797
|
048d8508a6
|
fix: 修改场景联动数据显示
|
2023-03-30 14:19:50 +08:00 |
|
leiqiaochu
|
7ab063a790
|
fix: bug初始化页面跳转
|
2023-03-30 14:18:12 +08:00 |
|
jackhoo_98
|
fc3d0d2d12
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-30 13:47:16 +08:00 |
|
jackhoo_98
|
bf4b1d9c13
|
fix: bug#11205、11211
|
2023-03-30 13:46:46 +08:00 |
|
xieyonghong
|
947f34bed5
|
fix: bug#11218
|
2023-03-30 13:42:18 +08:00 |
|
xieyonghong
|
9b7b78fe33
|
fix: bug#11191
|
2023-03-30 13:42:17 +08:00 |
|
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 |