XieYongHong
|
5e3c603bb5
|
Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary
|
2023-11-03 16:56:56 +08:00 |
|
XieYongHong
|
2635f78890
|
fix: 修改初始化数据
|
2023-11-03 16:54:30 +08:00 |
leiqiaochu
|
bdb150609b
|
Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary
|
2023-11-03 14:04:27 +08:00 |
|
leiqiaochu
|
44ad3ccab5
|
fix: bug#19699、19666、19655
|
2023-11-03 14:03:51 +08:00 |
|
XieYongHong
|
82aeb6b522
|
fix: 修改订阅关于工作流的标识
|
2023-11-02 10:47:01 +08:00 |
|
XieYongHong
|
3fc10962ae
|
Merge branch 'dev' into dev-dictionary
|
2023-11-02 10:37:40 +08:00 |
|
XieYongHong
|
09704d42a9
|
fix: 优化初始化菜单配置
|
2023-11-02 10:37:10 +08:00 |
|
XieYongHong
|
e1e1ed4a27
|
fix: 优化初始化菜单配置
|
2023-11-02 10:13:57 +08:00 |
qiaochuLei
|
8d941fd875
|
fix: bug#19588
* fix: 菜单bug
* fix: bug#19588
|
2023-11-02 10:09:32 +08:00 |
|
leiqiaochu
|
33c92b72e1
|
feat: 站内信工作流通知
|
2023-11-01 11:32:50 +08:00 |
|
XieYongHong
|
b79e345cc5
|
Merge branch 'dev' into dev-dictionary
|
2023-10-31 14:57:31 +08:00 |
|
qiaochuLei
|
d2fd316ef5
|
fix: bug#19117、19108
* fix: bug#19108
* fix: bug#19117
* fix: bug#19117
|
2023-10-31 14:53:57 +08:00 |
|
XieYongHong
|
56052135c0
|
fix: 优化菜单配置
|
2023-10-31 10:22:02 +08:00 |
|
leiqiaochu
|
28a5c230e4
|
fix: bug#19251
|
2023-10-30 17:23:55 +08:00 |
|
leiqiaochu
|
d3835c3184
|
fix: bug#19355
|
2023-10-30 13:57:09 +08:00 |
|
XieYongHong
|
22d1022189
|
Merge branch 'dev' into dev-dictionary
|
2023-10-30 11:51:22 +08:00 |
|
XieYongHong
|
5dd01e5863
|
fix: iframe组件优化没有参数时，url格式
|
2023-10-30 11:28:36 +08:00 |
|
XieYongHong
|
2abc3362c8
|
Merge branch 'dev' into dev-dictionary
# Conflicts:
# package.json
# src/store/menu.ts
# src/utils/menu.ts
# src/views/device/Instance/Detail/components/BindParentDevice/index.vue
# src/views/system/Menu/Detail/BasicInfo.vue
# src/views/system/Menu/index.vue
# yarn.lock
|
2023-10-27 15:15:58 +08:00 |
|
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 |