XieYongHong
|
ff98143f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-27 15:03:19 +08:00 |
qiaochuLei
|
e215fb57be
|
fix: bug#19181
* fix: bug#19060、19090
* fix: bug#19181
|
2023-10-27 15:01:07 +08:00 |
|
XieYongHong
|
5382aee3fe
|
fix: bug#19080
|
2023-10-27 15:00:05 +08:00 |
|
XieYongHong
|
aa0ffab927
|
fix: bug#19167
|
2023-10-27 14:32:40 +08:00 |
100011797
|
6c1917d9c3
|
fix: 区域管理的编辑的修改
|
2023-10-27 10:19:21 +08:00 |
|
XieYongHong
|
67309da698
|
Merge branch 'dev' into dev-dictionary
|
2023-10-26 16:28:43 +08:00 |
leiqiaochu
|
890f46c04e
|
fix: bug#19181
|
2023-10-26 16:12:53 +08:00 |
|
qiaochuLei
|
f2317db02d
|
Dev bug (#217)
* fix: bug#19215、19214、19213、19183
* fix: bug#19060、19090
|
2023-10-26 15:17:10 +08:00 |
|
100011797
|
a38aff28d7
|
feat: 区域管理编辑和删除
|
2023-10-26 13:38:53 +08:00 |
|
XieYongHong
|
c5d70916dd
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
# Conflicts:
# src/views/system/Region/index.vue
|
2023-10-25 18:54:11 +08:00 |
|
XieYongHong
|
dda03a03f4
|
feat: 优化地区管理地图操作
|
2023-10-25 18:52:30 +08:00 |
|
100011797
|
6b2360cac1
|
feat: 区域管理新增
|
2023-10-25 18:04:34 +08:00 |
|
XieYongHong
|
d5fe1702d2
|
feat: 添加地区管理菜单
|
2023-10-25 11:58:33 +08:00 |
|
100011797
|
97be31a587
|
feat: 区域管理
|
2023-10-25 11:18:40 +08:00 |
|
XieYongHong
|
c5b4c69b82
|
Merge branch 'dev' into dev-dictionary
|
2023-10-25 09:57:48 +08:00 |
|
XieYongHong
|
f319d4e0e2
|
fix: bug#19071
|
2023-10-24 18:26:36 +08:00 |
|
XieYongHong
|
6a2250cbf3
|
Merge branch 'dev' into dev-dictionary
# Conflicts:
# src/views/device/Instance/Detail/ChildDevice/index.vue
|
2023-10-24 15:53:05 +08:00 |
|
XieYongHong
|
f90ee686c1
|
fix: bug#19132
|
2023-10-24 15:48:13 +08:00 |
|
XieYongHong
|
7cae540c88
|
fix: 优化iframe中hash地址
|
2023-10-24 15:46:48 +08:00 |
|
XieYongHong
|
d255a0bc78
|
fix: bug#18263
|
2023-10-24 15:28:34 +08:00 |
|
XieYongHong
|
16d9f5a158
|
fix: 优化物模型配置按钮样式
|
2023-10-24 10:24:13 +08:00 |
|
XieYongHong
|
09d77f4b07
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-23 18:40:29 +08:00 |
|
qiaochuLei
|
d1dff88218
|
* fix: 子设备绑定与解绑
* fix: bug#19092、19086
* fix: 子设备绑定与解绑
|
2023-10-23 18:11:14 +08:00 |
|
XieYongHong
|
633316ac84
|
fix: bug#17054
|
2023-10-23 16:44:17 +08:00 |
|
XieYongHong
|
ec66a46e96
|
fix: bug#17054
|
2023-10-23 16:17:11 +08:00 |
|
XieYongHong
|
4ce90a88b5
|
fix: bug#19121
|
2023-10-23 15:20:22 +08:00 |
|
XieYongHong
|
8e5d797a40
|
fix: 修改docker版本
|
2023-10-23 14:01:30 +08:00 |
|
XieYongHong
|
8548138cf5
|
fix: bug#19087
* fix: bug#19087
|
2023-10-23 13:49:16 +08:00 |
|
XieYongHong
|
70a1cf2197
|
fix: 修复设备功能-执行包含object类型时异常
|
2023-10-23 11:51:17 +08:00 |
|
XieYongHong
|
5a9d4514fe
|
Merge branch 'dev' into dev-dictionary
|
2023-10-23 09:46:04 +08:00 |
|
XieYongHong
|
057de400fe
|
fix: bug#18733
|
2023-10-23 09:36:46 +08:00 |
|
XieYongHong
|
50a9d83270
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-20 18:09:15 +08:00 |
|
qiaochuLei
|
0453eb669f
|
fix: bug#19118
* fix: bug#19118
|
2023-10-20 18:09:00 +08:00 |
|
XieYongHong
|
a00232ce24
|
fix: bug#19132
|
2023-10-20 18:07:29 +08:00 |
|
XieYongHong
|
369b8484ac
|
fix: 优化内部应用集成
|
2023-10-20 17:26:14 +08:00 |
|
qiaochuLei
|
cb4716f37d
|
fix: bug#19135、19137
* fix: bug#19125、19111
* fix: bug#19135、19137
|
2023-10-20 16:55:31 +08:00 |
|
XieYongHong
|
564ab3a0ea
|
fix: bug#19087
|
2023-10-19 18:08:56 +08:00 |
|
XieYongHong
|
2776fd2968
|
Merge branch 'dev' into dev-dictionary
|
2023-10-19 11:08:56 +08:00 |
|
XieYongHong
|
283baa6816
|
fix: bug#19069
* fix: bug#19041
* fix: bug#19069
|
2023-10-19 10:54:21 +08:00 |
|
XieYongHong
|
94069da4b1
|
Merge branch 'dev' into dev-dictionary
|
2023-10-18 18:14:58 +08:00 |
|
XieYongHong
|
6f59a150d3
|
fix: bug#19130
|
2023-10-18 18:13:30 +08:00 |
|
XieYongHong
|
fe080130b8
|
Merge branch 'dev' into dev-dictionary
|
2023-10-17 15:31:41 +08:00 |
|
leiqiaochu
|
329ec037d2
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-10-17 15:29:13 +08:00 |
|
leiqiaochu
|
c0bb93b2f7
|
fix: 获取菜单
|
2023-10-17 15:28:21 +08:00 |
|
XieYongHong
|
2c891e7f49
|
fix: 优化设备批量导出查询条件
|
2023-10-16 15:45:31 +08:00 |
|
XieYongHong
|
c4ddde59ab
|
fix: 优化设备批量导出查询条件
|
2023-10-16 15:32:50 +08:00 |
|
XieYongHong
|
18433ef6e3
|
fix: 删除多余无效引入
|
2023-10-16 09:42:42 +08:00 |
|
qiaochuLei
|
ad04405afb
|
fix: bug#18784
* fix: bug#18784
|
2023-10-12 18:00:27 +08:00 |
|
XieYongHong
|
940be8e53b
|
Merge branch 'dev' into dev-dictionary
|
2023-10-12 17:56:03 +08:00 |
|
qiaochuLei
|
e6205e6602
|
fix: bug#18996
* fix: bug#16956
* fix: bug#18996
|
2023-10-11 17:34:25 +08:00 |