Commit Graph

134 Commits

Author SHA1 Message Date
xieyonghong de51d8a0eb fix: bug#10839 2023-03-28 08:51:29 +08:00
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 c34647fad5 fix: bug#10824 2023-03-28 08:51:27 +08:00
100011797 7b83732170 fix: 边缘网关和设备诊断 2023-03-27 20:30:07 +08:00
xieyonghong 4778b558d7 fix: bug#10822 2023-03-27 18:51:19 +08:00
100011797 324d78a213 fix: 北向输出 2023-03-27 17:48:47 +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
xieyonghong ffdee18c34 fix: bug#10833 2023-03-27 15:59:03 +08:00
xieyonghong 8b9330a58d style: 优化场景联动回显校验 2023-03-27 15:59:02 +08:00
xieyonghong fed5c348e0 style: 优化场景联动卡片的省略内容显示样式 2023-03-27 09:24:45 +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
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 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 5c6c8dbed4 fix: bug#10990 2023-03-25 22:40:24 +08:00
xieyonghong 9fb9571699 fix: bug#10995 2023-03-25 21:22:50 +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
100011797 5fbbaa5f83 fix: 修改执行动作 2023-03-24 18:20:21 +08:00
100011797 d45ff4431b fix: 修改执行动作 2023-03-24 16:01:52 +08:00
xieyonghong 01d3a0939d fix: 修复二次确认按钮换行 2023-03-24 13:34:42 +08:00
xieyonghong 5eccbc9758 fix: 修复场景联动数据结构 2023-03-24 09:13:12 +08:00
xieyonghong 96c6b69aef fix: bug#10782 2023-03-23 18:43:29 +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
xieyonghong 1f1d81c767 update: 完善场景联动 2023-03-21 19:16:01 +08:00
xieyonghong a2a52aaf66 update: 优化场景联动样式 2023-03-21 09:57:43 +08:00
xieyonghong 8811173b66 update: 优化场景联动-执行动作、过滤条件校验 2023-03-20 20:18:11 +08:00
xieyonghong faccbc53f7 update: 优化场景联动-执行动作、过滤条件校验 2023-03-20 17:32:34 +08:00
xieyonghong 8aaa9418bd update: 优化场景联动-新增校验 2023-03-20 11:08:20 +08:00
xieyonghong 2659c70804 feat: 新增场景联动-定时触发 2023-03-19 21:09:53 +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
xieyonghong e79ae13bf5 update: 优化场景联动自适应样式宽度 2023-03-17 10:11:30 +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
100011797 6e5817a27e fix: 修改执行动作设备输出-内置参数 2023-03-16 17:53:26 +08:00
xieyonghong 51fa8e6b5e update: 优化场景联动过滤条件 2023-03-16 17:40:48 +08:00
xieyonghong eb91910a5e update: 优化场景联动过滤条件 2023-03-16 16:54:20 +08:00
100011797 60751783c2 fix: 边缘端映射组件替换 2023-03-16 11:00:04 +08:00
xieyonghong 2507618860 update: 优化过滤条件回显 2023-03-16 10:21:25 +08:00
xieyonghong 2cd4d7ddb1 feat: 场景联动新增过滤条件组件 2023-03-15 16:33:01 +08:00
xieyonghong a28f46e01c update: 更新场景联动ParamsDropdown中的属性 2023-03-15 16:33:00 +08:00
xieyonghong 2f964837b9 update: 场景联动集成执行动作 2023-03-15 16:33:00 +08:00
100011797 2b18323745 fix: 场景联动-通知配置-options处理 2023-03-15 11:39:00 +08:00
xieyonghong d7f3ba6317 update: 场景联动条件优化 2023-03-15 10:20:43 +08:00
xieyonghong 67739f0714 update: proSearch添加class 2023-03-14 17:06:29 +08:00
xieyonghong ce9ce6ff4a update: 修改Upload文件名;优化CardBox样式 2023-03-14 17:06:29 +08:00
100011797 9e7e82b358 fix: 搜索换成pro-search 2023-03-13 15:52:25 +08:00
xieyonghong 8c7295b074 update: 优化Search组件 2023-03-13 14:00:48 +08:00
100011797 db5514d27f fix: 自测修改设备管理 2023-03-10 16:52:05 +08:00
xieyonghong 7427301495 update: 优化场景联动 DropdownMenus布尔值 2023-03-10 10:27:07 +08:00
xieyonghong b583fa77a9 update: 场景联动ParamsDropdown 添加插槽 2023-03-10 10:27:06 +08:00
100011797 0330a7702f fix: 场景联动-执行动作-设备输出 2023-03-09 18:25:10 +08:00
xieyonghong 75eca7d0dc feat: 场景联动添加ParamsDropdown组件 2023-03-09 15:22:20 +08:00
100011797 d70956e1e1 fix: 修改北向输出 2023-03-08 18:16:59 +08:00
xieyonghong 9a883cf7a9 feat: 场景联动新增Terms组件 2023-03-07 19:21:20 +08:00
100011797 ca7d9cba0a fix: 场景联动-执行动作 2023-03-04 16:37:26 +08:00
wzyyy 7e053e0d00 fix: 物联卡组件替换及部分场景联动 2023-03-04 11:51:42 +08:00
xieyonghong 376cfe4d3d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/rule-engine/Scene/Save/Device/index.vue
#	yarn.lock
2023-03-02 21:48:50 +08:00
xieyonghong db82ec462a update: 优化场景联动-触发规则回显 2023-03-02 21:40:45 +08:00
100011797 f7fac41743 fix: 修改设备列表为protable 2023-03-02 17:55:28 +08:00
xieyonghong 2781017096 update: 添加force命令 2023-03-02 14:02:59 +08:00
wzyyy 7cefa62e45 fix: 去掉ant的样式 2023-03-01 15:07:21 +08:00
100011797 7822393092 feat: 场景联动卡片 2023-02-28 21:32:47 +08:00
xieyonghong a0f9d8d44c feat: 新增场景联动-触发规则-功能 2023-02-28 08:47:53 +08:00
xieyonghong e4a124a433 feat: 新增场景联动-触发规则-属性修改 2023-02-27 16:40:53 +08:00
xieyonghong be501e77fe feat: 新增场景联动-触发规则 2023-02-24 18:21:44 +08:00
xieyonghong f49cffe1d6 style: 优化Search简单模式样式 2023-02-23 17:29:01 +08:00
xieyonghong 8ddd2562f1 feat: 新增场景联动设备规则新增Modal 2023-02-23 16:36:21 +08:00
xieyonghong a805bfe5f7 feat: 新增Ellipsis组件 2023-02-23 10:18:32 +08:00
xieyonghong 0592de1e81 update: 优化vuex中的权限数据 2023-02-23 09:42:31 +08:00
xieyonghong 80b7436717 update: 优化打包 2023-02-21 19:44:43 +08:00