Commit Graph

  • d2767b0a0a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-23 17:53:09 +0800
  • 9ecd4b6b6b fix: bug#10161 JiangQiming 2023-02-23 17:52:55 +0800
  • 7d0fbc0e1c Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-23 17:30:36 +0800
  • f49cffe1d6 style: 优化Search简单模式样式 xieyonghong 2023-02-23 17:29:01 +0800
  • d36d5356bb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-23 17:00:16 +0800
  • 6a66caf3ec fix: bug#10164, #10157 JiangQiming 2023-02-23 17:00:02 +0800
  • 2291f02fcf update: 挪动docker文件位置 xieyonghong 2023-02-23 16:53:40 +0800
  • 4258311ed6 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-23 16:37:51 +0800
  • 8ddd2562f1 feat: 新增场景联动设备规则新增Modal xieyonghong 2023-02-23 16:36:21 +0800
  • 9da62e46bf Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-23 16:17:13 +0800
  • 5a93ab1dcd fix: #10163 JiangQiming 2023-02-23 16:16:58 +0800
  • 34d870f1ec fix: 修改阿里云新增和卡片 100011797 2023-02-23 15:47:34 +0800
  • b239bfc8b2 update: 设备功能调试, 精简模式新增字段必填验证 JiangQiming 2023-02-23 14:30:03 +0800
  • 7000ccd85b feat: 通知模板调试新增表格字段验证 JiangQiming 2023-02-23 13:46:46 +0800
  • 11e9d6faf9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-23 11:13:06 +0800
  • 18aaedc779 feat: 通知配置调试, 新增必填验证 JiangQiming 2023-02-23 11:12:51 +0800
  • 3e82cc7d5e feat: 新增空组件 100011797 2023-02-23 11:05:48 +0800
  • 8bb756e5e6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-02-23 10:59:26 +0800
  • cd1e08c055 fix: 路由跳转方法 leiqiaochu 2023-02-23 10:58:50 +0800
  • dd3013ee04 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-23 10:19:51 +0800
  • a805bfe5f7 feat: 新增Ellipsis组件 xieyonghong 2023-02-23 10:18:32 +0800
  • 063c6bbe8d update: 系统管理模块添加面包屑 easy 2023-02-23 10:18:15 +0800
  • 4961bb5bb2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-23 10:07:36 +0800
  • 9678a2512a style: 通知管理列表卡片图表宽高统一 JiangQiming 2023-02-23 10:07:22 +0800
  • f16320a99c Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-23 09:47:36 +0800
  • afdef48c20 update: 通知配置详情数据丢失解决 JiangQiming 2023-02-23 09:46:30 +0800
  • 7d9cd9c5c0 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-23 09:45:22 +0800
  • 0592de1e81 update: 优化vuex中的权限数据 xieyonghong 2023-02-23 09:42:31 +0800
  • d526158076 fix: 基础配置进入页面 leiqiaochu 2023-02-23 09:10:10 +0800
  • c201ebdbf4 fix: 物模型属性组件开发 wangshuaiswim 2023-02-22 20:47:47 +0800
  • 7bd5c034e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-02-22 20:42:35 +0800
  • 7cef68f828 feat: 告警中心告警配置 leiqiaochu 2023-02-22 20:41:54 +0800
  • 0ad8294fd0 fix: 切换通知方式, 重置部分字段 JiangQiming 2023-02-22 20:10:20 +0800
  • ec85d0f5df Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-22 20:03:10 +0800
  • 819fa1cae5 fix: 解决编辑回显数据错误问题 JiangQiming 2023-02-22 20:02:56 +0800
  • 618c46d7b6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-22 20:02:18 +0800
  • db7f20e19b update: api配置 easy 2023-02-22 20:01:31 +0800
  • c73c43e288 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-22 19:40:07 +0800
  • 310cf92c57 update: 通知模板未选配置不查收信部门和收信人 JiangQiming 2023-02-22 19:38:58 +0800
  • 67a2a42ae2 fix: 修复Icon组件iconKeys值问题 jackhoo_98 2023-02-22 19:36:53 +0800
  • fedddfe3d0
    Merge pull request #51 from jetlinks/dev-hub 胡彪 2023-02-22 19:29:32 +0800
  • de0159ab2e fix: 合并冲突 jackhoo_98 2023-02-22 19:21:47 +0800
  • 906bc836ca feat: 远程升级 列表/新增/编辑 jackhoo_98 2023-02-22 19:14:15 +0800
  • 474bc29aab feat: 设备详情modbus和opcua 100011797 2023-02-22 18:09:48 +0800
  • ea98e6c788 update: 类型改变清空字段 JiangQiming 2023-02-22 17:55:08 +0800
  • 5cd3065b39 update: 新增默认值 JiangQiming 2023-02-22 17:29:12 +0800
  • dccebe617e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-22 17:23:31 +0800
  • 611fa0ea18 update: 类型改变重置字段 JiangQiming 2023-02-22 17:22:42 +0800
  • 737a06e988 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-22 17:01:45 +0800
  • b9d91170a8 update: 优化查询组件重置功能 xieyonghong 2023-02-22 17:01:04 +0800
  • 50af3f1ad8 update: 路由跳转改为menuStory方式 JiangQiming 2023-02-22 16:50:45 +0800
  • c48ea97962 update: 优化查询组件性能问题 xieyonghong 2023-02-22 16:44:34 +0800
  • 9fd6044e56 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-22 16:35:38 +0800
  • 5c1506a4c4 update: 通知模板优化 JiangQiming 2023-02-22 16:35:23 +0800
  • 754fe63fc1 update: 优化北向输出跳转 xieyonghong 2023-02-22 16:07:24 +0800
  • 1460ebcdbb update: 优化菜单路由处理 xieyonghong 2023-02-22 15:51:13 +0800
  • 9d8b31713c update: 重命名Northbound xieyonghong 2023-02-22 14:15:00 +0800
  • 643067656d Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-22 13:38:52 +0800
  • e313b36471 update: 优化路由处理 xieyonghong 2023-02-22 13:36:51 +0800
  • 8ac4fc8178 update: 通知管理交互优化 JiangQiming 2023-02-22 11:03:45 +0800
  • 9a3a752ac0 update: 通知模板详情接口调用逻辑更改 JiangQiming 2023-02-22 10:30:17 +0800
  • 3bb6a8f519 fix: 解决表单回显必填验证无法通过的问题 JiangQiming 2023-02-22 10:20:08 +0800
  • 383b4a897e update: 页面新增page-container组件包裹 JiangQiming 2023-02-22 09:50:54 +0800
  • 58bbb1ac36 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-22 09:11:05 +0800
  • 1851833bc4 update: 优化动态路由 xieyonghong 2023-02-22 09:08:20 +0800
  • ba17669e95 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-21 20:06:29 +0800
  • 7a220d2c1e fix: 通知管理优化 JiangQiming 2023-02-21 20:06:13 +0800
  • a9bb84ed6e update: api配置 easy 2023-02-21 19:53:03 +0800
  • 4599a01de7 Merge remote-tracking branch 'origin/dev' into dev xieyonghong 2023-02-21 19:46:38 +0800
  • 80b7436717 update: 优化打包 xieyonghong 2023-02-21 19:44:43 +0800
  • 58e9a993a3 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-21 16:57:00 +0800
  • f5e7ce0015 update: api配置 easy 2023-02-21 16:56:42 +0800
  • ee89ea27b0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev leiqiaochu 2023-02-21 16:46:11 +0800
  • e2eabb7bcb fix: 初始化页面 leiqiaochu 2023-02-21 16:45:36 +0800
  • f46c81e37e
    Merge pull request #50 from jetlinks/dev-hub 胡彪 2023-02-21 16:42:47 +0800
  • c0367ebebd Merge branch 'dev' into dev-hub jackhoo_98 2023-02-21 16:39:36 +0800
  • 235b620c9e feat: 网络组件详情 新增/编辑功能 jackhoo_98 2023-02-21 16:38:18 +0800
  • 6dffff43dd Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-21 13:41:19 +0800
  • bf1a7c3b30 update: 1 easy 2023-02-21 13:40:43 +0800
  • cdb964e932 update: 暂存 easy 2023-02-21 13:39:43 +0800
  • 3ba6cec842
    Merge pull request #49 from jetlinks/dev-hub 胡彪 2023-02-21 09:39:58 +0800
  • 9fee5864c5 Merge branch 'dev' into dev-hub jackhoo_98 2023-02-21 09:38:32 +0800
  • 5f56b3d4db feat: 网络组件详情 表单部分交互 jackhoo_98 2023-02-21 09:37:48 +0800
  • 97e40c509a fix: 合并冲突 100011797 2023-02-20 20:05:20 +0800
  • 909abdbc2a feat: websocket 100011797 2023-02-20 20:03:45 +0800
  • e5e096b0d0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev easy 2023-02-20 19:58:57 +0800
  • 58e5eec93b update: 数据源管理-管理模块 easy 2023-02-20 19:58:37 +0800
  • d3bdbe8909 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-20 16:54:44 +0800
  • b82c2ecda7 update: 代码编辑器格式化 JiangQiming 2023-02-20 16:54:17 +0800
  • aab1fc7d45 fix: 产品切换物联网卡导出无数据 leiqiaochu 2023-02-20 15:47:25 +0800
  • 45e2479831 feat: 设备功能-高级模式页面&接口联调 JiangQiming 2023-02-20 15:38:16 +0800
  • 9fb27c6fd7 feat: 设备功能-精简模式页面&接口联调 JiangQiming 2023-02-20 14:54:29 +0800
  • fbd917328c feat: 设备功能 JiangQiming 2023-02-20 13:52:11 +0800
  • c29f2d0cad feat: 设备详情新增设备功能菜单 JiangQiming 2023-02-20 11:06:04 +0800
  • ca66f58bdd fix: 解决通知管理表格卡片超出边界的问题 JiangQiming 2023-02-20 10:41:20 +0800
  • 0148179444 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-20 10:35:31 +0800
  • 94254b6235 fix: 删除无用代码 JiangQiming 2023-02-20 10:35:18 +0800
  • 518390837f feat: 告警中心基础配置 leiqiaochu 2023-02-20 09:42:59 +0800
  • c36d4b95e0 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev JiangQiming 2023-02-20 09:33:17 +0800
  • 136fdb8b79 fix: 解决表单回显必填严重无法通过的问题 JiangQiming 2023-02-20 09:33:02 +0800