jackhoo_98
|
86c15261e8
|
fix: 合并冲突
|
2023-03-01 17:32:29 +08:00 |
xieyonghong
|
2299ae271f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-01 17:26:52 +08:00 |
|
xieyonghong
|
730997231e
|
update: 优化ProLayout使用
|
2023-03-01 17:24:57 +08:00 |
JiangQiming
|
9f217551b6
|
feat: 绑定通道
|
2023-03-01 17:19:08 +08:00 |
|
jackhoo_98
|
1230ea3d90
|
feat: 运维管理 仪表盘 新增empty状态
|
2023-03-01 17:08:32 +08:00 |
|
jackhoo_98
|
4e75bf94c6
|
feat: 远程升级 加入权限
|
2023-03-01 17:08:18 +08:00 |
|
JiangQiming
|
349104b70f
|
feat: 国标级联通道列表
|
2023-03-01 16:40:59 +08:00 |
|
jackhoo_98
|
716387150a
|
feat: 网络组件 加入权限
|
2023-03-01 15:45:49 +08:00 |
wzyyy
|
a63be77691
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 15:07:37 +08:00 |
|
wzyyy
|
7cefa62e45
|
fix: 去掉ant的样式
|
2023-03-01 15:07:21 +08:00 |
leiqiaochu
|
eee87548e8
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 14:56:58 +08:00 |
|
leiqiaochu
|
b71248c1b4
|
feat: 告警记录
|
2023-03-01 14:56:03 +08:00 |
|
JiangQiming
|
344729b5de
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-03-01 14:52:15 +08:00 |
|
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
|
c20f707f77
|
update: 修改源地址
|
2023-03-01 14:23:21 +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 |
胡彪
|
fdb3323bcc
|
Merge pull request #54 from jetlinks/dev-hub
feat: 设备接入网关 接口调试 加入权限
|
2023-02-28 21:19:25 +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 |