leiqiaochu
|
4357cb93fa
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-11 14:18:25 +08:00 |
leiqiaochu
|
41e7e842af
|
fix: bug#16195
|
2023-07-11 14:17:42 +08:00 |
100011797
|
8db22171a3
|
fix: 修改bug
|
2023-07-11 14:12:56 +08:00 |
XieYongHong
|
0b961e49e3
|
fix: bug#16097
|
2023-07-11 13:46:23 +08:00 |
XieYongHong
|
1e3324859a
|
fix: bug#10551
|
2023-07-11 13:32:41 +08:00 |
leiqiaochu
|
2f073b0413
|
fix: bug#16191、16070、16087、15717、15420
|
2023-07-11 11:53:42 +08:00 |
100011797
|
e4191da93e
|
fix: 修改bug
|
2023-07-11 11:51:43 +08:00 |
XieYongHong
|
cd4ce56618
|
fix: 修复边缘端映射bug
* fix: 修改登录后跳转方式
* fix: 修改物模型的其他配置按照类型配置
* feat: 登录密码加密
* fix: 应用管理赋权接口报错
* fix: 修复边缘端映射bug
|
2023-07-11 11:26:10 +08:00 |
胡彪
|
8048e80aa6
|
feat: 更新README
* feat: 更改顶部以及侧边菜单配置到store\system.ts
* feat: 新增README 更改配置 内容
* feat: 新增README 新增/编辑菜单
* feat: 新增README 去掉导航栏右上角jetlinks文档
|
2023-07-11 11:14:01 +08:00 |
XieYongHong
|
86be3af92e
|
fix: 撤销bug#11210修改
|
2023-07-11 11:11:29 +08:00 |
XieYongHong
|
87709f67bb
|
fix: bug#15718
|
2023-07-11 11:10:09 +08:00 |
XieYongHong
|
035d311e07
|
fix: bug#11210
|
2023-07-11 10:09:55 +08:00 |
XieYongHong
|
19706fec7b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-10 20:12:20 +08:00 |
leiqiaochu
|
8ec0b5a020
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-10 20:11:28 +08:00 |
XieYongHong
|
153c8c3556
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-10 20:11:16 +08:00 |
leiqiaochu
|
f8b6a610e3
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-10 20:11:04 +08:00 |
100011797
|
d4f10e639f
|
fix: 修改bug
|
2023-07-10 20:10:41 +08:00 |
leiqiaochu
|
dbe58704d8
|
fix: bug#10080
|
2023-07-10 20:09:03 +08:00 |
leiqiaochu
|
4aa06e4ad1
|
fix: 10080
|
2023-07-10 20:08:31 +08:00 |
XieYongHong
|
ce20383f7d
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-07-10 20:08:09 +08:00 |
XieYongHong
|
d7d0329477
|
fix: bug#16110
|
2023-07-10 20:04:15 +08:00 |
100011797
|
91e6f1b8ab
|
fix: 去掉cancelSelect
|
2023-07-10 19:56:54 +08:00 |
100011797
|
e42c6b34d1
|
fix: 修改bug
|
2023-07-10 19:46:43 +08:00 |
100011797
|
71af134d09
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-10 19:45:58 +08:00 |
leiqiaochu
|
458b5dd8f9
|
fix: bug#16173、16172、16138、15092
|
2023-07-10 19:25:44 +08:00 |
XieYongHong
|
a9188563b7
|
fix: bug#15531
|
2023-07-10 19:10:46 +08:00 |
XieYongHong
|
c0a7d9ce91
|
fix: bug#15155
|
2023-07-10 19:01:00 +08:00 |
XieYongHong
|
6596016642
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-10 18:56:57 +08:00 |
XieYongHong
|
9b00ebcc25
|
fix: 优化产品物模型编辑状态
|
2023-07-10 18:53:33 +08:00 |
100011797
|
7504dc3f88
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-10 17:55:44 +08:00 |
100011797
|
bd42cdd3fb
|
fix: 修改bug
|
2023-07-10 17:55:36 +08:00 |
leiqiaochu
|
56b3b0acfb
|
fix: bug#16085、16024、15967、15924、16072、16070、16067
|
2023-07-10 17:01:50 +08:00 |
100011797
|
a4aa193781
|
fix: 修改message
|
2023-07-10 15:42:28 +08:00 |
100011797
|
b3f194675b
|
fix: 修改bug
|
2023-07-10 11:57:08 +08:00 |
100011797
|
fe9fe82e20
|
fix: 修改bug
|
2023-07-10 11:42:37 +08:00 |
XieYongHong
|
cf4806738f
|
fix: 优化设备物模型
|
2023-07-10 10:39:04 +08:00 |
100011797
|
7daaa88407
|
fix: allow-scripts
|
2023-07-10 10:19:51 +08:00 |
100011797
|
bee1c13d94
|
fix: 修改bug
|
2023-07-10 09:43:00 +08:00 |
xieyonghong
|
a8338a5981
|
fix: 优化设备物模型
|
2023-07-09 19:34:16 +08:00 |
XieYongHong
|
c8fa001655
|
fix: 优化物模型-标签定义
|
2023-07-08 18:13:47 +08:00 |
xieyonghong
|
3231c7ea12
|
fix: 优化物模型-编辑表格标识校验
|
2023-07-07 21:57:12 +08:00 |
100011797
|
2e50b866f0
|
fix: 修改bug
|
2023-07-07 18:29:47 +08:00 |
XieYongHong
|
9eacdb2687
|
fix: 优化物模型-功能定义-(输入、输出)
|
2023-07-07 18:21:17 +08:00 |
XieYongHong
|
7c2f4c410c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-07 17:25:00 +08:00 |
XieYongHong
|
4d995d98ed
|
fix: 优化物模型-功能定义-输出
|
2023-07-07 17:22:46 +08:00 |
100011797
|
ddcc8db097
|
fix: 修改bug
|
2023-07-07 17:22:29 +08:00 |
100011797
|
5af3624676
|
fix: 修改bug
|
2023-07-07 15:00:00 +08:00 |
100011797
|
daef6b7f1f
|
fix: 修改bug
|
2023-07-07 14:04:51 +08:00 |
XieYongHong
|
e103369689
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-07 11:09:50 +08:00 |
XieYongHong
|
90df330400
|
fix: 优化物模型-功能定义-输出
|
2023-07-07 11:09:28 +08:00 |