Commit Graph

  • 71af134d09 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-10 19:45:58 +0800
  • 458b5dd8f9 fix: bug#16173、16172、16138、15092 leiqiaochu 2023-07-10 19:25:44 +0800
  • a9188563b7 fix: bug#15531 XieYongHong 2023-07-10 19:10:46 +0800
  • c0a7d9ce91 fix: bug#15155 XieYongHong 2023-07-10 19:01:00 +0800
  • 6596016642 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-10 18:56:57 +0800
  • 9b00ebcc25 fix: 优化产品物模型编辑状态 XieYongHong 2023-07-10 18:53:33 +0800
  • 7504dc3f88 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-10 17:55:44 +0800
  • bd42cdd3fb fix: 修改bug 100011797 2023-07-10 17:55:36 +0800
  • 56b3b0acfb fix: bug#16085、16024、15967、15924、16072、16070、16067 leiqiaochu 2023-07-10 17:01:50 +0800
  • a4aa193781 fix: 修改message 100011797 2023-07-10 15:42:28 +0800
  • b3f194675b fix: 修改bug 100011797 2023-07-10 11:57:08 +0800
  • fe9fe82e20 fix: 修改bug 100011797 2023-07-10 11:42:37 +0800
  • cf4806738f fix: 优化设备物模型 XieYongHong 2023-07-10 10:39:04 +0800
  • 7daaa88407 fix: allow-scripts 100011797 2023-07-10 10:19:51 +0800
  • bee1c13d94 fix: 修改bug 100011797 2023-07-10 09:43:00 +0800
  • a8338a5981 fix: 优化设备物模型 xieyonghong 2023-07-09 19:34:16 +0800
  • c8fa001655 fix: 优化物模型-标签定义 XieYongHong 2023-07-08 18:13:47 +0800
  • 3231c7ea12 fix: 优化物模型-编辑表格标识校验 xieyonghong 2023-07-07 21:57:12 +0800
  • 2e50b866f0 fix: 修改bug 100011797 2023-07-07 18:29:47 +0800
  • 9eacdb2687 fix: 优化物模型-功能定义-(输入、输出) XieYongHong 2023-07-07 18:21:17 +0800
  • 7c2f4c410c Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-07 17:25:00 +0800
  • 4d995d98ed fix: 优化物模型-功能定义-输出 XieYongHong 2023-07-07 17:22:46 +0800
  • ddcc8db097 fix: 修改bug 100011797 2023-07-07 17:22:29 +0800
  • 5af3624676 fix: 修改bug 100011797 2023-07-07 15:00:00 +0800
  • daef6b7f1f fix: 修改bug 100011797 2023-07-07 14:04:51 +0800
  • e103369689 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-07 11:09:50 +0800
  • 90df330400 fix: 优化物模型-功能定义-输出 XieYongHong 2023-07-07 11:09:28 +0800
  • c43e5a162a fix: 修改bug 100011797 2023-07-07 10:44:03 +0800
  • d76aa3f65c fix: 优化物模型-事件定义 xieyonghong 2023-07-06 22:33:29 +0800
  • a869162799 fix: 优化物模型-功能定义-输入 XieYongHong 2023-07-06 20:53:48 +0800
  • c56dbff80b Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-06 18:16:11 +0800
  • 42745b19a1 fix: 修改bug 100011797 2023-07-06 18:15:40 +0800
  • 1622206283 fix: 优化物模型-功能定义(输入、输出) XieYongHong 2023-07-06 18:15:19 +0800
  • c4faec62c1 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-06 16:50:29 +0800
  • 09d1d388b8 fix: 优化物模型-功能定义(输入、输出) XieYongHong 2023-07-06 16:49:48 +0800
  • 56d56af3f1 fix: 修改bug 100011797 2023-07-06 16:33:38 +0800
  • 65e1249104 fix: 修改bug 100011797 2023-07-06 16:11:12 +0800
  • 5912ebd703 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-06 16:02:07 +0800
  • 1ceb3bb925 fix: 优化物模型-功能定义 XieYongHong 2023-07-06 16:01:38 +0800
  • 76f22d8503 fix: 修改bug 100011797 2023-07-06 15:59:49 +0800
  • 3065cd88c2 fix: 优化物模型-规则 XieYongHong 2023-07-06 15:59:10 +0800
  • 590a82b156 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-06 15:01:02 +0800
  • bb602aecd2 fix: 优化物模型-详情 XieYongHong 2023-07-06 15:00:16 +0800
  • 99637f0938 fix: 物模型映射搜索 100011797 2023-07-06 14:56:31 +0800
  • 9acec4efa1 fix: 修改bug 100011797 2023-07-06 14:21:36 +0800
  • 8fc0d9f6d4 fix: 修改bug 100011797 2023-07-06 14:03:34 +0800
  • 7f75c05f79 fix: 优化物模型必填校验 xieyonghong 2023-07-05 22:27:36 +0800
  • be0aeb9a0a fix: 修改bug 100011797 2023-07-05 18:29:24 +0800
  • 6651e75930 fix: 优化物模型-编辑表格-时间、枚举 XieYongHong 2023-07-05 18:27:41 +0800
  • c27757aea8 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-05 15:08:33 +0800
  • e6b10a75f2 fix: 修复物模型-编辑表格 XieYongHong 2023-07-05 15:06:27 +0800
  • 268745ff1d fix: 修改bug 100011797 2023-07-05 15:04:12 +0800
  • f295104d8e fix: 修改ui 100011797 2023-07-04 18:25:04 +0800
  • 0d6e9d8ae8 fix: 修复物模型-功能详情 XieYongHong 2023-07-04 18:19:33 +0800
  • aaa8c1498f fix: 修复物模型-功能无法编辑问题 XieYongHong 2023-07-03 20:01:13 +0800
  • d1ff921f6f Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-03 18:09:21 +0800
  • f5bfd8ee3a fix: 修复权限导入无法编辑问题 XieYongHong 2023-07-03 18:05:46 +0800
  • a455fc6232 fix: 修改bug 100011797 2023-07-03 18:00:05 +0800
  • 14de6706cf fix: 修改bug 100011797 2023-07-03 17:59:51 +0800
  • 90a38268b9 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-03 16:10:12 +0800
  • 2f1463163c feat: 优化物模型-标签去掉详情 XieYongHong 2023-07-03 16:09:24 +0800
  • 0b3454c225 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-03 15:42:25 +0800
  • 40d4f7eb3c
    fix: 应用管理赋权接口报错 XieYongHong 2023-07-03 15:42:02 +0800
  • 1e70899bf1 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-07-03 15:41:55 +0800
  • 0f140b568e fix: 修改bug 100011797 2023-07-03 15:41:21 +0800
  • 176f1dc211 feat: 优化物模型单个拷贝、新增编辑逻辑 XieYongHong 2023-07-03 15:26:45 +0800
  • a6b82b8f46 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-07-03 14:54:54 +0800
  • dbbcc37636 feat: 优化物模型单个拷贝 XieYongHong 2023-07-03 14:53:55 +0800
  • a9e4f9d0af fix: 修改bug 100011797 2023-07-03 11:57:58 +0800
  • 74747cd966
    refactor: 重构物模型操作 XieYongHong 2023-07-03 10:54:37 +0800
  • 41daa5ea2a fix: 修改bug 100011797 2023-07-03 10:44:51 +0800
  • 560de3c4dd fix: 修改bug 100011797 2023-06-30 15:09:42 +0800
  • 683d3e20e8 fix: 修改bug 100011797 2023-06-30 14:37:11 +0800
  • 6ff2f9ebad
    feat: 登录密码加密 XieYongHong 2023-06-30 09:56:50 +0800
  • 5bd178f909
    feat: 登录密码加密 XieYongHong 2023-06-30 09:39:56 +0800
  • bcdd56b510 fix: 修改我的订阅 100011797 2023-06-29 18:15:47 +0800
  • f616ada3a6 feat: 修改bug 100011797 2023-06-29 18:05:18 +0800
  • 08efcf29eb Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-06-29 17:09:07 +0800
  • 0bd4dec42e fix: 修改样式 100011797 2023-06-29 15:09:43 +0800
  • 5f15f21ff2 feat: 设备导入 100011797 2023-06-29 09:54:17 +0800
  • 17fa82d2fc fix: 删除多余文件 XieYongHong 2023-06-28 09:49:50 +0800
  • 8307a1353e
    fix: 修改物模型的其他配置按照类型配置 XieYongHong 2023-06-28 09:42:31 +0800
  • 8fb5d479ee fix: 修改密码按钮权限 100011797 2023-06-27 18:05:03 +0800
  • e117787fa0 fix: 未订阅弹窗修改 100011797 2023-06-21 15:00:17 +0800
  • 21ea5b26d8 fix: 修改通知订阅的样式 100011797 2023-06-21 14:32:32 +0800
  • 02b2ce66a9 fix: 订阅管理修改 100011797 2023-06-21 11:16:43 +0800
  • 71ffdc13fe fix: 修改密码权限 100011797 2023-06-20 18:27:15 +0800
  • 7b6684a9f4 fix: 通知订阅 100011797 2023-06-20 16:54:15 +0800
  • 0edeb9804a
    fix: 还原登录后跳转方式 XieYongHong 2023-06-20 15:52:43 +0800
  • 3ff87e2ff4
    fix: 还原登录后跳转方式 XieYongHong 2023-06-20 15:45:34 +0800
  • 2b740da418 feat: 订阅管理 100011797 2023-06-16 10:24:44 +0800
  • 0a479ee058 Merge branch 'bug-fix' into dev XieYongHong 2023-06-15 20:43:24 +0800
  • 06d8c03dd0 fix: 优化登录页图片替换 XieYongHong 2023-06-15 20:15:13 +0800
  • 215bcd7ef5
    fix: 放开社区办设备管理-仪表盘 XieYongHong 2023-06-15 15:51:58 +0800
  • f3b8068044 fix: 放开社区办设备管理-仪表盘 XieYongHong 2023-06-15 14:34:21 +0800
  • c8751bb8ad feat: 应用管理和物模型映射2.1 100011797 2023-06-13 09:40:36 +0800
  • 299f624658 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 100011797 2023-06-12 10:25:52 +0800
  • 43aa4bc16e
    fix: 优化标签保存ico回显 XieYongHong 2023-06-09 17:54:00 +0800
  • 0fb6960cd3 Merge remote-tracking branch 'origin/bug-fix' into bug-fix XieYongHong 2023-06-09 17:52:07 +0800
  • 16a748b67c fix: 优化标签保存ico回显 XieYongHong 2023-06-09 17:51:55 +0800