Commit Graph

1749 Commits

Author SHA1 Message Date
xieyonghong 6be3ee10b8 style: 更换首页图片 2023-05-22 09:43:12 +08:00
xieyonghong 23becbc2f1 Merge branch 'dev'
# Conflicts:
#	package.json
2023-05-19 17:59:23 +08:00
xieyonghong 08d9280fec fix: bug#13846.13671,13974,13188,13222,13639,13975,13668 2023-05-19 17:57:47 +08:00
xieyonghong fc2e324c2f fix: bug#13188 2023-05-18 16:42:35 +08:00
XieYongHong 73e527f12c
fix: 修复设备接入更换接入方式,参数名称未发生变化问题 2023-05-18 16:20:20 +08:00
xieyonghong 8753862d96 fix: bug#13946 2023-05-18 16:19:02 +08:00
xieyonghong 33a70b8c79 fix: bug#13946 2023-05-18 15:36:45 +08:00
xieyonghong 1645f608b6 fix: bug#13749 2023-05-18 14:37:55 +08:00
xieyonghong eae23b5021 fix: 修复设备接入更换接入方式,参数名称未发生变化问题 2023-05-18 14:33:46 +08:00
xieyonghong 6c8498ab44 fix: bug#13841 2023-05-18 13:59:30 +08:00
xieyonghong ed0f992ad1 fix: bug#13222 2023-05-18 13:38:36 +08:00
xieyonghong 1dc0722b65 fix: bug#13639、13188 2023-05-18 13:38:35 +08:00
xieyonghong 7b05778587 fix: bug#13162 2023-05-18 13:38:35 +08:00
xieyonghong 83d95bd9c9 fix: bug#12259 2023-05-18 13:38:34 +08:00
100011797 5a0d709154 fix: 修改场景联动-通知方式的时间选择问题 2023-05-18 11:12:30 +08:00
100011797 189381c5fa fix: 场景联动-收信人结构修改 2023-05-18 10:59:32 +08:00
100011797 8e890e89fd fix: 13662、13673、13173 2023-05-17 18:08:25 +08:00
xieyonghong 5dcbf2d28f feat: 修改文字 2023-05-17 14:43:54 +08:00
xieyonghong fe291a1ca0 feat: 完善场景联动-触发规则-数据发生变化进行提示 2023-05-17 14:42:57 +08:00
xieyonghong 92530b6b88 feat: 优化场景联动-执行动作-数据发生变化时触发校验 2023-05-16 18:06:39 +08:00
xieyonghong 7b4fb484bf fix: 修复https下无法访问网关远程控制 2023-05-15 15:40:59 +08:00
xieyonghong 19d7fadfbe fix: bug#12259 2023-05-15 13:57:58 +08:00
xieyonghong 372ec43eb8 fix: bug#13644 2023-05-15 11:55:17 +08:00
xieyonghong 617cd8b76b fix: bug#13648 2023-05-15 10:43:22 +08:00
xieyonghong 4bb50a9ebc fix: bug#13670 2023-05-15 09:49:37 +08:00
xieyonghong 0618f613ba fix: bug#13738 2023-05-15 09:36:21 +08:00
XieYongHong 285d108bbc
fix: 修复场景联动关系用户显示
* fix: 优化采集器无数据时页面卡死问题

* fix: 修复场景联动关系用户显示
2023-05-11 18:47:34 +08:00
xieyonghong 33910ab38a fix: 修复场景联动关系用户显示 2023-05-11 18:11:51 +08:00
XieYongHong 26f63b7abe
fix: 优化采集器无数据时页面卡死问题 2023-05-11 17:10:51 +08:00
xieyonghong 1cb1241c14 fix: 优化采集器无数据时页面卡死问题 2023-05-11 15:22:56 +08:00
xieyonghong 7aac9cfce6 fix: 优化license保存接口参数类型 2023-05-10 13:54:04 +08:00
100011797 6253aa5c32 fix: 修改bug 2023-05-09 23:22:54 +08:00
xieyonghong 618309d7b0 fix: bug#13489 2023-05-09 11:30:52 +08:00
xieyonghong 8339b37b2c fix: bug#13455 2023-05-09 09:28:39 +08:00
xieyonghong d9ac1d456c fix: 优化场景联动-执行动作删除校验 2023-05-08 18:01:19 +08:00
xieyonghong 07c249fdf4 fix: 优化license页面 2023-05-08 18:00:16 +08:00
xieyonghong 16960ea287 fix: 优化设备批量启动请求参数处理 2023-05-08 16:05:55 +08:00
xieyonghong 436ae6cf54 fix: 修复license页面无法访问问题 2023-05-08 14:33:20 +08:00
xieyonghong 35270e4a26 fix: 修复采集器编无法修改数据类型 2023-05-05 16:34:04 +08:00
xieyonghong b79e447279 fix: 优化采集器-modbus新增节点数据类型 2023-05-05 15:14:56 +08:00
xieyonghong 9c0e91b57b fix: 优化设备接入操作 2023-05-05 14:38:48 +08:00
xieyonghong bf5afde34e Merge branch '2.0-bugfix' into dev
# Conflicts:
#	src/views/oauth/index.vue
2023-05-04 18:08:28 +08:00
xieyonghong 030c6b7921 fix: 完善执行动作联级查询 2023-05-04 18:06:46 +08:00
xieyonghong 0fca64771a fix: 修复执行动作无法添加问题 2023-05-04 16:48:04 +08:00
xieyonghong 4200ea9711 fix: 优化首页背景图 2023-05-04 16:40:49 +08:00
xieyonghong 69a9ce0866 fix: bug#11981 2023-05-04 16:31:39 +08:00
xieyonghong 2a4ba56ce4 fix: bug#12884 2023-05-04 15:38:32 +08:00
xieyonghong d66ea9c8a8 fix: bug#12763 2023-05-04 15:30:13 +08:00
XieYongHong baea9bd5aa
fix: 修复菜单配置无法调整顺序的问题 2023-04-28 17:23:44 +08:00
xieyonghong 3fb2b4b956 fix: 修复菜单配置无法调整顺序的问题 2023-04-28 17:20:18 +08:00
xieyonghong a0e46a7dff fix: 修复设备接入使用插件无效问题 2023-04-28 15:45:25 +08:00
XieYongHong 66bfd6bae8
fix: 优化接口超时文案提示 2023-04-28 15:10:40 +08:00
xieyonghong 7ae187ba63 fix: 优化接口超时文案提示 2023-04-28 15:08:01 +08:00
XieYongHong 056c694a92
fix: 修复iot账号无法登录可视化
* fix: 优化oauth页面

* fix: 修复iot账号无法登录可视化
2023-04-27 17:57:19 +08:00
xieyonghong b59ad04c37 fix: 修复iot账号无法登录可视化 2023-04-27 17:51:44 +08:00
xieyonghong ce4d63be55 fix: 优化oauth页面 2023-04-27 16:25:08 +08:00
xieyonghong 9b138b0e6c fix: 删除多余代码 2023-04-27 15:45:17 +08:00
xieyonghong f6659da1b8 fix: 修复插件管理新增id校验失败 2023-04-27 14:54:27 +08:00
xieyonghong a2bebe1f36 fix: 修复插件设备映射后没有回显 2023-04-27 14:09:22 +08:00
xieyonghong 84e4b790d1 Merge branch '2.0-bugfix' into dev 2023-04-27 11:43:54 +08:00
xieyonghong 816cadbc3b fix: 修复内部应用页面跳转后显示错误提示的问题 2023-04-27 11:42:38 +08:00
xieyonghong a44edbb036 fix: 修复采集器查询失败问题 2023-04-27 11:22:41 +08:00
xieyonghong 5dcba5e4aa fix: 优化插件映射传参 2023-04-27 10:43:35 +08:00
xieyonghong c2ad03d526 Merge branch '2.0-bugfix' into dev 2023-04-26 18:08:48 +08:00
xieyonghong ca4c364155 fix: bug#12338 2023-04-26 18:05:23 +08:00
xieyonghong 84fa6f877b fix: bug#12350 2023-04-26 16:38:39 +08:00
xieyonghong 0a661d4a64 fix: bug#12362 2023-04-26 16:26:41 +08:00
xieyonghong b193c56f64 fix: bug#12460 2023-04-26 14:31:28 +08:00
xieyonghong 122c7ae928 fix: bug#12637、12632 2023-04-26 14:30:09 +08:00
xieyonghong 5f8bc64b1e fix: 修复右上角通知文件notification兼容处理 2023-04-26 10:25:49 +08:00
xieyonghong c99d2795bc fix: bug#12637 2023-04-26 10:00:27 +08:00
xieyonghong a01d4d278a Merge branch '2.0-bugfix' into dev
# Conflicts:
#	src/views/notice/Template/Detail/index.vue
2023-04-25 18:28:13 +08:00
xieyonghong 730a42567f fix: bug#12051 2023-04-25 18:21:26 +08:00
xieyonghong f65f9e645f fix: 修复通知管理-钉钉调试失败 2023-04-25 17:45:56 +08:00
xieyonghong f83287ce12 fix: bug#12492 2023-04-25 15:36:35 +08:00
xieyonghong 229bec30ed fix: 优化场景联动-消息通知-内置参数 2023-04-25 15:32:52 +08:00
xieyonghong 1568102bbe style: 优化设备接入详情页步骤按钮 2023-04-24 18:08:15 +08:00
xieyonghong 5f7e1a88d3 fix: bug#10975 2023-04-24 18:00:11 +08:00
xieyonghong 0a3070f3df fix: bug#12135 2023-04-24 17:52:56 +08:00
xieyonghong 8d817c5365 fix: bug#12122 2023-04-24 17:39:17 +08:00
xieyonghong 5ac7ff4906 fix: bug#10944 2023-04-24 13:59:51 +08:00
xieyonghong 50ba72b1c5 fix: bug#12017 2023-04-24 13:39:36 +08:00
xieyonghong 1e42dd9475 fix: bug#12084 2023-04-24 11:39:39 +08:00
xieyonghong faf9a518e9 fix: bug#19092 2023-04-24 11:29:06 +08:00
xieyonghong 0154fb7d7c fix: 修复场景联动数据格式错误问题 2023-04-24 11:05:26 +08:00
xieyonghong a42c108b08 style: 替换新图片;优化物模型提示语颜色;更新组件库1.0.9 2023-04-24 10:13:37 +08:00
xieyonghong 609514ed61 style: 优化卡片颜色 2023-04-23 15:30:30 +08:00
xieyonghong 0206235e8f style: 优化告警中心-仪表盘图片 2023-04-23 15:06:47 +08:00
xieyonghong 29ffa38c10 style: 优化视频中心-首页图片 2023-04-23 14:54:09 +08:00
xieyonghong d61207076f style: 优化视频中心-仪表盘图片 2023-04-23 14:50:49 +08:00
xieyonghong d552ddf3f6 style: 优化告警仪表盘-最新告警-告警级别宽度 2023-04-23 14:34:14 +08:00
xieyonghong 8e7864219f fix: bug#11107 2023-04-23 14:27:54 +08:00
xieyonghong 3039b1e42d feat: 优化插件编辑上传回显文件名 2023-04-23 13:56:02 +08:00
xieyonghong a1982f1538 feat: 优化产品物模型映射搜索和排序 2023-04-23 10:31:17 +08:00
xieyonghong 5772c050f8 feat: 完善插件管理 2023-04-21 18:49:42 +08:00
XieYongHong 1e37450614
fix: 修复登录成功之后在某些情况下无法进入初始化页面 2023-04-21 14:41:06 +08:00
xieyonghong 4b2b8c1728 fix: 修复登录成功之后查询登录用户信息 2023-04-21 14:20:25 +08:00
xieyonghong 0bb5991231 fix: 修复通知模板-钉钉机器人参数 2023-04-20 20:10:37 +08:00
xieyonghong fdf8bf055d fix: 修复大小写导致无法打包问题 2023-04-20 17:04:04 +08:00
xieyonghong 677f65ff8c feat: 新增设备批量导出-映射设备 2023-04-19 17:25:07 +08:00