0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 2aecee7be3
         fix: s7修改导入图标 qiaochuLei 2023-11-23 10:19:33 +0800
  • 4bd1bcceda fix: bug#20430 XieYongHong 2023-11-23 10:16:34 +0800
  • 6c8e8f3608
         feat: 集成菜单新增菜单功能 qiaochuLei 2023-11-23 10:09:19 +0800
  • 708078e03b
         bug#20101 qiaochuLei 2023-11-23 09:57:02 +0800
  • c3195997a0
         * fix: 修改导入图标 qiaochuLei 2023-11-21 10:52:05 +0800
  • f61630df8f fix: 优化内部应用页面集成 XieYongHong 2023-11-17 17:15:00 +0800
  • 9f95f3034d Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-17 13:57:39 +0800
  • 9517cbb954
         feat: 导入通道校验 qiaochuLei 2023-11-17 13:48:46 +0800
  • 70d84cefd3 fix: bug#19649 leiqiaochu 2023-11-16 15:33:55 +0800
  • ebee9f9e71 fix: bug#19996 leiqiaochu 2023-11-16 14:51:55 +0800
  • 6252259ff0 Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-11-16 14:41:13 +0800
  • 057ab09612 fix: bug#20382 leiqiaochu 2023-11-16 14:39:59 +0800
  • dcc6afc6b7 Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-15 18:12:24 +0800
  • d304baf94f
         fix: s7点位bug修复 hear 2023-11-15 18:11:46 +0800
  • 784034c5cb Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-15 16:26:59 +0800
  • 7b727d5587
         fix: 修复s7点位bug hear 2023-11-15 16:25:00 +0800
  • ec928a87c5 fix: s7按钮权限 XieYongHong 2023-11-15 16:17:48 +0800
  • eb60514999 fix: 优化流程引擎字段权限 XieYongHong 2023-11-15 16:14:42 +0800
  • 3dd7a4d358 fix: 优化流程引擎字段权限 XieYongHong 2023-11-15 16:03:13 +0800
  • 697c13f713 Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-15 14:05:14 +0800
  • 884e8918e8
         fix: s7点位配置 hear 2023-11-15 14:04:49 +0800
  • 7791712a3f
         fix: bug#20211 qiaochuLei 2023-11-15 14:04:12 +0800
  • 8294b83437 fix: bug#19996 XieYongHong 2023-11-15 09:39:16 +0800
  • 7e550f4558 Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-14 17:55:47 +0800
  • f23451be31
         feat: 新增S7 hear 2023-11-14 17:22:10 +0800
  • 858f6ae275 fix: 优化初始化流程引擎菜单数据权限 XieYongHong 2023-11-14 14:06:03 +0800
  • 345be95d1d
         fix: bug#19771、20134、20211 XieYongHong 2023-11-14 13:55:05 +0800
  • f3c5ed3a23
         fix: bug#20211 qiaochuLei 2023-11-14 13:39:34 +0800
  • 35db2f350e fix: 解决冲突 leiqiaochu 2023-11-13 18:13:15 +0800
  • b83dcef019 Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-13 17:50:25 +0800
  • ed6ed70e7f
         fix: bug#20134 qiaochuLei 2023-11-13 15:03:40 +0800
  • 35b574d7da fix: bug#20093 leiqiaochu 2023-11-13 10:20:12 +0800
  • 2777cca778 fix: bug#19994 leiqiaochu 2023-11-10 14:34:42 +0800
  • 0ff347fded
         fix: bug#19588、19904、19950 XieYongHong 2023-11-09 17:48:28 +0800
  • 8c44d9704b
         fix: bug#19950、19904、19588 qiaochuLei 2023-11-09 17:35:43 +0800
  • 6f169b327a fix: 优化工作流菜单权限 XieYongHong 2023-11-09 16:08:50 +0800
  • 1575690166 Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-09 16:03:42 +0800
  • 8ec7f87924
         fix: bug#19950 qiaochuLei 2023-11-09 16:01:49 +0800
  • f9bc87a39d
         fix: bug#19771 qiaochuLei 2023-11-09 15:34:31 +0800
  • 592c4f116e fix: bug#19771 leiqiaochu 2023-11-09 14:19:50 +0800
  • 086df3e2e1 fix: 优化工作流菜单权限 XieYongHong 2023-11-08 11:25:10 +0800
  • 7c67618dce Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-11-07 17:32:04 +0800
  • a087566f4d fix: 优化工作流菜单权限 XieYongHong 2023-11-07 17:31:50 +0800
  • ce1260d561 fix: 19361、19656 100011797 2023-11-07 14:22:51 +0800
  • 0ffb6a92c9 fix: 优化工作流菜单权限 XieYongHong 2023-11-07 09:57:58 +0800
  • 9dabe5c103 fix: 优化store中权限类型 XieYongHong 2023-11-06 19:23:28 +0800
  • 8aa0c7365f fix: 优化初始权限 XieYongHong 2023-11-06 19:19:35 +0800
  • 8c8911b580 fix: 删除多余权限 XieYongHong 2023-11-03 17:34:22 +0800
  • 5e3c603bb5 Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-11-03 16:56:56 +0800
  • 2635f78890 fix: 修改初始化数据 XieYongHong 2023-11-03 16:54:30 +0800
  • bdb150609b Merge branch 'dev-dictionary' of github.com:jetlinks/jetlinks-ui-vue into dev-dictionary leiqiaochu 2023-11-03 14:04:27 +0800
  • 44ad3ccab5 fix: bug#19699、19666、19655 leiqiaochu 2023-11-03 14:03:51 +0800
  • 82aeb6b522 fix: 修改订阅关于工作流的标识 XieYongHong 2023-11-02 10:47:01 +0800
  • 3fc10962ae Merge branch 'dev' into dev-dictionary XieYongHong 2023-11-02 10:37:40 +0800
  • 09704d42a9 fix: 优化初始化菜单配置 XieYongHong 2023-11-02 10:37:10 +0800
  • e1e1ed4a27 fix: 优化初始化菜单配置 XieYongHong 2023-11-02 10:13:57 +0800
  • 8d941fd875
         fix: bug#19588 qiaochuLei 2023-11-02 10:09:32 +0800
  • 33c92b72e1 feat: 站内信工作流通知 leiqiaochu 2023-11-01 11:32:50 +0800
  • b79e345cc5 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-31 14:57:31 +0800
  • d2fd316ef5
         fix: bug#19117、19108 qiaochuLei 2023-10-31 14:53:57 +0800
  • 56052135c0 fix: 优化菜单配置 XieYongHong 2023-10-31 10:22:02 +0800
  • 28a5c230e4 fix: bug#19251 leiqiaochu 2023-10-30 17:23:55 +0800
  • f473124ce8
         fix: bug#19215、19214、19213、19183、19060、19090、19167、19090 XieYongHong 2023-10-30 16:42:00 +0800
  • d3835c3184 fix: bug#19355 leiqiaochu 2023-10-30 13:57:09 +0800
  • 22d1022189 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-30 11:51:22 +0800
  • 5dd01e5863 fix: iframe组件优化没有参数时，url格式 XieYongHong 2023-10-30 11:28:36 +0800
  • 2abc3362c8 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-27 15:15:58 +0800
  • ff98143f30 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-10-27 15:03:19 +0800
  • e215fb57be
         fix: bug#19181 qiaochuLei 2023-10-27 15:01:07 +0800
  • 5382aee3fe fix: bug#19080 XieYongHong 2023-10-27 15:00:05 +0800
  • aa0ffab927 fix: bug#19167 XieYongHong 2023-10-27 14:32:40 +0800
  • 6c1917d9c3 fix: 区域管理的编辑的修改 100011797 2023-10-27 10:19:21 +0800
  • 67309da698 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-26 16:28:43 +0800
  • 890f46c04e fix: bug#19181 leiqiaochu 2023-10-26 16:12:53 +0800
  • f2317db02d
         Dev bug (#217) qiaochuLei 2023-10-26 15:17:10 +0800
  • a38aff28d7 feat: 区域管理编辑和删除 100011797 2023-10-26 13:38:53 +0800
  • c5d70916dd Merge remote-tracking branch 'origin/dev-dictionary' into dev-dictionary XieYongHong 2023-10-25 18:54:11 +0800
  • dda03a03f4 feat: 优化地区管理地图操作 XieYongHong 2023-10-25 18:52:30 +0800
  • 6b2360cac1 feat: 区域管理新增 100011797 2023-10-25 18:04:34 +0800
  • d5fe1702d2 feat: 添加地区管理菜单 XieYongHong 2023-10-25 11:58:33 +0800
  • 97be31a587 feat: 区域管理 100011797 2023-10-25 11:18:40 +0800
  • c5b4c69b82 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-25 09:57:48 +0800
  • f319d4e0e2 fix: bug#19071 XieYongHong 2023-10-24 18:26:36 +0800
  • 6a2250cbf3 Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-24 15:53:05 +0800
  • f90ee686c1 fix: bug#19132 XieYongHong 2023-10-24 15:48:13 +0800
  • 7cae540c88 fix: 优化iframe中hash地址 XieYongHong 2023-10-24 15:46:48 +0800
  • d255a0bc78 fix: bug#18263 XieYongHong 2023-10-24 15:28:34 +0800
  • 16d9f5a158 fix: 优化物模型配置按钮样式 XieYongHong 2023-10-24 10:24:13 +0800
  • 09d77f4b07 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-10-23 18:40:29 +0800
  • d1dff88218
         * fix: 子设备绑定与解绑 qiaochuLei 2023-10-23 18:11:14 +0800
  • 633316ac84 fix: bug#17054 XieYongHong 2023-10-23 16:44:17 +0800
  • ec66a46e96 fix: bug#17054 XieYongHong 2023-10-23 16:17:11 +0800
  • 4ce90a88b5 fix: bug#19121 XieYongHong 2023-10-23 15:20:22 +0800
  • 8e5d797a40 fix: 修改docker版本 XieYongHong 2023-10-23 14:01:30 +0800
  • 8548138cf5
         fix: bug#19087 XieYongHong 2023-10-23 13:49:16 +0800
  • 70a1cf2197 fix: 修复设备功能-执行包含object类型时异常 XieYongHong 2023-10-23 11:51:17 +0800
  • 5a9d4514fe Merge branch 'dev' into dev-dictionary XieYongHong 2023-10-23 09:46:04 +0800
  • 057de400fe fix: bug#18733 XieYongHong 2023-10-23 09:36:46 +0800
  • 50a9d83270 Merge remote-tracking branch 'origin/dev' into dev XieYongHong 2023-10-20 18:09:15 +0800
  • 0453eb669f
         fix: bug#19118 qiaochuLei 2023-10-20 18:09:00 +0800