Commit Graph

1579 Commits

Author SHA1 Message Date
xieyonghong fb1478a181 fix: bug#10839 2023-03-28 08:51:29 +08:00
xieyonghong b6bf92a577 fix: bug#10785 2023-03-28 08:51:28 +08:00
xieyonghong a33e3dd3f9 fix: bug#10767 2023-03-28 08:51:28 +08:00
xieyonghong 6eadc45786 fix: bug#10396 2023-03-28 08:51:28 +08:00
xieyonghong c34647fad5 fix: bug#10824 2023-03-28 08:51:27 +08:00
jackhoo_98 c366f4a2cc fix: bug#11010、11021、11029、11031、11032 修复通道管理部分bug 2023-03-27 21:59:12 +08:00
jackhoo_98 7b17adc477 fix: bug#11023 修复采集器点位新增无反应 2023-03-27 21:39:36 +08:00
jackhoo_98 facafcfae6 fix: 修复采集器仪表盘 时间计算问题 2023-03-27 21:02:34 +08:00
jackhoo_98 45f634b37c Merge branch 'dev' into dev-hub 2023-03-27 20:34:08 +08:00
jackhoo_98 4a561741c8 fix: bug#11004 2023-03-27 20:33:27 +08:00
100011797 7b83732170 fix: 边缘网关和设备诊断 2023-03-27 20:30:07 +08:00
JiangQiming f6947dd3e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 20:00:36 +08:00
JiangQiming 1aae61582e fix: bug#10766 2023-03-27 20:00:18 +08:00
jackhoo_98 5f5b3e5b41 fix: bug#10945 修复菜单管理部分bug 2023-03-27 19:45:28 +08:00
jackhoo_98 478fac0cac fix: 修复网络组件 编辑查看页面空白问题 2023-03-27 19:10:56 +08:00
xieyonghong 4778b558d7 fix: bug#10822 2023-03-27 18:51:19 +08:00
leiqiaochu 4e8c6dfe9d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:58:39 +08:00
leiqiaochu ace81f616d fix: bug#11037 11041 11051 11066 2023-03-27 17:56:47 +08:00
100011797 324d78a213 fix: 北向输出 2023-03-27 17:48:47 +08:00
100011797 9b32fbd21d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:47:34 +08:00
jackhoo_98 e2bcffe771 Merge branch 'dev' into dev-hub 2023-03-27 17:24:37 +08:00
jackhoo_98 bc95eda133 fix: bug#11026、11048、11046、11049、11045、11039 采集器解决部分bug 2023-03-27 17:23:35 +08:00
wangshuaiswim 4d41f82b75 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:15:01 +08:00
wangshuaiswim 3fc1e30027 fix: 修改物模型属性提交时添加type默认值 2023-03-27 17:14:42 +08:00
100011797 9fb80e4123 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 17:05:09 +08:00
100011797 ee7c4e11f7 fix: 修改场景联动 2023-03-27 17:04:08 +08:00
JiangQiming f54b498053 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 16:11:23 +08:00
JiangQiming dbd14ce4d6 fix: bug#10924、11001 2023-03-27 16:11:06 +08:00
xieyonghong 2cad9d7f4e update: 替换Ellipsis为组件库中的Ellipsis组件 2023-03-27 15:59:04 +08:00
xieyonghong ffdee18c34 fix: bug#10833 2023-03-27 15:59:03 +08:00
xieyonghong c0d72a3863 update: 补全数据权限 2023-03-27 15:59:02 +08:00
xieyonghong 8b9330a58d style: 优化场景联动回显校验 2023-03-27 15:59:02 +08:00
JiangQiming 9594893a50 fix: bug#10909、10912 2023-03-27 15:44:48 +08:00
JiangQiming d58bef5897 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 15:29:39 +08:00
JiangQiming 6c47f20f9d fix: bug#10892、10953 2023-03-27 15:29:23 +08:00
jackhoo_98 414a9987d2 Merge branch 'dev' into dev-hub 2023-03-27 15:27:01 +08:00
jackhoo_98 049bf99395 fix: 菜单管理 完成菜单配置 2023-03-27 15:25:53 +08:00
leiqiaochu b8dac68cfa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 14:20:25 +08:00
leiqiaochu 5ac6df4ffb fix: bug#11022 2023-03-27 14:20:04 +08:00
JiangQiming 5d19f58f59 fix: bug#10967、10974 2023-03-27 14:13:52 +08:00
leiqiaochu ca9f2a66c0 fix: bug#10999 10977 10964 10957 10951 10940 10868 2023-03-27 11:16:20 +08:00
wangshuaiswim 1afe27ca91 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-27 11:08:38 +08:00
wangshuaiswim 38a0bc418a fix: 修改布尔类型组件在chrome浏览器下的排版问题 2023-03-27 11:07:59 +08:00
JiangQiming 71fe3f81bd fix: bug#10894 2023-03-27 10:47:50 +08:00
xieyonghong fed5c348e0 style: 优化场景联动卡片的省略内容显示样式 2023-03-27 09:24:45 +08:00
xieyonghong 9b459f2507 update: 优化useParams 2023-03-27 09:22:24 +08:00
xieyonghong 6919d41b93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-26 22:27:49 +08:00
xieyonghong 0dfbac22c5 fix: bug#10937 2023-03-26 22:20:01 +08:00
xieyonghong dcd584c9c7 fix: bug#10946 2023-03-26 21:42:23 +08:00
xieyonghong 3810046bee fix: bug#10947 2023-03-26 21:18:03 +08:00
xieyonghong 1d782a1231 fix: bug#10956 2023-03-26 21:14:17 +08:00
jackhoo_98 05776bd630 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-26 19:13:34 +08:00
jackhoo_98 0f6f2cccb6 feat: 菜单管理 重构菜单配置 完成交互逻辑 2023-03-26 19:12:01 +08:00
xieyonghong 6f8f77bcd6 fix: bug#10958 2023-03-26 17:15:05 +08:00
xieyonghong 065cf055f9 fix: bug#10959 2023-03-26 17:04:34 +08:00
xieyonghong cc84a2a54c fix: bug#10962、10791 2023-03-26 00:34:45 +08:00
xieyonghong ec7ad63f89 style: 优化首页样式 2023-03-26 00:24:33 +08:00
xieyonghong b9e332447e fix: bug#10979 2023-03-26 00:05:03 +08:00
xieyonghong 3dd39c5279 fix: bug#10983 2023-03-25 23:22:15 +08:00
xieyonghong 8370f863bb fix: bug#10984 2023-03-25 23:17:54 +08:00
xieyonghong 8c66b348a3 fix: bug#10986 2023-03-25 23:12:14 +08:00
xieyonghong 1f16b4e827 fix: 修复错误校验 2023-03-25 23:00:46 +08:00
xieyonghong 783010bcb1 fix: bug#10987 2023-03-25 22:55:18 +08:00
xieyonghong 9dab329841 fix: bug#10989 2023-03-25 22:49:18 +08:00
xieyonghong 5c6c8dbed4 fix: bug#10990 2023-03-25 22:40:24 +08:00
xieyonghong b8d0fd5bcf fix: bug#10992 2023-03-25 22:32:53 +08:00
xieyonghong 1455fe8141 fix: bug#10994 2023-03-25 22:26:49 +08:00
xieyonghong 9fb9571699 fix: bug#10995 2023-03-25 21:22:50 +08:00
xieyonghong 4445e81ceb fix: bug#10996 2023-03-25 21:12:19 +08:00
xieyonghong 0f17aee1ab fix: 删除错误引入AIcon 2023-03-25 18:45:38 +08:00
xieyonghong 6549c98605 fix: bug#10837 2023-03-25 18:09:52 +08:00
xieyonghong 7f9cf53dd0 fix: bug#10873 2023-03-25 18:09:51 +08:00
xieyonghong d34af0aeb4 fix: bug#10930 2023-03-25 18:09:51 +08:00
xieyonghong dce719c9d3 fix: bug#10922 2023-03-25 18:09:50 +08:00
xieyonghong 1c0812f8d5 fix: bug#10821 2023-03-25 18:09:50 +08:00
xieyonghong dc0fc31503 fix: bug#10867 2023-03-25 18:09:49 +08:00
xieyonghong 75d748a416 fix: bug#10559 2023-03-25 18:09:49 +08:00
xieyonghong 605466c482 fix: 修复BadgeStatus中status类型 2023-03-25 18:09:48 +08:00
xieyonghong 620a3a4ae8 fix: bug#10514 2023-03-25 18:09:48 +08:00
JiangQiming 532c82afe6 fix: bug#10905、10895、10912、10926、10927、10886 2023-03-25 15:56:11 +08:00
JiangQiming 32f49d95b8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-25 14:44:22 +08:00
JiangQiming 934200dfcd fix: bug#10914、10888 2023-03-25 14:44:07 +08:00
xieyonghong e969b3911f fix: 优化面包屑跳转 2023-03-25 10:06:37 +08:00
JiangQiming 582ebddd21 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 18:48:10 +08:00
JiangQiming 07510a272e fix: bug#10891、10890、10893、10894、10905、10901 2023-03-24 18:47:55 +08:00
100011797 5fbbaa5f83 fix: 修改执行动作 2023-03-24 18:20:21 +08:00
wangshuaiswim daf0597526 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 18:07:42 +08:00
wangshuaiswim bba4650fc8 fix: 查询存储策略增加防抖节流 2023-03-24 18:07:23 +08:00
jackhoo_98 af8f951ed8 Merge branch 'dev' into dev-hub 2023-03-24 18:05:22 +08:00
jackhoo_98 1c23a544fe fix: 菜单管理 菜单配置todo 2023-03-24 18:04:13 +08:00
JiangQiming ebd304fdba Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 17:05:19 +08:00
JiangQiming 0a7cb746ab fix: bug#10904 2023-03-24 17:05:05 +08:00
xieyonghong 739a044823 fix: bug#10363 2023-03-24 17:00:08 +08:00
xieyonghong 12e3bf620b fix: bug#10667 2023-03-24 17:00:08 +08:00
JiangQiming 58e01fe28e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 16:31:40 +08:00
JiangQiming b8a587fd00 fix: bug#10540、10885、10818、10566、10418 2023-03-24 16:31:24 +08:00
100011797 cfa898e12b fix: 数据源修改 2023-03-24 16:17:40 +08:00
100011797 d45ff4431b fix: 修改执行动作 2023-03-24 16:01:52 +08:00
jackhoo_98 32e78e9fc0 fix: 修复采集器断开文案以及PLC地址回显 2023-03-24 15:36:25 +08:00
jackhoo_98 62bd45e624 fix: bug#10844 2023-03-24 15:34:04 +08:00
xieyonghong 00ca314972 update: geoComponent添加change事件 2023-03-24 15:26:59 +08:00
JiangQiming 8c2af7fe76 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 15:22:19 +08:00
JiangQiming 8d35495808 fix: bug#10863、10816、10739、10746、10749 2023-03-24 15:22:02 +08:00
xieyonghong 01fc5b13a0 fix: bug#10393 2023-03-24 14:56:37 +08:00
xieyonghong 4112313953 fix: bug#10559 2023-03-24 14:56:37 +08:00
wangshuaiswim 17510b998f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 14:06:24 +08:00
wangshuaiswim f4b3ae8626 fix: 修改导入物模型产品可筛选 2023-03-24 14:05:44 +08:00
xieyonghong 570950c4e3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 13:51:09 +08:00
xieyonghong 01d3a0939d fix: 修复二次确认按钮换行 2023-03-24 13:34:42 +08:00
JiangQiming f55bf06297 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 11:50:15 +08:00
JiangQiming 62f8061e3b fix: bug#10742、10828、10827、10657 2023-03-24 11:49:58 +08:00
100011797 5fd68c3da7 fix: 标签值修改 2023-03-24 11:16:03 +08:00
100011797 b70e5549f0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 11:00:10 +08:00
100011797 19684721e2 fix: 数据源bug 2023-03-24 10:59:11 +08:00
jackhoo_98 3f075e6f24 fix: 修复网络组件 流媒体服务 域名ip校验问题 2023-03-24 10:06:51 +08:00
jackhoo_98 06139305eb fix: bug#10779 修复采集器新增时通道不完整问题 2023-03-24 09:56:39 +08:00
wangshuaiswim 0c4c93c386 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-24 09:52:06 +08:00
wangshuaiswim 140465a61e fix: 修改导入阿里云物模型时提示报错信息 2023-03-24 09:51:46 +08:00
xieyonghong 5eccbc9758 fix: 修复场景联动数据结构 2023-03-24 09:13:12 +08:00
JiangQiming 4578810ab9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 21:00:30 +08:00
JiangQiming 004eb1fb2f fix: bug#10816、10814、10812、10789、10780、10775、等 2023-03-23 21:00:09 +08:00
xieyonghong 96c6b69aef fix: bug#10782 2023-03-23 18:43:29 +08:00
leiqiaochu cb035bce38 fix: bug#10817 2023-03-23 18:17:11 +08:00
胡彪 7c7a585c43
Merge pull request #68 from jetlinks/dev-hub
fix: 运维管理修复部分bug
2023-03-23 18:03:37 +08:00
JiangQiming f3c3ffe291 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 18:02:43 +08:00
jackhoo_98 ef9cfc902c Merge branch 'dev' into dev-hub 2023-03-23 18:02:33 +08:00
JiangQiming f00d69d30e fix: bug#10841、10838、10835、10834、10828、10827 2023-03-23 18:02:27 +08:00
jackhoo_98 f75e9303d4 fix: 修复运维管理、数据采集卡片跳转 2023-03-23 18:01:37 +08:00
jackhoo_98 0671e2d357 fix: 修复协议管理、远程升级上传文件获取base-path方式 2023-03-23 17:41:27 +08:00
jackhoo_98 4b84614f82 fix: 修复运维管理 数据采集 删除按钮样式优化 2023-03-23 17:18:01 +08:00
leiqiaochu 0e26f1e638 fix: 样式优化 2023-03-23 17:03:03 +08:00
jackhoo_98 dcf41b4c2c fix: bug#10707 修复运维管理日志说明查询 2023-03-23 16:54:26 +08:00
JiangQiming 6d0e50a203 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 16:46:19 +08:00
JiangQiming 9c9ee029e6 fix: bug#10773、10772、10829、10826 2023-03-23 16:46:02 +08:00
jackhoo_98 a511dd5972 fix: bug#10743 修复远程升级选择设备多选取消问题 2023-03-23 16:37:39 +08:00
jackhoo_98 a4b79f2b8f fix: bug#10702、10703 修复网络组件、流媒体服务域名校验 2023-03-23 16:02:22 +08:00
xieyonghong cb91ec58ac fix: bug#10787、10786 2023-03-23 15:46:27 +08:00
100011797 8c97f0e441 fix: 批量操作按钮 2023-03-23 15:44:58 +08:00
JiangQiming 1f6f7d23b4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 15:36:46 +08:00
JiangQiming b4734056d8 fix: bug#10609-1 2023-03-23 15:36:31 +08:00
100011797 0e56cadb12 fix: 修改同步设备状态 2023-03-23 15:35:57 +08:00
100011797 dead9c5b46 fix: 运行状态播放组件添加 2023-03-23 15:27:59 +08:00
leiqiaochu 83284569aa fix: bug#9308 2023-03-23 15:21:33 +08:00
100011797 73351235ce fix: 修改bug 2023-03-23 15:08:36 +08:00
jackhoo_98 d04e69ba1b fix: 设备接入网关 屏蔽插件接入 2023-03-23 14:54:44 +08:00
jackhoo_98 e97255d088 fix: bug#10721、10714 修复证书管理部分bug 2023-03-23 14:41:35 +08:00
jackhoo_98 0a33ca67ab fix: bug#10802、10799、10798、10796、10791 修复设备接入网关国标接入部分bug 2023-03-23 14:33:17 +08:00
JiangQiming e9d5c8e9c3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 11:48:46 +08:00
JiangQiming 0e09858d38 fix: bug#10706、10678 2023-03-23 11:47:58 +08:00
wangshuaiswim 588cad1cd5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 11:39:23 +08:00
wangshuaiswim e278ae3ebc fix: 修改物模型BUG 2023-03-23 11:38:34 +08:00
100011797 f8cad6d7b1 fix: 详情返回 2023-03-23 10:36:22 +08:00
leiqiaochu 49ed583525 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-23 10:33:28 +08:00
leiqiaochu 30c1619f06 fix: bug#10769 10765 10760 10459 2023-03-23 10:32:42 +08:00
xieyonghong 5600e49b87 fix: bug#10787、10786 2023-03-23 09:31:29 +08:00
xieyonghong a8478617cd fix: bug#10763、10750、10732、10686 2023-03-23 08:42:31 +08:00
jackhoo_98 3fdfa001bf fix: 运维管理仪表盘 格式化网络流量Y轴展示 2023-03-22 21:06:28 +08:00
jackhoo_98 140569c331 Merge branch 'dev' into dev-hub 2023-03-22 20:41:36 +08:00
jackhoo_98 cde14681e7 fix: bug#10729、10738、10745、10734修复远程升级部分bug 2023-03-22 20:39:03 +08:00
JiangQiming d19f39a0ae Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-22 19:46:12 +08:00
JiangQiming 4e123ac64c fix: bug#10706-1 2023-03-22 19:45:54 +08:00
jackhoo_98 470877eac6 fix: bug#10722、10723、10728 修复证书管理部分bug 2023-03-22 19:08:02 +08:00
100011797 45273951c5 fix: 设备导出 2023-03-22 18:08:56 +08:00
jackhoo_98 0b32328ce6 fix: bug#10080、10705、10707、10713修复日志管理部分bug 2023-03-22 17:48:17 +08:00
jackhoo_98 c62c80ebc9 fix: bug#10702、10704 修复流媒体服务部分bug 2023-03-22 17:30:46 +08:00
jackhoo_98 8606bfdb0b fix: bug#10645、10616 修复网络组件部分bug 2023-03-22 17:18:07 +08:00
leiqiaochu 6deb18fc1a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-22 17:10:48 +08:00
leiqiaochu 5e705a0592 fix: #10725 10733 2023-03-22 17:10:05 +08:00
JiangQiming bccff19042 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-22 16:39:48 +08:00
JiangQiming 17fea0efac fix: bug#10681 2023-03-22 16:39:32 +08:00
jackhoo_98 a3ac144a72 fix: bug#10677、10687、10688、10693、10701、10720修复设备接入网关部分bug 2023-03-22 16:00:07 +08:00
wangshuaiswim 93f56a6441 fix: 修改物模型事件回显BUG 2023-03-22 15:50:14 +08:00
JiangQiming e1e6bea2a7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-22 15:36:31 +08:00
JiangQiming b6b4677367 fix: bug#10550 2023-03-22 15:36:16 +08:00
leiqiaochu 7754814afe Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-22 14:44:14 +08:00
leiqiaochu 47c3d7533e fix: bug#10726 10718 2023-03-22 14:43:41 +08:00
wangshuaiswim b0e5654ad1 fix: 增加通讯异常catch 2023-03-22 14:33:25 +08:00
jackhoo_98 ad89d1fbc2 fix: bug#10719 修复设备接入网关 底部滚动条样式 2023-03-22 14:18:57 +08:00
100011797 f495834dd5 fix: douros功能 2023-03-22 14:15:11 +08:00
JiangQiming ba8bbc9896 fix: bug#10540 2023-03-22 13:48:29 +08:00
jackhoo_98 eb43a5f5b2 fix: bug#10676 修复设备接入网关 AccessCard组件背景图 2023-03-22 12:20:45 +08:00
JiangQiming 835874604d fix: bug#10711、10600、10681 2023-03-22 11:49:02 +08:00
leiqiaochu 0aac4de410 fix: bug#10467 2023-03-22 09:38:01 +08:00
wangshuaiswim 026d9dd914 fix: 修改物模型BUG 2023-03-21 21:18:51 +08:00
xieyonghong 1f1d81c767 update: 完善场景联动 2023-03-21 19:16:01 +08:00
JiangQiming 352c4d263b fix: bug#10675、10674、10663 2023-03-21 18:33:55 +08:00
JiangQiming 8583d968c3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 18:16:16 +08:00
JiangQiming c70dcf6f62 fix: bug#10669、10679、10680 2023-03-21 18:15:59 +08:00
100011797 219444d566 fix: 修改批量操作功能 2023-03-21 18:09:35 +08:00
jackhoo_98 d5b0a2b4d8 Merge branch 'dev' into dev-hub 2023-03-21 18:07:11 +08:00
jackhoo_98 2cb4bcc86f fix: bug#10666、10672、10673、10676 修复协议管理部分bug 2023-03-21 18:04:13 +08:00
jackhoo_98 0b83a9c4df fix: bug#10614、10617、10620、10623、10624、10627、10645、10648、10652、10656、10661、10664、10665 修复网络组件部分bug 2023-03-21 17:43:50 +08:00
JiangQiming 7e2ea45ad8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 17:27:20 +08:00
JiangQiming b78aa24b8e fix: bug#10653、10654 2023-03-21 17:26:03 +08:00
leiqiaochu 42cd5f69ae fix: 仪表盘样式更改 2023-03-21 16:56:24 +08:00
JiangQiming b65302e1c6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 16:45:04 +08:00
JiangQiming 9759fea2cc fix: bug#10647、10644、10640 2023-03-21 16:43:09 +08:00
leiqiaochu 4c58bf1c31 fix: dayjs替换moment 2023-03-21 16:14:16 +08:00
JiangQiming cc879c1731 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 16:07:59 +08:00
JiangQiming c71a38d424 fix: bug#10618、10608、10671、10532、10530、10649 2023-03-21 16:07:38 +08:00
leiqiaochu e53c573e6d fix: 产品特殊协议回显问题 2023-03-21 15:45:18 +08:00
leiqiaochu 4d6896a4a2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 14:24:29 +08:00
leiqiaochu c7a417c82c fix: bug#10668 2023-03-21 14:23:39 +08:00
JiangQiming 0b9b78ca40 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 14:13:03 +08:00
JiangQiming 7c42ebc587 fix: bug#10618、10608 2023-03-21 14:11:52 +08:00
leiqiaochu 6c2cd40b56 fix: bug#10450 2023-03-21 13:53:02 +08:00
jackhoo_98 3bb63f3d41 fix: bug#10610 修复仪表盘日期变化问题 2023-03-21 13:50:46 +08:00
leiqiaochu a49e7858ee Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 11:39:18 +08:00
leiqiaochu 2a51e49b61 fix: #bug10635 10631 2023-03-21 11:37:30 +08:00
JiangQiming 5abfe399e2 update: 通知管理, 视频中心, 系统管理message引入方式改为jetlinks组件库 2023-03-21 11:08:09 +08:00
jackhoo_98 d9c2da7f4e fix: 合并冲突 2023-03-21 10:20:57 +08:00
jackhoo_98 2da39a3370 style: 网络组件以及详情样式微调 2023-03-21 10:18:10 +08:00
xieyonghong a2a52aaf66 update: 优化场景联动样式 2023-03-21 09:57:43 +08:00
JiangQiming 995eca23cb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-21 09:39:38 +08:00
JiangQiming 552af71c39 update: 按钮新增danger属性 2023-03-21 09:39:20 +08:00
100011797 85dd902ed7 fix: 修复10401 2023-03-21 09:38:34 +08:00
wangshuaiswim 8cd2b8644e fix: 修改物模型BUG 2023-03-20 21:14:49 +08:00
wangshuaiswim 6c9322ed70 fix: 修改物模型BUG 2023-03-20 21:02:58 +08:00
wangshuaiswim 27e5d320d4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 20:40:51 +08:00
wangshuaiswim 2511baf944 fix: 修改物模型BUG 2023-03-20 20:40:30 +08:00
xieyonghong 8811173b66 update: 优化场景联动-执行动作、过滤条件校验 2023-03-20 20:18:11 +08:00
JiangQiming d5876a0ed1 fix: bug#10561、10630 2023-03-20 18:31:46 +08:00
JiangQiming 7173dd7c5c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 18:24:22 +08:00
JiangQiming d79a1f7402 fix: bug#10561 2023-03-20 18:24:01 +08:00
100011797 6c3b76b486 fix: 物联网卡卡片展示 2023-03-20 18:13:42 +08:00
leiqiaochu 010d91d8e5 fix: bug#10454 2023-03-20 17:59:41 +08:00
wangshuaiswim d8bc599164 fix: 修改物模型导入BUG 2023-03-20 17:48:20 +08:00
JiangQiming 6485265e3d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 17:36:48 +08:00
JiangQiming c08f29d4da fix: bug#10561 2023-03-20 17:36:33 +08:00
xieyonghong faccbc53f7 update: 优化场景联动-执行动作、过滤条件校验 2023-03-20 17:32:34 +08:00
100011797 a094b9b093 fix: 设备详情报错 2023-03-20 17:02:43 +08:00
jackhoo_98 c61eb1771e style: 设备接入网关样式微调 2023-03-20 17:01:43 +08:00
JiangQiming 48b6bbc0a7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 16:47:13 +08:00
JiangQiming 3181027490 fix: bug#10564、10618、10619、10605、10606、10604、10608 2023-03-20 16:46:59 +08:00
leiqiaochu 189f056c22 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 16:19:31 +08:00
leiqiaochu 5f9c8fded4 fix: message组件替换 2023-03-20 16:19:20 +08:00
wangshuaiswim 2a7eeccdb2 fix: 物模型BUG解决 2023-03-20 16:17:06 +08:00
JiangQiming 5d27993d0f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 15:53:24 +08:00
JiangQiming fd3064dd90 fix: bug#10602、10525、10599、10601、10603 2023-03-20 15:53:07 +08:00
100011797 f9d72619b0 fix: 修改北向输出bug 2023-03-20 15:21:31 +08:00
jackhoo_98 fec6852bc4 Merge branch 'dev' into dev-hub 2023-03-20 15:11:18 +08:00
jackhoo_98 1e6504b5f3 style: 更改设备接入网关部分样式todo 2023-03-20 15:10:05 +08:00
leiqiaochu 14aeec4178 fix: 状态组件替换告警中心优化 2023-03-20 15:05:34 +08:00
JiangQiming 30e98f69af fix: 1.bug#10597、10533; 2.系统基础配置优化 2023-03-20 14:57:19 +08:00
leiqiaochu 430a8c7dc8 fix: 组件替换 2023-03-20 11:18:36 +08:00
leiqiaochu 96dce7a98a fix: 告警配置场景联动组件替换 2023-03-20 11:17:28 +08:00
xieyonghong 8aaa9418bd update: 优化场景联动-新增校验 2023-03-20 11:08:20 +08:00
leiqiaochu 6df60ea7e8 fix: bug#10609 2023-03-20 11:02:15 +08:00
leiqiaochu 7da98bff35 fix: 按钮颜色卡片更换 2023-03-20 10:55:28 +08:00
leiqiaochu 84db55b690 fix: 删除按钮颜色告警卡片 2023-03-20 10:54:42 +08:00
100011797 f88a3d22aa Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-20 10:44:55 +08:00
100011797 edb7f4ce5d fix: 删除变红 2023-03-20 10:44:48 +08:00
jackhoo_98 878e36a4a7 style: 更改TitleComponent组件样式 2023-03-20 10:33:54 +08:00
leiqiaochu fd603c250d fix: bug#10557 2023-03-20 10:32:26 +08:00
JiangQiming 2963118753 update: 说明文档提取为公共样式 2023-03-20 10:18:01 +08:00
JiangQiming f1d3942416 fix: bug#10597 2023-03-20 09:57:23 +08:00
jackhoo_98 865c9e989c Merge branch 'dev' into dev-hub 2023-03-20 09:27:01 +08:00
wangshuaiswim 6fff6f737e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-19 21:49:43 +08:00
wangshuaiswim 9837a6a588 fix: 修改物模型BUG 2023-03-19 21:49:13 +08:00
xieyonghong 2659c70804 feat: 新增场景联动-定时触发 2023-03-19 21:09:53 +08:00
JiangQiming 084c43cf76 fix: bug#10475、10549、10545、10543、10541 2023-03-17 22:04:41 +08:00
JiangQiming 27f392dda8 fix: 表格卡片必须传statusNames, 解决报错问题 2023-03-17 21:12:04 +08:00
xieyonghong 4494727311 update: 优化产品-设备接入 2023-03-17 20:33:24 +08:00
xieyonghong 8cc721b790 update: 删除demo 2023-03-17 18:50:57 +08:00
xieyonghong 232c844080 update: 替换场景联动中的组件 2023-03-17 18:50:55 +08:00
JiangQiming 3b7a412411 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 18:20:37 +08:00
JiangQiming efcfa42adb fix: bug#10540、10542 2023-03-17 18:20:22 +08:00
easy d1a9854831 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 17:44:22 +08:00
easy d29346248e fix: bug#10537 2023-03-17 17:43:58 +08:00
100011797 dc486af223 fix: 卡片背景颜色 2023-03-17 16:32:30 +08:00
jackhoo_98 a07196de3d style: 更改TitleComponent组件样式 2023-03-17 16:22:17 +08:00
jackhoo_98 c0f2ebfa47 update: 运维管理、数据采集卡片列表去掉背景图片 2023-03-17 15:55:33 +08:00
leiqiaochu 34bff0ecb4 fix: bug#10505 10443 2023-03-17 15:48:50 +08:00
JiangQiming 7c9028dab4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 15:44:28 +08:00
JiangQiming 94e0e9ff2e fix: bug#10404 2023-03-17 15:44:15 +08:00
easy dd4f921df4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 15:19:37 +08:00
easy 3794849946 update: api配置优化 2023-03-17 15:18:32 +08:00
JiangQiming 6a9e08e7a7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 15:01:30 +08:00
JiangQiming 2050990998 fix: bug#10538 2023-03-17 15:01:16 +08:00
jackhoo_98 2e0b45b444 Merge branch 'dev' into dev-hub 2023-03-17 14:58:13 +08:00
jackhoo_98 dda768e3bf update: 协议管理、通道管理 上传文件获取base-path,todo 2023-03-17 14:56:07 +08:00
jackhoo_98 61b48b50ca update: 运维管理 数据采集 更换卡片标题省略组件 2023-03-17 14:48:59 +08:00
easy b81e8af1e4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 14:33:00 +08:00
easy 0b99ea0096 fix: bug#10532、10531、10530、10527、10534、10529 2023-03-17 14:32:43 +08:00
JiangQiming a553cdd191 fix: bug#10526 2023-03-17 14:25:22 +08:00
JiangQiming af4752e349 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 14:09:37 +08:00
JiangQiming a260146ad4 fix: bug#10528 2023-03-17 14:09:23 +08:00
jackhoo_98 d6207f30e0 fix: 数据采集更换a-组件 2023-03-17 14:05:41 +08:00
easy 8dd84e062d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 11:51:18 +08:00
easy f45cc4da61 fix: bug#10532、10531、10530、10527 2023-03-17 11:51:02 +08:00
JiangQiming f79f511557 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 11:49:19 +08:00
JiangQiming c4d33d56e3 fix: bug#10196、10500、10524、10525 2023-03-17 11:48:56 +08:00
jackhoo_98 fb51bda318 update: 运维管理、数据采集 更换message组件 2023-03-17 11:42:56 +08:00
leiqiaochu 404506a37f fix: #bug10506 10509 10512 2023-03-17 11:33:21 +08:00
JiangQiming 7a0796668f fix: bug#10196 2023-03-17 11:29:21 +08:00
jackhoo_98 e74f8fa7aa fix: 运维管理 远程升级修复部分bug 2023-03-17 11:16:29 +08:00
leiqiaochu 86b4cc2ba4 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-17 10:21:56 +08:00
xieyonghong e79ae13bf5 update: 优化场景联动自适应样式宽度 2023-03-17 10:11:30 +08:00
leiqiaochu 4a72c05b12 fix: bug#10482 10490 10444 10443 2023-03-17 09:59:46 +08:00
jackhoo_98 343d88209e Merge branch 'dev' into dev-hub 2023-03-17 09:56:09 +08:00
jackhoo_98 f85bb9fc82 fix: 运维管理 证书管理修复部分bug,远程升级修复部分bug 2023-03-17 09:54:52 +08:00
xieyonghong e9e7431dd8 update: 优化场景联动自适应样式 2023-03-17 09:37:37 +08:00
xieyonghong a277fe1cb6 update: 优化场景联动过滤条件中的columns 2023-03-16 20:15:31 +08:00
JiangQiming f8fb98df44 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 18:38:53 +08:00
JiangQiming 8b9b67fd53 fix: bug#10479、10473、10478、10491 2023-03-16 18:38:38 +08:00
jackhoo_98 b11d8eaa0d Merge branch 'dev' into dev-hub 2023-03-16 18:19:47 +08:00
jackhoo_98 8167603fae fix: 运维管理 远程升级修复部分bug 2023-03-16 18:17:43 +08:00
100011797 6e5817a27e fix: 修改执行动作设备输出-内置参数 2023-03-16 17:53:26 +08:00
xieyonghong 51fa8e6b5e update: 优化场景联动过滤条件 2023-03-16 17:40:48 +08:00
xieyonghong 91f00210fe update: 优化菜单遍历 2023-03-16 17:40:47 +08:00
leiqiaochu da755bc13b fix: bug#10455 10451 10448 10446 10449 10452 10488 2023-03-16 17:19:46 +08:00
JiangQiming ea48417454 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 17:18:16 +08:00
JiangQiming 5670470fcf fix: bug#10481、10480、10471、10487、10477 2023-03-16 17:17:56 +08:00
xieyonghong eb91910a5e update: 优化场景联动过滤条件 2023-03-16 16:54:20 +08:00
easy 2eeaddb08d update: 更新校验规则 2023-03-16 16:42:03 +08:00
jackhoo_98 90d33baffd fix: 运维管理 流媒体服务修复部分bug 2023-03-16 16:39:30 +08:00
jackhoo_98 05045768d2 fix: 运维管理 设备接入网关修复部分bug 2023-03-16 15:59:01 +08:00
easy 1fd9a0cc93 update: 个人中心图标替换 2023-03-16 15:45:11 +08:00
easy 137018753c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 15:34:41 +08:00
easy 2f7a4f718b update: 首页代码优化 2023-03-16 15:34:24 +08:00
leiqiaochu 1a3c10b18d fix: bug#10455 10451 10448 2023-03-16 15:29:13 +08:00
JiangQiming 914e495f2e fix: bug#10387 2023-03-16 15:19:10 +08:00
JiangQiming e919fd6bef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 11:50:25 +08:00
JiangQiming cf36e34e4f fix: bug#10389、10421 2023-03-16 11:50:12 +08:00
easy db3c66d3b7 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 11:19:55 +08:00
easy dee82d2115 update: api配置-调试 请求参数表格 2023-03-16 11:19:38 +08:00
100011797 60751783c2 fix: 边缘端映射组件替换 2023-03-16 11:00:04 +08:00
wzyyy 7d10dc3e6e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:44:27 +08:00
wzyyy da47dcb028 fix: 数据解析代码优化 2023-03-16 10:43:53 +08:00
easy 6c4da9db2f update: 代码编辑器更换 2023-03-16 10:43:12 +08:00
JiangQiming 5604c8bd35 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:39:51 +08:00
JiangQiming 1b046f96d2 update: 编辑器替换 2023-03-16 10:39:38 +08:00
xieyonghong 2507618860 update: 优化过滤条件回显 2023-03-16 10:21:25 +08:00
JiangQiming e9d3546197 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:20:58 +08:00
JiangQiming 83a9f9f0cb fix: bug#10439 2023-03-16 10:20:45 +08:00
easy e70b8d7812 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-16 10:19:04 +08:00
easy c25562adfb fix: #10442、#10441 2023-03-16 10:18:45 +08:00
leiqiaochu 708f93dc28 fix: 产品仪表盘新增上传详情更改数据回显 2023-03-16 10:15:56 +08:00
jackhoo_98 62592b6e83 Merge branch 'dev' into dev-hub 2023-03-16 09:56:14 +08:00
jackhoo_98 7e83d5bdc2 fix: 运维管理 设备接入网关自测todo 2023-03-16 09:54:48 +08:00
JiangQiming 0200d1d419 update: 新增注释 2023-03-15 18:22:59 +08:00
JiangQiming 39c58b8e35 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 18:09:58 +08:00
JiangQiming 54493d025f fix: bug#10433、10428、10426 2023-03-15 18:09:44 +08:00
jackhoo_98 d8ca8ce212 fix: 运维管理 日志管理修复部分bug 2023-03-15 17:55:13 +08:00
easy 62a405b8cd Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:44:52 +08:00
JiangQiming f8906faa11 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:42:58 +08:00
JiangQiming 42df14d815 fix: bug#10406、10399、10390、10391、10410、10387、10392、10425、10415、10416、10417、10412、10409、10405 2023-03-15 17:42:42 +08:00
easy 46df7d35c5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-15 17:41:45 +08:00
easy 174cf36d09 update: 用户管理 2023-03-15 17:41:22 +08:00
jackhoo_98 ea8620278a update: 采集器 点位新增 更新数据类型 2023-03-15 17:31:36 +08:00