JiangQiming
|
5b7979405e
|
fix: 代码编辑器光标一直在文本最前面解决
|
2023-03-01 14:51:57 +08:00 |
jackhoo_98
|
d3e45d78bb
|
feat: 流媒体服务 加入权限
|
2023-03-01 14:49:52 +08:00 |
xieyonghong
|
a6c5a40a76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-01 14:23:53 +08:00 |
|
xieyonghong
|
01d3988035
|
update: 优化变量less文件
|
2023-03-01 14:22:50 +08:00 |
wzyyy
|
1f4bdc274e
|
fix: merge
|
2023-03-01 14:15:55 +08:00 |
|
wzyyy
|
34fbb4d67c
|
feat: 数据解析
|
2023-03-01 14:14:09 +08:00 |
|
JiangQiming
|
f6a41fac5f
|
update: 视频设备新增产品状态
|
2023-03-01 11:52:37 +08:00 |
|
JiangQiming
|
fac1b5d1df
|
update: 国标级联表单数据赋值方式更改
|
2023-03-01 11:40:12 +08:00 |
|
jackhoo_98
|
ec89aaae88
|
feat: 证书管理 加入权限
|
2023-03-01 11:37:26 +08:00 |
|
jackhoo_98
|
8972c003ba
|
feat: 协议管理 加入权限
|
2023-03-01 10:58:19 +08:00 |
|
xieyonghong
|
020a917b13
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-01 10:30:05 +08:00 |
|
xieyonghong
|
9c0f506618
|
update: 更新样式引入
|
2023-03-01 10:26:27 +08:00 |
easy
|
1793218b6a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 09:43:23 +08:00 |
|
easy
|
1bcdb93455
|
update: 应用管理、api配置、第三方用户首页over
|
2023-03-01 09:43:04 +08:00 |
wangshuaiswim
|
65e76e6225
|
fix: 修改PermissionButton响应式
|
2023-02-28 22:11:59 +08:00 |
|
xieyonghong
|
7e450b53db
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-28 22:02:05 +08:00 |
|
xieyonghong
|
833359a40e
|
feat: 添加jetlinks-ui-components
|
2023-02-28 22:01:24 +08:00 |
|
JiangQiming
|
c8ff870a8a
|
fix: 删除无用代码
|
2023-02-28 21:58:51 +08:00 |
|
JiangQiming
|
f538867e65
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 21:54:46 +08:00 |
|
JiangQiming
|
2456da950d
|
feat: 国标级联新增字段验证
|
2023-02-28 21:54:33 +08:00 |
leiqiaochu
|
459ad37e0d
|
feat: 告警记录页面
|
2023-02-28 21:50:25 +08:00 |
|
leiqiaochu
|
962fa72fdb
|
feat: 告警记录页面
|
2023-02-28 21:49:28 +08:00 |
100011797
|
1634d01c2a
|
fix: 场景联动权限
|
2023-02-28 21:37:56 +08:00 |
|
100011797
|
7822393092
|
feat: 场景联动卡片
|
2023-02-28 21:32:47 +08:00 |
|
jackhoo_98
|
67a5a78db5
|
Merge branch 'dev' into dev-hub
|
2023-02-28 21:17:00 +08:00 |
|
jackhoo_98
|
7143af3ff1
|
feat: 设备接入网关 接口调试 加入权限
|
2023-02-28 21:15:54 +08:00 |
|
JiangQiming
|
80ea19a6e2
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 21:13:25 +08:00 |
|
JiangQiming
|
fbff5146bd
|
feat: 国标级联新增/编辑
|
2023-02-28 21:13:10 +08:00 |
|
wangshuaiswim
|
bee4050386
|
fix: 物模型TSL修改
|
2023-02-28 20:44:44 +08:00 |
|
wangshuaiswim
|
5a613e40e9
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 20:06:33 +08:00 |
|
wangshuaiswim
|
468bbd3eb3
|
fix: 修改物模型
|
2023-02-28 20:06:15 +08:00 |
|
JiangQiming
|
e233e9f55f
|
fix: 代码编辑器数据监听错误解决
|
2023-02-28 19:45:23 +08:00 |
|
JiangQiming
|
abdfee115c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 18:55:28 +08:00 |
|
JiangQiming
|
d0b0cfa6ba
|
feat: 国标级联列表/禁用/启用/删除
|
2023-02-28 18:55:13 +08:00 |
|
easy
|
ff52e85331
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 18:07:25 +08:00 |
|
easy
|
0ef7e80c5c
|
update: api配置左侧树按模式对数据进行过滤
|
2023-02-28 18:06:57 +08:00 |
|
wangshuaiswim
|
7abe5adf2e
|
fix: 物模型修改
|
2023-02-28 17:19:06 +08:00 |
|
easy
|
277b77f59e
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 15:49:27 +08:00 |
|
easy
|
b827b54a71
|
update: 第三方应用首页
|
2023-02-28 15:49:07 +08:00 |
|
JiangQiming
|
f6996b9679
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 15:47:53 +08:00 |
|
JiangQiming
|
5ee1eec52d
|
feat: 国际级联
|
2023-02-28 15:47:40 +08:00 |
|
100011797
|
74fb1cc403
|
feat: 设备-日志管理
|
2023-02-28 15:25:38 +08:00 |
|
JiangQiming
|
715d269d90
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 15:01:29 +08:00 |
|
JiangQiming
|
e0be36fe33
|
feat: 通道新增/编辑/删除
|
2023-02-28 15:01:16 +08:00 |
|
100011797
|
7dbf13888f
|
feat: 地图轨迹
|
2023-02-28 14:25:38 +08:00 |
|
JiangQiming
|
32f3039153
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 13:41:22 +08:00 |
|
JiangQiming
|
18b0f25993
|
fix: bug#10231
|
2023-02-28 13:41:04 +08:00 |
|
leiqiaochu
|
b92fe00806
|
feat: 告警记录
|
2023-02-28 11:16:04 +08:00 |
|
wangshuaiswim
|
46264b3696
|
fix: 物模型功能开发
|
2023-02-28 10:26:59 +08:00 |
|
wangshuaiswim
|
231950bdea
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-28 10:26:30 +08:00 |
|
xieyonghong
|
940bbfc11f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-28 08:49:03 +08:00 |
|
xieyonghong
|
a0f9d8d44c
|
feat: 新增场景联动-触发规则-功能
|
2023-02-28 08:47:53 +08:00 |
|
jackhoo_98
|
568afdb69e
|
fix: 运维管理 仪表盘代码优化
|
2023-02-27 19:59:30 +08:00 |
|
wangshuaiswim
|
02153a63da
|
fix: 物模型属性开发
|
2023-02-27 19:35:05 +08:00 |
|
wangshuaiswim
|
76dfb3a797
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 19:24:43 +08:00 |
|
wangshuaiswim
|
9189d8a212
|
fix: 物模型开发
|
2023-02-27 19:24:22 +08:00 |
|
JiangQiming
|
84278cd232
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 18:13:20 +08:00 |
|
JiangQiming
|
5c9ad767ad
|
feat: 通道管理
|
2023-02-27 18:13:06 +08:00 |
|
jackhoo_98
|
401634be3e
|
feat: 运维管理 仪表盘
|
2023-02-27 18:10:06 +08:00 |
|
easy
|
1330d3401c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 17:50:15 +08:00 |
|
easy
|
72c72888df
|
update: 应用管理添加集成菜单弹窗、cardbox组件添加遮罩层
|
2023-02-27 17:49:40 +08:00 |
|
xieyonghong
|
ebacfa71da
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-27 16:47:09 +08:00 |
|
xieyonghong
|
e4a124a433
|
feat: 新增场景联动-触发规则-属性修改
|
2023-02-27 16:40:53 +08:00 |
|
JiangQiming
|
89e1271206
|
fix: bug#10229
|
2023-02-27 16:13:49 +08:00 |
|
JiangQiming
|
980dd7af3a
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-27 14:42:27 +08:00 |
|
JiangQiming
|
c60410c1d4
|
feat: 通道列表
|
2023-02-27 14:40:49 +08:00 |
|
jackhoo_98
|
fd0c3f2eb8
|
fix: 远程升级新增 修复版本号重复校验
|
2023-02-27 11:45:41 +08:00 |
|
jackhoo_98
|
a77997d87f
|
Merge branch 'dev' into dev-hub
|
2023-02-27 10:53:07 +08:00 |
|
easy
|
c24be85601
|
update: 应用管理
|
2023-02-26 18:03:51 +08:00 |
|
jackhoo_98
|
c3b8d46e7c
|
feat: 远程升级 升级任务详情
|
2023-02-25 21:44:23 +08:00 |
|
jackhoo_98
|
d226d8758f
|
feat: 远程升级 升级任务详情 基本样式
|
2023-02-24 18:24:15 +08:00 |
|
xieyonghong
|
bba6ef3c30
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-02-24 18:22:56 +08:00 |
|
xieyonghong
|
be501e77fe
|
feat: 新增场景联动-触发规则
|
2023-02-24 18:21:44 +08:00 |
|
100011797
|
25ee85681c
|
fix: 运行状态详情查看
|
2023-02-24 18:07:41 +08:00 |
|
JiangQiming
|
15be308dc8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 18:01:08 +08:00 |
|
JiangQiming
|
55a0a2adb5
|
feat: 视频设备通道
|
2023-02-24 18:00:53 +08:00 |
|
easy
|
d97018475c
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 17:59:11 +08:00 |
|
easy
|
86ee86d119
|
update: 应用管理
|
2023-02-24 17:58:44 +08:00 |
|
JiangQiming
|
446f4b17d5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 17:46:28 +08:00 |
|
JiangQiming
|
8b842883ec
|
feat: 视频编辑优化
|
2023-02-24 17:46:14 +08:00 |
|
leiqiaochu
|
6a275ee983
|
feat: 告警中心告警配置40%
|
2023-02-24 17:23:36 +08:00 |
|
JiangQiming
|
1003130a4c
|
fix: bug#10174
|
2023-02-24 17:19:00 +08:00 |
|
JiangQiming
|
164cec5aa5
|
fix: bug#10191
|
2023-02-24 17:06:13 +08:00 |
|
JiangQiming
|
0dcdac0ee6
|
fix: bug#10196
|
2023-02-24 16:50:45 +08:00 |
|
JiangQiming
|
f3620e5e07
|
fix: bug#10198
|
2023-02-24 14:55:30 +08:00 |
|
jackhoo_98
|
15ff1c7759
|
feat: 远程升级 升级任务
|
2023-02-24 14:18:06 +08:00 |
|
JiangQiming
|
15c31a449b
|
fix: bug#10199 #10201
|
2023-02-24 14:07:45 +08:00 |
|
JiangQiming
|
6af3a1a998
|
fix: 解决字段内容提取变量重复的bug
|
2023-02-24 11:51:45 +08:00 |
|
JiangQiming
|
ad2bc40614
|
fix: bug#10163
|
2023-02-24 11:15:27 +08:00 |
|
JiangQiming
|
b874687bfe
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-24 10:19:59 +08:00 |
|
JiangQiming
|
b5e547831d
|
fix: bug#10181
|
2023-02-24 10:19:47 +08:00 |
|
leiqiaochu
|
bf8b593573
|
fix: 规则编排样式
|
2023-02-24 09:53:52 +08:00 |
|
leiqiaochu
|
442ca04cf8
|
fix: 惨平页面
|
2023-02-24 09:50:23 +08:00 |
|
jackhoo_98
|
6ee95decd0
|
fix: 合并冲突
|
2023-02-24 09:37:33 +08:00 |
|
jackhoo_98
|
13cba5d457
|
feat: 远程升级 升级任务列表/选择设备组件
|
2023-02-24 09:34:07 +08:00 |
|
100011797
|
0e3c28e64d
|
fix: merge
|
2023-02-24 09:27:53 +08:00 |
|
100011797
|
8b66147fa6
|
fix: 北向输出权限按钮
|
2023-02-24 09:26:24 +08:00 |
|
wangshuaiswim
|
ee37c20d8d
|
fix: 修复代码编辑框回显
|
2023-02-23 20:09:30 +08:00 |
|
wangshuaiswim
|
372cf91fbb
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:03:51 +08:00 |
|
wangshuaiswim
|
82fccd6be5
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-02-23 20:02:56 +08:00 |