Commit Graph

1744 Commits

Author SHA1 Message Date
xieyonghong 159a2f8ca7 fix: 优化设备接入切换逻辑 2023-04-14 18:08:50 +08:00
xieyonghong 2bb44cd518 style: 优化图片 2023-04-14 09:55:29 +08:00
xieyonghong d6523ea56b fix: bug#11278 2023-04-13 17:26:13 +08:00
xieyonghong f70b2c78ce style: 样式调整 2023-04-13 16:42:27 +08:00
xieyonghong 3f1e9f4980 fix: bug#11883、11895 2023-04-13 13:46:34 +08:00
xieyonghong d933bb7869 fix: 优化modbus新增点位地址校验规则 2023-04-12 17:39:12 +08:00
xieyonghong d81ef15ec1 style: 优化物联卡自适应 2023-04-11 17:54:24 +08:00
xieyonghong dfbf186c5e style: 更换首页图片 2023-04-11 16:41:47 +08:00
xieyonghong a3fd4b32b6 update: 删除冗余代码 2023-04-11 11:28:19 +08:00
xieyonghong fb32cc9a38 fix: bug#11826 2023-04-11 11:27:11 +08:00
xieyonghong 2b996fadf3 style: 优化设备接入居中 2023-04-11 10:57:19 +08:00
xieyonghong 8480df4f4d style: 优化设备接入网关编辑样式 2023-04-10 18:19:04 +08:00
xieyonghong 92c1b48887 style: 优化设备接入网关样式 2023-04-10 18:05:17 +08:00
xieyonghong 1b91cca362 fix: 修复通知模板无法保存 2023-04-10 17:50:18 +08:00
xieyonghong 6a1c917273 style: 优化运维管理仪表盘样式 2023-04-10 17:49:33 +08:00
xieyonghong 1d2670025e fix: 优化设备管理仪表盘样式 2023-04-10 14:28:41 +08:00
xieyonghong ceffa5eaf9 fix: 修改通知管理文案 2023-04-10 14:09:30 +08:00
xieyonghong 4da0a8feb6 style: 调整首页提示颜色 2023-04-10 13:58:25 +08:00
xieyonghong bf48c292db style: 调整首页自适应 2023-04-10 13:49:56 +08:00
xieyonghong d4d6a2f166 style: 调整class命名 2023-04-10 11:25:53 +08:00
xieyonghong 664bb39858 fix: 优化登录文案 2023-04-10 11:24:07 +08:00
xieyonghong 9fc1a55def fix: 优化场景联动 2023-04-10 09:42:47 +08:00
xieyonghong f87bef89c3 feat: 新增oauth2 页面 2023-04-10 09:41:29 +08:00
xieyonghong 0a93fe096d fix: bug#11262 2023-04-04 14:03:34 +08:00
xieyonghong 132aa4c920 fix: 优化应用管理默认密码校验规则 2023-04-03 20:58:40 +08:00
xieyonghong ba3e5d0194 fix: 修复应用管理图标显示 2023-04-03 20:31:35 +08:00
xieyonghong 6c9524ab9f fix: 修复单点登录正确获取用户信息 2023-04-03 19:46:16 +08:00
xieyonghong 0cbbd52a1e fix: 修复单点登录跳转失败问题 2023-04-03 18:38:48 +08:00
xieyonghong 3c329fd8ad update: 优化初始化页面部分代码逻辑 2023-04-03 18:13:31 +08:00
xieyonghong af3159ef95 fix: bug#10936 2023-04-03 17:46:31 +08:00
xieyonghong 453973fe32 fix: 优化接口请求超时时间 2023-04-03 17:02:27 +08:00
xieyonghong c430478319 fix: 优化场景联动-执行动作-选择产品;修复用户中心无法解绑 2023-04-03 17:00:55 +08:00
xieyonghong dd163c5611 update: 更新为组件库组件 2023-04-03 17:00:54 +08:00
leiqiaochu a42e6a8fb6 fix: bug#11373 2023-04-03 14:56:08 +08:00
xieyonghong 0ffe81d805 fix: 优化场景联动指标值选择参数处理 2023-04-03 10:13:56 +08:00
xieyonghong 6b8d56654c fix: bug#11365 2023-04-03 10:11:22 +08:00
jackhoo_98 25f4ecdbab feat: 菜单管理 菜单配置 修复菜单重复问题 2023-04-02 13:45:54 +08:00
jackhoo_98 bdc4f065ef Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-04-01 18:42:04 +08:00
jackhoo_98 94e93a53e5 feat: 修复菜单管理 菜单配置 菜单初始化问题 2023-04-01 18:41:52 +08:00
xieyonghong a6d869e7f0 fix: bug#10954 2023-04-01 18:33:00 +08:00
xieyonghong ede264c591 fix: 优化产品设备接入快速新增默认选中 2023-04-01 17:47:05 +08:00
xieyonghong 739490bcbe fix: bug#11213 2023-04-01 17:28:32 +08:00
xieyonghong 9c909edafd fix: bug#11328 2023-04-01 16:02:06 +08:00
wangshuaiswim 391ed48365 fix: 修改物模型导入后调用的刷新接口 2023-04-01 15:13:35 +08:00
xieyonghong 2649b6f755 fix: bug#10898 2023-04-01 15:10:32 +08:00
xieyonghong e1dd627601 fix: bug#11369 2023-04-01 15:10:31 +08:00
xieyonghong 83b9cc8dfc fix: bug#11218 2023-04-01 15:10:31 +08:00
xieyonghong 8d2c2133dd fix: 修复场景联动布尔值回显异常 2023-04-01 15:10:31 +08:00
xieyonghong df0b467656 fix: bug#10869 2023-04-01 15:10:31 +08:00
xieyonghong 9557586bb9 fix: 替换组件 2023-04-01 15:10:30 +08:00
jackhoo_98 968c68efba feat: bug#11097 修复采集器批量操作失败问题 2023-04-01 14:37:17 +08:00
jackhoo_98 3d5f88cddb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-04-01 14:03:16 +08:00
jackhoo_98 fde1b8b995 fix: 网络组件 修复编辑时端口问题 2023-04-01 14:02:58 +08:00
xieyonghong 077ad8abe8 fix: bug#11270 2023-04-01 10:15:42 +08:00
100011797 6a05668cb5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 22:59:56 +08:00
100011797 2d0fc7117a fix:修改数据源 2023-03-31 22:59:48 +08:00
JiangQiming bc7d170666 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 21:46:18 +08:00
JiangQiming 9fa3747ded fix: bug#11213 2023-03-31 21:46:02 +08:00
xieyonghong 200ff5fb61 fix: bug#11270 2023-03-31 21:24:59 +08:00
xieyonghong df6bf4d9ee fix: bug#11262 2023-03-31 21:24:59 +08:00
xieyonghong f5a125df65 fix: bug#11328 2023-03-31 21:24:58 +08:00
xieyonghong e9f255ca3c fix: 新增个人中心 2023-03-31 21:24:58 +08:00
jackhoo_98 b01cc1bb17 fix: 设备接入网关删除提示语 2023-03-31 21:23:17 +08:00
jackhoo_98 990a2f73af Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 21:22:04 +08:00
jackhoo_98 6ae03a9fc9 fix: bug#11271 2023-03-31 21:21:35 +08:00
JiangQiming ed2eb21d4b fix: bug#11353 2023-03-31 20:32:02 +08:00
JiangQiming 2013ecbddd fix: bug#11223 2023-03-31 19:54:53 +08:00
JiangQiming 19944afb8b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:56:06 +08:00
JiangQiming d58ec295a9 fix: bug#11269 2023-03-31 18:55:45 +08:00
leiqiaochu 1fae2c24f7 fix: bug管理员初始化取消 2023-03-31 18:05:16 +08:00
jackhoo_98 ae2758b5ba Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 18:03:18 +08:00
wangshuaiswim 767501ec11 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 17:57:18 +08:00
wangshuaiswim 09e56c4d0c fix: 修复布尔类型值类型是布尔的情况下不能编辑 2023-03-31 17:56:51 +08:00
leiqiaochu 7f0625fbca Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 17:44:04 +08:00
100011797 f6f99efe2b fix: 修改判断产品修改后数据变化的问题 2023-03-31 17:19:17 +08:00
jackhoo_98 bcf1f60ec3 fix: bug#11300、11289 2023-03-31 17:03:55 +08:00
JiangQiming c178d22691 fix: bug#11251 2023-03-31 17:01:39 +08:00
JiangQiming 53971eca2c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 16:18:14 +08:00
JiangQiming 492bc33c00 fix: bug#11316 2023-03-31 16:17:59 +08:00
leiqiaochu d7198a7ad1 fix: bug菜单管理按钮样式 2023-03-31 16:16:18 +08:00
wangshuaiswim e17ead51c3 fix: 删除多余代码 2023-03-31 16:07:47 +08:00
wangshuaiswim a286a1e222 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 16:06:37 +08:00
wangshuaiswim ad14ce0242 fix: 修复物模型导入问题 2023-03-31 16:06:15 +08:00
JiangQiming 25046ad8d0 fix: 登录页三方登录方式logo 2023-03-31 15:57:40 +08:00
jackhoo_98 0ec07a4d73 fix: bug#10847 修复菜单管理部分bug 2023-03-31 15:55:12 +08:00
JiangQiming 1beaab1732 fix: bug#11309 2023-03-31 15:52:20 +08:00
JiangQiming 9a8a0d2410 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 15:08:20 +08:00
JiangQiming 348ef4570c fix: 11216 2023-03-31 15:08:05 +08:00
jackhoo_98 11cf92b90e fix: bug#11233、11276 2023-03-31 14:33:58 +08:00
jackhoo_98 63ec13e49b fix: 视频设备新增 快速接入网关,修改浏览器tab关闭时的参数 2023-03-31 14:27:28 +08:00
leiqiaochu 39d6a156a8 feat: license页面 2023-03-31 14:19:10 +08:00
JiangQiming f2b1b6250e Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 14:02:18 +08:00
JiangQiming 497ac1f4ca fix: bug#11274、11273、11272 2023-03-31 14:02:03 +08:00
xieyonghong f5ef19817b fix: bug#10943 2023-03-31 13:55:27 +08:00
xieyonghong e56be3212a fix: bug#11261、10943、10942 2023-03-31 13:55:27 +08:00
100011797 4b08712c61 fix: 修改应用管理的状态展示 2023-03-31 13:52:41 +08:00
jackhoo_98 008cd45ce7 fix: 采集器状态组件引入 2023-03-31 13:51:03 +08:00
jackhoo_98 0998f4bc79 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 12:40:02 +08:00
jackhoo_98 e7be6d4770 update: 统一修改浏览器标签跳转、设备接入网关新增快速添加 2023-03-31 12:39:44 +08:00
JiangQiming 7223ec88b9 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 11:51:44 +08:00
JiangQiming efded0457b fix: bug#11227、11266、11260 2023-03-31 11:51:27 +08:00
100011797 e510380bde fix: 修改场景联动 2023-03-31 11:49:13 +08:00
100011797 74c0b9fc0a fix: 修改设备网关的样式 2023-03-31 10:42:33 +08:00
jackhoo_98 ef6c66600f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 10:24:59 +08:00
jackhoo_98 6a60407e9f fix: bug#11256 2023-03-31 10:24:39 +08:00
JiangQiming 12c12a08fc Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-31 10:09:22 +08:00
JiangQiming f4770bc03f fix: bug#11260 2023-03-31 10:09:04 +08:00
leiqiaochu d483ea15cf fix: bug#11210 2023-03-31 10:05:38 +08:00
xieyonghong e48a9ba24f fix: bug#10975 2023-03-31 09:12:53 +08:00
xieyonghong 73828ec03a fix: bug#11235、11234 2023-03-31 09:12:53 +08:00
xieyonghong 3e268404a9 update: 优化基本设置创建时间显示 2023-03-31 09:12:52 +08:00
xieyonghong 6224bf81ec fix: bug#11224 2023-03-31 09:12:52 +08:00
xieyonghong 79c280cece fix: bug#11218 2023-03-31 09:12:51 +08:00
xieyonghong cf06b77fe1 fix: bug#11087 2023-03-31 09:12:51 +08:00
xieyonghong cf6b40f438 fix: 修改分屏展示的间接支持 2023-03-31 09:12:51 +08:00
JiangQiming d3af662267 fix: bug#11249、11247、10637、11250 2023-03-30 20:24:05 +08:00
JiangQiming f25468066b fix: bug#11223 2023-03-30 19:58:28 +08:00
JiangQiming 735994f12f fix: bug#11223 2023-03-30 19:24:00 +08:00
JiangQiming 4767863dda Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 19:16:01 +08:00
JiangQiming a87a8d813b fix: bug#11254 2023-03-30 19:15:46 +08:00
100011797 4e540b022d fix: 资源库跳转 2023-03-30 18:24:03 +08:00
JiangQiming d53f487d2c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:12:56 +08:00
JiangQiming a3951bf202 fix: bug#11258 2023-03-30 18:12:40 +08:00
jackhoo_98 db06aa023b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:10:34 +08:00
jackhoo_98 74abf49b1e fix: bug#11242 2023-03-30 18:09:37 +08:00
xieyonghong 84e5a57c67 fix: 优化场景联动布尔值 2023-03-30 18:08:49 +08:00
xieyonghong 683751af53 fix: 优化物联布局 2023-03-30 18:08:49 +08:00
jackhoo_98 f878cffe82 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 18:02:26 +08:00
jackhoo_98 f4f190fa01 fix: bug#11233、11240、11236 2023-03-30 18:01:58 +08:00
leiqiaochu 1826574d41 fix: bug 产品按钮权限 2023-03-30 18:01:00 +08:00
JiangQiming 8f992dd1f3 fix: bug#11243 2023-03-30 17:57:39 +08:00
JiangQiming c31d38484a Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:53:37 +08:00
JiangQiming fff3922717 fix: bug#11239 2023-03-30 17:53:20 +08:00
100011797 f1e3c10468 fix: 设备图片显示 2023-03-30 17:45:55 +08:00
leiqiaochu a69adc0033 fix: bug#11230 2023-03-30 17:24:26 +08:00
JiangQiming 352bcfe98f Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:18:59 +08:00
JiangQiming f08e28560a update: 系统管理列表撑满高度 2023-03-30 17:18:43 +08:00
jackhoo_98 f5afc16a1f update: 运维管理、数据采集添加FullPage组件 2023-03-30 17:08:30 +08:00
leiqiaochu e98f168b20 fix: bug#11226 样式铺满 2023-03-30 17:07:33 +08:00
JiangQiming 881cc39e9b Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 17:06:46 +08:00
JiangQiming f960e2df76 update: 通知管理,视频中心所有页面表格撑满屏幕 2023-03-30 17:06:04 +08:00
100011797 c38923f468 fix: 加fullpage 2023-03-30 17:01:58 +08:00
JiangQiming 8239b2c308 fix: bug#11174、11227 2023-03-30 16:36:11 +08:00
JiangQiming 6c24474de2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:21:26 +08:00
JiangQiming 09544943f2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:20:55 +08:00
JiangQiming a75f2a3fd6 fix: bug#11106 2023-03-30 16:20:16 +08:00
leiqiaochu c694bf8222 fix: bug 设备接入权限 2023-03-30 16:19:41 +08:00
xieyonghong 7f4d01f2c0 fix: 优化FullPage取值 2023-03-30 16:14:56 +08:00
jackhoo_98 1b7a8a1b21 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 16:07:37 +08:00
xieyonghong 57e107c588 update: 新增FullPage组件 2023-03-30 16:05:18 +08:00
xieyonghong a1b67ce45c fix: 优化跳转初始化页面 2023-03-30 16:05:17 +08:00
leiqiaochu ea4cb2492b fix: bug#11226 2023-03-30 15:55:57 +08:00
JiangQiming 2bccd21378 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:51:41 +08:00
JiangQiming c88706282f fix: bug#11106 2023-03-30 15:51:16 +08:00
leiqiaochu 2dbd7e31b6 fix: bug路由校验 初始化跳转 2023-03-30 15:39:04 +08:00
jackhoo_98 7c1376f0ce fix: 采集器 新增请求超时时间配置 2023-03-30 15:28:27 +08:00
jackhoo_98 3ea80b89c6 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 15:17:50 +08:00
jackhoo_98 2fbcc606e9 fix: 采集器 新增离散输入寄存器、单双高低位切换 2023-03-30 15:17:17 +08:00
100011797 04ad3d4689 fix: 修改按标签 2023-03-30 14:24:22 +08:00
100011797 048d8508a6 fix: 修改场景联动数据显示 2023-03-30 14:19:50 +08:00
leiqiaochu 7ab063a790 fix: bug初始化页面跳转 2023-03-30 14:18:12 +08:00
jackhoo_98 fc3d0d2d12 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 13:47:16 +08:00
jackhoo_98 bf4b1d9c13 fix: bug#11205、11211 2023-03-30 13:46:46 +08:00
xieyonghong 947f34bed5 fix: bug#11218 2023-03-30 13:42:18 +08:00
xieyonghong 9b7b78fe33 fix: bug#11191 2023-03-30 13:42:17 +08:00
xieyonghong d3ea02c0f6 style: 优化组织管理样式 2023-03-30 13:42:16 +08:00
xieyonghong a3cb28ed5b fix: bug#11192 2023-03-30 13:42:15 +08:00
xieyonghong e3c9884606 fix: 修复触发规则-功能调用验证失败 2023-03-30 13:42:14 +08:00
JiangQiming 57af547bfb Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:50:49 +08:00
JiangQiming c6ec16350e fix: bug#11221 2023-03-30 11:50:32 +08:00
leiqiaochu 92315c3c39 fix: bug#10777 2023-03-30 11:45:09 +08:00
leiqiaochu 77d8044cf2 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:32:46 +08:00
leiqiaochu 18d950d63f fix: bug#10777 11128 11212 2023-03-30 11:32:15 +08:00
JiangQiming de904854e5 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-30 11:27:28 +08:00
JiangQiming ceec8a65e3 fix: bug#10954 2023-03-30 11:27:09 +08:00
100011797 0675fcff7b fix: 修改设备功能 2023-03-30 11:22:52 +08:00
JiangQiming d7790f203f fix: bug#11139、11214 2023-03-30 10:56:51 +08:00
xieyonghong 4447e11d7c update: 优化数据权限 2023-03-29 23:01:55 +08:00
jackhoo_98 d0c53252ec Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:08:54 +08:00
JiangQiming e61efa5832 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 22:06:43 +08:00
JiangQiming cea070b35c fix: bug#10766 2023-03-29 22:06:27 +08:00
100011797 55cd57269d fix: ico改变 2023-03-29 22:04:09 +08:00
leiqiaochu 922624cbc2 fix: bug#10781 2023-03-29 21:57:36 +08:00
jackhoo_98 a422769c2f fix: bug#11200、11201、11206、11207 2023-03-29 21:49:50 +08:00
JiangQiming e9f84f959a fix: bug#10803 2023-03-29 21:39:39 +08:00
JiangQiming 4424b56d4c Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 21:29:46 +08:00
JiangQiming b7034c5ca4 fix: bug#11037、11057 2023-03-29 21:29:30 +08:00
leiqiaochu 3aa73c4f08 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:55:07 +08:00
JiangQiming ee323a1a7d Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:52:50 +08:00
JiangQiming 95c0409c21 fix: bug#11157 2023-03-29 20:52:33 +08:00
leiqiaochu 382f0bff44 fix: bug#11195 2023-03-29 20:45:34 +08:00
100011797 ecd956b4fd fix: 修改场景联动执行动作设备查询排序 2023-03-29 20:38:24 +08:00
leiqiaochu 8187e27a43 fix: bug#11128 2023-03-29 20:24:43 +08:00
xieyonghong b283c729d9 fix: bug#10938 2023-03-29 20:22:54 +08:00
xieyonghong 81f7e58c01 fix: bug#11087 2023-03-29 20:22:54 +08:00
xieyonghong 5cf8ce8aff fix: bug#11191 2023-03-29 20:22:53 +08:00
xieyonghong 09267955f5 fix: bug#11193、11190、11189 2023-03-29 20:22:53 +08:00
xieyonghong c6717f6be0 fix: bug#11035 2023-03-29 20:22:52 +08:00
xieyonghong 2588145b96 fix: bug#11138 2023-03-29 20:22:51 +08:00
jackhoo_98 a1affe20a8 Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 2023-03-29 20:21:15 +08:00