Commit Graph

306 Commits

Author SHA1 Message Date
qiaochuLei c2d30f56a7
fix: bug#17005、17056
* fix: 登录加密

* fix: 登录加密功能

* fix: 树样式错乱bug修改

* fix: bug#17059

* fix: bug#17128

* fix: 17131

* fix: bug#17122

* fix: bug#17156

* fix: 修改bug

* fix: bug#17056

* fix: bug#17005

* fix: 修改bug
2023-08-11 09:36:00 +08:00
qiaochuLei f41a209cd5
fix: 树样式错乱bug修改
* fix: 登录加密

* fix: 登录加密功能

* fix: 树样式错乱bug修改
2023-08-08 15:45:43 +08:00
XieYongHong fe0b235405
fix: 修改设备物模型-属性来源可以选择规则
* feat: 修改bug优化ui

* fix: 修改物模型导入bug

* fix: 优化设备物模型-规则调试

* fix: 优化设备物模型-属性来源可以修改产品规则

* fix: 修改设备物模型-属性来源可以选择规则
2023-08-02 11:30:09 +08:00
100011797 8d874e27a6 fix: 修改订阅管理文字提示 2023-07-24 17:57:05 +08:00
XieYongHong 0f10da8404 fix: 修改角色管理-编辑接口请求类型 2023-07-20 11:58:00 +08:00
XieYongHong 58183fa597 fix: 优化多余菜单显示 2023-07-20 10:10:57 +08:00
100011797 e5e1d1e0bd fix: 修改订阅通知样式 2023-07-18 15:12:31 +08:00
XieYongHong 4561e03e96
feat: 2.1
* feat: 优化物模型单个拷贝、新增编辑逻辑

* fix: 修改bug

* fix: 应用管理赋权接口报错

* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* feat: 优化物模型-标签去掉详情

* fix: 修改bug

* fix: 修改bug

* fix: 修复权限导入无法编辑问题

* fix: 修复物模型-功能无法编辑问题

* fix: 修复物模型-功能详情

* fix: 修改ui

* fix: 修改bug

* fix: 修复物模型-编辑表格

* fix: 优化物模型-编辑表格-时间、枚举

* fix: 修改bug

* fix: 优化物模型必填校验

* fix: 修改bug

* fix: 修改bug

* fix: 物模型映射搜索

* fix: 优化物模型-详情

* fix: 优化物模型-规则

* fix: 修改bug

* fix: 优化物模型-功能定义

* fix: 修改bug

* fix: 修改bug

* fix: 优化物模型-功能定义(输入、输出)

* fix: 优化物模型-功能定义(输入、输出)

* fix: 修改bug

* fix: 优化物模型-功能定义-输入

* fix: 优化物模型-事件定义

* fix: 修改bug

* fix: 优化物模型-功能定义-输出

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: 优化物模型-功能定义-输出

* fix: 优化物模型-功能定义-(输入、输出)

* fix: 修改bug

* fix: 优化物模型-编辑表格标识校验

* fix: 优化物模型-标签定义

* fix: 优化设备物模型

* fix: 修改bug

* fix: allow-scripts

* fix: 优化设备物模型

* fix: 修改bug

* fix: 修改bug

* fix: 修改message

* fix: bug#16085、16024、15967、15924、16072、16070、16067

* fix: 修改bug

* fix: 优化产品物模型编辑状态

* fix: bug#15155

* fix: bug#15531

* fix: bug#16173、16172、16138、15092

* fix: 修改bug

* fix: 去掉cancelSelect

* fix: bug#16110

* fix: 10080

* fix: bug#10080

* fix: 修改bug

* fix: bug#11210

* fix: bug#15718

* fix: 撤销bug#11210修改

* feat: 更新README

* feat: 更改顶部以及侧边菜单配置到store\system.ts

* feat: 新增README 更改配置 内容

* feat: 新增README 新增/编辑菜单

* feat: 新增README 去掉导航栏右上角jetlinks文档

* fix: 修复边缘端映射bug

* fix: 修改登录后跳转方式

* fix: 修改物模型的其他配置按照类型配置

* feat: 登录密码加密

* fix: 应用管理赋权接口报错

* fix: 修复边缘端映射bug

* fix: 修改bug

* fix: bug#16191、16070、16087、15717、15420

* fix: bug#10551

* fix: bug#16097

* fix: 修改bug

* fix: bug#16195

* fix: bug#10750

* fix: bug#11076

* fix: 边缘网关绑定子设备

* fix: bug#11093

* fix: bug#15420、16072、16195、16208、16218、16220、16222

* fix: bug#16077

* fix: bug#16212、16217、16223

* fix: 修改dueros

* fix: bug#16092

* fix: bug#16233

* fix: bug#15649

* fix: bug#15933

* fix: 优化物模型属性-指标值

* fix: bug#15649、16087、16231、16254

* fix: 优化设备物模型属性保存

* fix: 修改bug

* fix: 删除多余showSizeChanger

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: bug#16210

* fix: bug#16267

* fix: 修改bug

* fix: bug#16277、16265

* fix: 修复物模型无法新增

* fix: 修改bug

* fix: bug#16275、16087

* fix: 角色管理编辑时新增用户表格增加筛选条件,过滤超级管理员

* fix: bug#16232

* fix: bug#16280

* fix: bug#16312

* fix: 优化视频回放进度无法显示

* fix: bug#16315

* fix: 修改bug

* fix: bug#15871、#16254、#16317

* fix: 优化物模型保存多次提交

* fix: bug#16329、16310、16287、16234、16135

* fix: bug#16316、#16314

* fix: bug#16263

* fix: 根据协议列表展示数据采集菜单

* fix: bug#16333

* fix: bug#16279

* fix: 协议列表提出公共变量

* fix: bug#16337、16338

* fix: bug#16325

* fix: bug

* fix: 修改bug

* fix: bug#16301

* fix: bug#16301

* fix: 修改调试

* fix: bug#16364

* fix: bug#16329

* fix: 修改bug

* fix: 修复物模型属性-规则窗口回显

* fix: 修改bug

* fix: bug#16356

* fix: bug#16279

* fix: 数据采集

* fix: bug#16356

* fix: bug#16365

* fix: bug#16365

* fix: bug#16362

* fix: bug#16358、16366、16374、16375、16379、16385

* fix: 修改bug

* fix: bug#16382

* fix: bug#16386

* fix: bug#16373

* fix: 修复bug

* fix: bug#16322

* fix: 修改bug

* fix: 修改bug

* fix: bug#16355、16323、16349

* fix: 优化物模型重置

* fix: bug#10823

* fix: bug#16404

* fix: 修改bug

* fix: 修改bug

* fix: 修改bug

* fix: bug#16395

* fix: bug#16326

* fix: bug#16382、16381、16384

* fix: 修改bug

* fix: bug#16351

* fix: 修改bug

* fix: 修改bug

* fix: bug#16417

* fix: bug#16423

* fix: bug#16325

* fix: 修改bug

* fix: 修改bug

* fix: bug#16114

* fix: 修复bug

* fix: 修改bug

* fix: bug#16114

* fix: bug#16430

* fix: bug#15968

* fix: bug#16325

* fix: 修改bug

* fix: 修改bug

* fix: bug#16179

* fix: bug#16434

* fix: 修改bug

* feat: 新增异步新建script标签

* fix: bug#16434

* fix: bug#16436

* fix: 修改bug

* fix: 微信登录

* fix: bug#16436

* fix: bug#16441

* fix: 修复TSL不展示虚拟属性

* fix: 修改bug

* fix: bug#16436

* fix: bug#16436

* fix: 修改微信

* fix: 修复登录页动态显示可视化
2023-07-17 09:22:49 +08:00
XieYongHong 16a748b67c fix: 优化标签保存ico回显 2023-06-09 17:51:55 +08:00
XieYongHong 3e6eac1bfa fix: 优化标签title,ico 2023-06-09 17:49:07 +08:00
XieYongHong 462e9f150a feat: 修复组织管理树搜索 2023-06-07 17:48:14 +08:00
XieYongHong 5efd20a863
feat: task#2060
* fix: 15017

* fix: 修改bug(13663、15022、13672)

* fix: 修改操作栏的距离

* fix: bug#15019

* fix: 修改菜单配置

* fix: 修改网络组件的集群控制

* fix: 修改用户管理的类型展示问题

* fix:修改15034

* feat: 优化社区版运维管理-仪表盘-数据加载

* feat: task#2060
2023-06-07 10:57:37 +08:00
XieYongHong 099c6fa32a
fix: 修改用户管理的类型展示问题;修改网络组件的集群控制;
* fix: 15017

* fix: 修改bug(13663、15022、13672)

* fix: 修改操作栏的距离

* fix: bug#15019

* fix: 修改菜单配置

* fix: 修改网络组件的集群控制

* fix: 修改用户管理的类型展示问题
2023-06-06 15:40:37 +08:00
100011797 af5d2e08f6 fix: 修改运行状态写入bool下拉显示问题 2023-06-02 10:04:20 +08:00
100011797 6750e77872 fix: 修改opc_ua写入失败 2023-06-01 10:49:23 +08:00
100011797 e0ada7d6e0 fix: 修改bug(14733、14793、13672、11767) 2023-05-31 14:06:50 +08:00
100011797 ef8dc58ac4 fix: 14203、14491、9658、13663、14207、14226、14493 2023-05-30 18:21:34 +08:00
xieyonghong 08d9280fec fix: bug#13846.13671,13974,13188,13222,13639,13975,13668 2023-05-19 17:57:47 +08:00
xieyonghong 8753862d96 fix: bug#13946 2023-05-18 16:19:02 +08:00
xieyonghong 1dc0722b65 fix: bug#13639、13188 2023-05-18 13:38:35 +08:00
100011797 8e890e89fd fix: 13662、13673、13173 2023-05-17 18:08:25 +08:00
xieyonghong 372ec43eb8 fix: bug#13644 2023-05-15 11:55:17 +08:00
xieyonghong 4bb50a9ebc fix: bug#13670 2023-05-15 09:49:37 +08:00
xieyonghong 07c249fdf4 fix: 优化license页面 2023-05-08 18:00:16 +08:00
xieyonghong 436ae6cf54 fix: 修复license页面无法访问问题 2023-05-08 14:33:20 +08:00
XieYongHong baea9bd5aa
fix: 修复菜单配置无法调整顺序的问题 2023-04-28 17:23:44 +08:00
xieyonghong 122c7ae928 fix: bug#12637、12632 2023-04-26 14:30:09 +08:00
XieYongHong 1e37450614
fix: 修复登录成功之后在某些情况下无法进入初始化页面 2023-04-21 14:41:06 +08:00
xieyonghong 297637f856 style: 优化主题色 2023-04-18 13:48:07 +08:00
xieyonghong 126c33ad82 fix: 修复社区版bug 2023-04-17 19:01:13 +08:00
xieyonghong f70b2c78ce style: 样式调整 2023-04-13 16:42:27 +08:00
xieyonghong 132aa4c920 fix: 优化应用管理默认密码校验规则 2023-04-03 20:58:40 +08:00
xieyonghong ba3e5d0194 fix: 修复应用管理图标显示 2023-04-03 20:31:35 +08:00
xieyonghong af3159ef95 fix: bug#10936 2023-04-03 17:46:31 +08:00
xieyonghong c430478319 fix: 优化场景联动-执行动作-选择产品;修复用户中心无法解绑 2023-04-03 17:00:55 +08:00
xieyonghong dd163c5611 update: 更新为组件库组件 2023-04-03 17:00:54 +08:00
jackhoo_98 25f4ecdbab feat: 菜单管理 菜单配置 修复菜单重复问题 2023-04-02 13:45:54 +08:00
jackhoo_98 bdc4f065ef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-04-01 18:42:04 +08:00
jackhoo_98 94e93a53e5 feat: 修复菜单管理 菜单配置 菜单初始化问题 2023-04-01 18:41:52 +08:00
xieyonghong 2649b6f755 fix: bug#10898 2023-04-01 15:10:32 +08:00
100011797 6a05668cb5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 22:59:56 +08:00
100011797 2d0fc7117a fix:修改数据源 2023-03-31 22:59:48 +08:00
xieyonghong df6bf4d9ee fix: bug#11262 2023-03-31 21:24:59 +08:00
xieyonghong e9f255ca3c fix: 新增个人中心 2023-03-31 21:24:58 +08:00
jackhoo_98 990a2f73af Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 21:22:04 +08:00
jackhoo_98 6ae03a9fc9 fix: bug#11271 2023-03-31 21:21:35 +08:00
JiangQiming ed2eb21d4b fix: bug#11353 2023-03-31 20:32:02 +08:00
JiangQiming 19944afb8b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:56:06 +08:00
JiangQiming d58ec295a9 fix: bug#11269 2023-03-31 18:55:45 +08:00
jackhoo_98 ae2758b5ba Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:03:18 +08:00
leiqiaochu d7198a7ad1 fix: bug菜单管理按钮样式 2023-03-31 16:16:18 +08:00
jackhoo_98 0ec07a4d73 fix: bug#10847 修复菜单管理部分bug 2023-03-31 15:55:12 +08:00
JiangQiming 1beaab1732 fix: bug#11309 2023-03-31 15:52:20 +08:00
leiqiaochu 39d6a156a8 feat: license页面 2023-03-31 14:19:10 +08:00
JiangQiming f2b1b6250e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 14:02:18 +08:00
JiangQiming 497ac1f4ca fix: bug#11274、11273、11272 2023-03-31 14:02:03 +08:00
100011797 4b08712c61 fix: 修改应用管理的状态展示 2023-03-31 13:52:41 +08:00
jackhoo_98 0998f4bc79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 12:40:02 +08:00
jackhoo_98 e7be6d4770 update: 统一修改浏览器标签跳转、设备接入网关新增快速添加 2023-03-31 12:39:44 +08:00
JiangQiming efded0457b fix: bug#11227、11266、11260 2023-03-31 11:51:27 +08:00
JiangQiming f4770bc03f fix: bug#11260 2023-03-31 10:09:04 +08:00
JiangQiming d3af662267 fix: bug#11249、11247、10637、11250 2023-03-30 20:24:05 +08:00
JiangQiming f25468066b fix: bug#11223 2023-03-30 19:58:28 +08:00
JiangQiming f08e28560a update: 系统管理列表撑满高度 2023-03-30 17:18:43 +08:00
JiangQiming a75f2a3fd6 fix: bug#11106 2023-03-30 16:20:16 +08:00
JiangQiming 2bccd21378 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:51:41 +08:00
JiangQiming c88706282f fix: bug#11106 2023-03-30 15:51:16 +08:00
leiqiaochu 2dbd7e31b6 fix: bug路由校验 初始化跳转 2023-03-30 15:39:04 +08:00
xieyonghong d3ea02c0f6 style: 优化组织管理样式 2023-03-30 13:42:16 +08:00
JiangQiming 57af547bfb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:50:49 +08:00
JiangQiming c6ec16350e fix: bug#11221 2023-03-30 11:50:32 +08:00
leiqiaochu 92315c3c39 fix: bug#10777 2023-03-30 11:45:09 +08:00
leiqiaochu 18d950d63f fix: bug#10777 11128 11212 2023-03-30 11:32:15 +08:00
JiangQiming d7790f203f fix: bug#11139、11214 2023-03-30 10:56:51 +08:00
JiangQiming e61efa5832 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:06:43 +08:00
JiangQiming cea070b35c fix: bug#10766 2023-03-29 22:06:27 +08:00
100011797 55cd57269d fix: ico改变 2023-03-29 22:04:09 +08:00
leiqiaochu 922624cbc2 fix: bug#10781 2023-03-29 21:57:36 +08:00
JiangQiming e9f84f959a fix: bug#10803 2023-03-29 21:39:39 +08:00
JiangQiming 4424b56d4c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 21:29:46 +08:00
JiangQiming b7034c5ca4 fix: bug#11037、11057 2023-03-29 21:29:30 +08:00
leiqiaochu 3aa73c4f08 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:55:07 +08:00
JiangQiming ee323a1a7d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:52:50 +08:00
JiangQiming 95c0409c21 fix: bug#11157 2023-03-29 20:52:33 +08:00
leiqiaochu 382f0bff44 fix: bug#11195 2023-03-29 20:45:34 +08:00
100011797 ecd956b4fd fix: 修改场景联动执行动作设备查询排序 2023-03-29 20:38:24 +08:00
JiangQiming 16dc7b7aa7 fix: bug#10762 2023-03-29 20:01:18 +08:00
JiangQiming 0ce7fd5a59 fix: bug#11062、11139 2023-03-29 17:54:23 +08:00
JiangQiming b676b2bba3 fix: bug#11187 2023-03-29 16:34:12 +08:00
JiangQiming d690240184 fix: bug#10692 2023-03-29 14:47:58 +08:00
JiangQiming ac63d41f0b fix: bug#10776、10778 2023-03-29 14:42:55 +08:00
JiangQiming 6cb8e67da2 fix: bug#11071、11075、11058、11062、11151 2023-03-29 10:53:16 +08:00
JiangQiming d8f19671c2 fix: bug#10953 2023-03-28 19:45:37 +08:00
JiangQiming 0ea4214ee3 fix: bug#11114、10540、10783 2023-03-28 16:46:29 +08:00
JiangQiming f8006832e1 fix: bug#11108、10690、10754、10736、11118 2023-03-28 16:07:50 +08:00
JiangQiming be4b59de57 fix: bug#11001 2023-03-28 14:59:48 +08:00
JiangQiming 913560934d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 14:11:28 +08:00
JiangQiming 42828b295f fix: bug#10762 2023-03-28 14:11:13 +08:00
100011797 0a93cd2926 fix:场景联动 2023-03-28 11:01:06 +08:00
jackhoo_98 2aaa3ae945 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-28 10:58:16 +08:00