JiangQiming
|
2013ecbddd
|
fix: bug#11223
|
2023-03-31 19:54:53 +08:00 |
|
JiangQiming
|
19944afb8b
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 18:56:06 +08:00 |
|
JiangQiming
|
d58ec295a9
|
fix: bug#11269
|
2023-03-31 18:55:45 +08:00 |
leiqiaochu
|
1fae2c24f7
|
fix: bug管理员初始化取消
|
2023-03-31 18:05:16 +08:00 |
jackhoo_98
|
ae2758b5ba
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 18:03:18 +08:00 |
wangshuaiswim
|
767501ec11
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 17:57:18 +08:00 |
|
wangshuaiswim
|
09e56c4d0c
|
fix: 修复布尔类型值类型是布尔的情况下不能编辑
|
2023-03-31 17:56:51 +08:00 |
|
leiqiaochu
|
7f0625fbca
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 17:44:04 +08:00 |
100011797
|
f6f99efe2b
|
fix: 修改判断产品修改后数据变化的问题
|
2023-03-31 17:19:17 +08:00 |
|
jackhoo_98
|
bcf1f60ec3
|
fix: bug#11300、11289
|
2023-03-31 17:03:55 +08:00 |
|
JiangQiming
|
c178d22691
|
fix: bug#11251
|
2023-03-31 17:01:39 +08:00 |
|
JiangQiming
|
53971eca2c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 16:18:14 +08:00 |
|
JiangQiming
|
492bc33c00
|
fix: bug#11316
|
2023-03-31 16:17:59 +08:00 |
|
leiqiaochu
|
d7198a7ad1
|
fix: bug菜单管理按钮样式
|
2023-03-31 16:16:18 +08:00 |
|
wangshuaiswim
|
e17ead51c3
|
fix: 删除多余代码
|
2023-03-31 16:07:47 +08:00 |
|
wangshuaiswim
|
a286a1e222
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 16:06:37 +08:00 |
|
wangshuaiswim
|
ad14ce0242
|
fix: 修复物模型导入问题
|
2023-03-31 16:06:15 +08:00 |
|
JiangQiming
|
25046ad8d0
|
fix: 登录页三方登录方式logo
|
2023-03-31 15:57:40 +08:00 |
|
jackhoo_98
|
0ec07a4d73
|
fix: bug#10847 修复菜单管理部分bug
|
2023-03-31 15:55:12 +08:00 |
|
JiangQiming
|
1beaab1732
|
fix: bug#11309
|
2023-03-31 15:52:20 +08:00 |
|
JiangQiming
|
9a8a0d2410
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 15:08:20 +08:00 |
|
JiangQiming
|
348ef4570c
|
fix: 11216
|
2023-03-31 15:08:05 +08:00 |
|
jackhoo_98
|
11cf92b90e
|
fix: bug#11233、11276
|
2023-03-31 14:33:58 +08:00 |
|
jackhoo_98
|
63ec13e49b
|
fix: 视频设备新增 快速接入网关，修改浏览器tab关闭时的参数
|
2023-03-31 14:27:28 +08:00 |
|
leiqiaochu
|
39d6a156a8
|
feat: license页面
|
2023-03-31 14:19:10 +08:00 |
|
JiangQiming
|
f2b1b6250e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 14:02:18 +08:00 |
|
JiangQiming
|
497ac1f4ca
|
fix: bug#11274、11273、11272
|
2023-03-31 14:02:03 +08:00 |
xieyonghong
|
f5ef19817b
|
fix: bug#10943
|
2023-03-31 13:55:27 +08:00 |
|
xieyonghong
|
e56be3212a
|
fix: bug#11261、10943、10942
|
2023-03-31 13:55:27 +08:00 |
|
100011797
|
4b08712c61
|
fix: 修改应用管理的状态展示
|
2023-03-31 13:52:41 +08:00 |
|
jackhoo_98
|
008cd45ce7
|
fix: 采集器状态组件引入
|
2023-03-31 13:51:03 +08:00 |
|
jackhoo_98
|
0998f4bc79
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 12:40:02 +08:00 |
|
jackhoo_98
|
e7be6d4770
|
update: 统一修改浏览器标签跳转、设备接入网关新增快速添加
|
2023-03-31 12:39:44 +08:00 |
|
JiangQiming
|
7223ec88b9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 11:51:44 +08:00 |
|
JiangQiming
|
efded0457b
|
fix: bug#11227、11266、11260
|
2023-03-31 11:51:27 +08:00 |
|
100011797
|
e510380bde
|
fix: 修改场景联动
|
2023-03-31 11:49:13 +08:00 |
|
100011797
|
74c0b9fc0a
|
fix: 修改设备网关的样式
|
2023-03-31 10:42:33 +08:00 |
|
jackhoo_98
|
ef6c66600f
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 10:24:59 +08:00 |
|
jackhoo_98
|
6a60407e9f
|
fix: bug#11256
|
2023-03-31 10:24:39 +08:00 |
|
JiangQiming
|
12c12a08fc
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-31 10:09:22 +08:00 |
|
JiangQiming
|
f4770bc03f
|
fix: bug#11260
|
2023-03-31 10:09:04 +08:00 |
|
leiqiaochu
|
d483ea15cf
|
fix: bug#11210
|
2023-03-31 10:05:38 +08:00 |
|
xieyonghong
|
e48a9ba24f
|
fix: bug#10975
|
2023-03-31 09:12:53 +08:00 |
|
xieyonghong
|
73828ec03a
|
fix: bug#11235、11234
|
2023-03-31 09:12:53 +08:00 |
|
xieyonghong
|
3e268404a9
|
update: 优化基本设置创建时间显示
|
2023-03-31 09:12:52 +08:00 |
|
xieyonghong
|
6224bf81ec
|
fix: bug#11224
|
2023-03-31 09:12:52 +08:00 |
|
xieyonghong
|
79c280cece
|
fix: bug#11218
|
2023-03-31 09:12:51 +08:00 |
|
xieyonghong
|
cf06b77fe1
|
fix: bug#11087
|
2023-03-31 09:12:51 +08:00 |
|
xieyonghong
|
cf6b40f438
|
fix: 修改分屏展示的间接支持
|
2023-03-31 09:12:51 +08:00 |
|
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 |