XieYongHong
|
c56dbff80b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-06 18:16:11 +08:00 |
100011797
|
42745b19a1
|
fix: 修改bug
|
2023-07-06 18:15:40 +08:00 |
|
XieYongHong
|
1622206283
|
fix: 优化物模型-功能定义(输入、输出)
|
2023-07-06 18:15:19 +08:00 |
|
XieYongHong
|
c4faec62c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-06 16:50:29 +08:00 |
|
XieYongHong
|
09d1d388b8
|
fix: 优化物模型-功能定义(输入、输出)
|
2023-07-06 16:49:48 +08:00 |
|
100011797
|
56d56af3f1
|
fix: 修改bug
|
2023-07-06 16:33:38 +08:00 |
|
100011797
|
65e1249104
|
fix: 修改bug
|
2023-07-06 16:11:12 +08:00 |
|
XieYongHong
|
5912ebd703
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-06 16:02:07 +08:00 |
|
XieYongHong
|
1ceb3bb925
|
fix: 优化物模型-功能定义
|
2023-07-06 16:01:38 +08:00 |
|
100011797
|
76f22d8503
|
fix: 修改bug
|
2023-07-06 15:59:49 +08:00 |
|
XieYongHong
|
3065cd88c2
|
fix: 优化物模型-规则
|
2023-07-06 15:59:10 +08:00 |
|
XieYongHong
|
590a82b156
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-06 15:01:02 +08:00 |
|
XieYongHong
|
bb602aecd2
|
fix: 优化物模型-详情
|
2023-07-06 15:00:16 +08:00 |
|
100011797
|
99637f0938
|
fix: 物模型映射搜索
|
2023-07-06 14:56:31 +08:00 |
|
100011797
|
9acec4efa1
|
fix: 修改bug
|
2023-07-06 14:21:36 +08:00 |
|
100011797
|
8fc0d9f6d4
|
fix: 修改bug
|
2023-07-06 14:03:34 +08:00 |
|
xieyonghong
|
7f75c05f79
|
fix: 优化物模型必填校验
|
2023-07-05 22:27:36 +08:00 |
|
100011797
|
be0aeb9a0a
|
fix: 修改bug
|
2023-07-05 18:29:24 +08:00 |
|
XieYongHong
|
6651e75930
|
fix: 优化物模型-编辑表格-时间、枚举
|
2023-07-05 18:27:41 +08:00 |
|
XieYongHong
|
c27757aea8
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yarn.lock
|
2023-07-05 15:08:33 +08:00 |
|
XieYongHong
|
e6b10a75f2
|
fix: 修复物模型-编辑表格
|
2023-07-05 15:06:27 +08:00 |
|
100011797
|
268745ff1d
|
fix: 修改bug
|
2023-07-05 15:04:12 +08:00 |
|
100011797
|
f295104d8e
|
fix: 修改ui
|
2023-07-04 18:25:04 +08:00 |
|
XieYongHong
|
0d6e9d8ae8
|
fix: 修复物模型-功能详情
|
2023-07-04 18:19:33 +08:00 |
|
XieYongHong
|
aaa8c1498f
|
fix: 修复物模型-功能无法编辑问题
|
2023-07-03 20:01:13 +08:00 |
|
XieYongHong
|
d1ff921f6f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# vite.config.ts
|
2023-07-03 18:09:21 +08:00 |
|
XieYongHong
|
f5bfd8ee3a
|
fix: 修复权限导入无法编辑问题
|
2023-07-03 18:05:46 +08:00 |
|
100011797
|
a455fc6232
|
fix: 修改bug
|
2023-07-03 18:00:05 +08:00 |
|
100011797
|
14de6706cf
|
fix: 修改bug
|
2023-07-03 17:59:51 +08:00 |
|
XieYongHong
|
90a38268b9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-03 16:10:12 +08:00 |
|
XieYongHong
|
2f1463163c
|
feat: 优化物模型-标签去掉详情
|
2023-07-03 16:09:24 +08:00 |
|
100011797
|
0b3454c225
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-03 15:42:25 +08:00 |
|
XieYongHong
|
40d4f7eb3c
|
fix: 应用管理赋权接口报错
* fix: 修改登录后跳转方式
* fix: 修改物模型的其他配置按照类型配置
* feat: 登录密码加密
* fix: 应用管理赋权接口报错
|
2023-07-03 15:42:02 +08:00 |
|
100011797
|
1e70899bf1
|
Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
|
2023-07-03 15:41:55 +08:00 |
|
100011797
|
0f140b568e
|
fix: 修改bug
|
2023-07-03 15:41:21 +08:00 |
|
XieYongHong
|
176f1dc211
|
feat: 优化物模型单个拷贝、新增编辑逻辑
|
2023-07-03 15:26:45 +08:00 |
|
XieYongHong
|
a6b82b8f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-03 14:54:54 +08:00 |
|
XieYongHong
|
dbbcc37636
|
feat: 优化物模型单个拷贝
|
2023-07-03 14:53:55 +08:00 |
|
100011797
|
a9e4f9d0af
|
fix: 修改bug
|
2023-07-03 11:57:58 +08:00 |
|
XieYongHong
|
74747cd966
|
refactor: 重构物模型操作
* feat: 添加读写类型插件
* feat: 添加读写类型插件
* feat: 优化规则
* feat: 抽离属性来源
* fix: 修改物模型
* feat: 属性来源
* feat: 物模型数据类型
* feat: 事件定义和标签定义
* fix: 物模型数据回显
* feat: 添加DataTable和CheckButton的按需引入
* feat: 添加指标配置
* feat: 添加指标配置和存储配置
* update: 功能定义组件抽离
* update: 事件定义组件抽离
* update: object其他配置
* feat: 添加物模型操作
* update: 修改物模型属性、功能、事件
* feat: 优化物模型操作
* feat: 优化物模型操作
* feat: 优化物模型Object类型
* feat: 优化物模型Object操作以及显示
* feat: 添加属性规则接口
|
2023-07-03 10:54:37 +08:00 |
|
100011797
|
41daa5ea2a
|
fix: 修改bug
|
2023-07-03 10:44:51 +08:00 |
|
100011797
|
560de3c4dd
|
fix: 修改bug
|
2023-06-30 15:09:42 +08:00 |
|
100011797
|
683d3e20e8
|
fix: 修改bug
|
2023-06-30 14:37:11 +08:00 |
|
XieYongHong
|
6ff2f9ebad
|
feat: 登录密码加密
* fix: 修改登录后跳转方式
* fix: 修改物模型的其他配置按照类型配置
* feat: 登录密码加密
|
2023-06-30 09:56:50 +08:00 |
|
100011797
|
bcdd56b510
|
fix: 修改我的订阅
|
2023-06-29 18:15:47 +08:00 |
|
100011797
|
f616ada3a6
|
feat: 修改bug
|
2023-06-29 18:05:18 +08:00 |
|
XieYongHong
|
08efcf29eb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-06-29 17:09:07 +08:00 |
|
100011797
|
0bd4dec42e
|
fix: 修改样式
|
2023-06-29 15:09:43 +08:00 |
|
100011797
|
5f15f21ff2
|
feat: 设备导入
|
2023-06-29 09:54:17 +08:00 |
|
XieYongHong
|
17fa82d2fc
|
fix: 删除多余文件
|
2023-06-28 09:49:50 +08:00 |