Commit Graph

Select branches

Hide Pull Requests

deploy-dev

main

temp

Mono Color

• a2bfe148d3 feat: 权限补充 xuziqiang 2024-07-23 14:39:55 +08:00
• 9134cf4ac3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-23 14:28:51 +08:00
• 7b77c3cc88 add:设备告警网关告警对接 接口 zhaohy 2024-07-23 14:28:49 +08:00
• 5e2f9cc966 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-23 11:01:10 +08:00
• 4dcb8f74ca fix: op侧代码补充 xuziqiang 2024-07-23 11:01:09 +08:00
• 223ceed5eb Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-23 08:35:53 +08:00
• 5c5acf6942 add:设备告警修改流程对接 zhaohy 2024-07-23 08:35:51 +08:00
• 975d5fe4f0 fix: 部分样式调整 xuziqiang 2024-07-22 18:11:03 +08:00
• 159698ffbe fix: 菜单样式调整 xuziqiang 2024-07-22 18:02:12 +08:00
• 1b0118bb82 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-22 15:51:50 +08:00
• 7c679f7fa5 fix: 菜单icon调整 xuziqiang 2024-07-22 15:51:50 +08:00
• ccec1ee763 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp fks-xuxinyue 2024-07-22 15:25:57 +08:00
• c390535202 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-22 15:25:49 +08:00
• f4d01d65d0 fix:修改设备告警 配置字段 zhaohy 2024-07-22 15:25:47 +08:00
• 16e3213f21 tackid:099 remark:'commit' fks-xuxinyue 2024-07-22 15:25:41 +08:00
• 842c1e94e0 add:照明系统 增加接口 / 枚举 / 逻辑补充 chenpingsen 2024-07-22 15:25:07 +08:00
• 55f98f9e56 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-22 14:31:04 +08:00
• fc4b038e2e add:添加设备保存时 逻辑判断 zhaohy 2024-07-22 14:31:02 +08:00
• 5993621c21 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-22 14:15:40 +08:00
• 714e640c2e fix: 调整阴影 xuziqiang 2024-07-22 14:15:39 +08:00
• 96b91ad6de Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-22 11:38:38 +08:00
• b82b97ebb1 fix:修改设备告警 能源告警 回显 添加之后 刷新通知告警 zhaohy 2024-07-22 11:38:36 +08:00
• 69727fa613 修改字典新增编辑规则 fks-yangshouda 2024-07-22 11:35:11 +08:00
• 0fba8917f2 新增字典前台页面 fks-yangshouda 2024-07-22 10:56:30 +08:00
• 088590beea Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-22 10:34:43 +08:00
• 4c2989239d fix:设备告警 网关告警 zhaohy 2024-07-22 10:34:40 +08:00
• 1c8419569e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-22 10:22:15 +08:00
• 822519dbb6 fix: 宽度修正 xuziqiang 2024-07-22 10:22:14 +08:00
• 2d1d3a41a8 add:照明系统 抽屉功能tab2分页功能完善 chenpingsen 2024-07-22 09:18:46 +08:00
• 2bc56cc1d4 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-19 18:12:46 +08:00
• f82ffa185d fix: 样式调整 xuziqiang 2024-07-19 18:12:45 +08:00
• 57d97eb3e2 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-19 16:22:17 +08:00
• c9e283c3c8 fix:修改接口层级 zhaohy 2024-07-19 16:22:15 +08:00
• 57b55b5f82 Merge branch 'deploy-dev' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into deploy-dev xuziqiang 2024-07-19 16:17:57 +08:00
• ca0ebf33f7 Merge branch 'temp' into deploy-dev xuziqiang 2024-07-19 16:17:52 +08:00
• ec94e2b5b4 feat：树组件补充是否取消逻辑 xuziqiang 2024-07-19 16:13:01 +08:00
• c085f51cd1 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-19 15:38:53 +08:00
• 1e4a3d61da fix: 管理员禁用切换组织 xuziqiang 2024-07-19 15:38:52 +08:00
• 9bd82ebbee taskid:099 remark:"commit" fks-xuxinyue 2024-07-19 15:13:46 +08:00
• ecdcd900d3 fix:修改配置设备告警字段 zhaohy 2024-07-19 14:13:01 +08:00
• 2f1a54a114 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-19 11:37:16 +08:00
• f636f426b0 fix:简化ns-step组件 设备告警样式 设备告警 能源告警 添加字段 zhaohy 2024-07-19 11:37:14 +08:00
• 1c709d3ccf fix: 树样式调整 xuziqiang 2024-07-19 10:36:05 +08:00
• df0f1f62ad fix: 补充切换组织刷新页面 xuziqiang 2024-07-18 17:43:02 +08:00
• 6be90a8d0c fix: 台账字段调整 xuziqiang 2024-07-18 17:15:20 +08:00
• 0585818abf Merge branch 'temp' into deploy-dev wangyan 2024-07-18 16:23:33 +08:00
• 75a9b87513 fix: 用户管理多个角色调整 xuziqiang 2024-07-18 16:04:44 +08:00
• 0fa9abf014 fix: 部门角色新增补充部门id xuziqiang 2024-07-18 15:43:39 +08:00
• 2576503808 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-18 15:40:33 +08:00
• 7274efd5c2 fix: 部门角色逻辑调整 xuziqiang 2024-07-18 15:40:32 +08:00
• 429909a712 add:照明系统交互 chenpingsen 2024-07-18 15:29:22 +08:00
• a6f77afe70 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-18 15:17:35 +08:00
• 4955c235cc fix:修改多次点击数据丢失问题 zhaohy 2024-07-18 15:17:32 +08:00
• 86db377d29 taskid：099 remark:"commit" fks-xuxinyue 2024-07-18 15:14:25 +08:00
• db70343b18 fix: 去除页面缓存 xuziqiang 2024-07-18 14:56:26 +08:00
• 7f839b7a31 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-18 14:54:31 +08:00
• 13d6db895f fix: box-shadow补充 xuziqiang 2024-07-18 14:54:30 +08:00
• 4e17163c67 fix:删除多余配置 zhaohy 2024-07-18 13:57:12 +08:00
• c1aa2483ed Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-18 13:50:11 +08:00
• 652a94a466 fix:对接通知管理接口 进行联调测试 zhaohy 2024-07-18 13:50:09 +08:00
• 97667fc496 taskId:099 remark:"commit" fks-xuxinyue 2024-07-18 11:29:52 +08:00
• 9dfc3173ac Merge branch 'temp' into deploy-dev xuziqiang 2024-07-17 16:54:48 +08:00
• 7745f55803 fix: 修改部门交互穿插逻辑导致提交异常 xuziqiang 2024-07-17 16:54:15 +08:00
• f915dab012 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-17 16:11:25 +08:00
• 9031837695 fix: 修改table Search xuziqiang 2024-07-17 16:11:24 +08:00
• bd4fec4c7e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-17 15:54:39 +08:00
• f10045b64d fix:通知管理 zhaohy 2024-07-17 15:54:35 +08:00
• 85cd183493 taskid:088 remark:"commit" fks-xuxinyue 2024-07-17 15:54:10 +08:00
• a83f8d868a fix: table Search 样式调整 xuziqiang 2024-07-17 15:39:24 +08:00
• bf4a3fd581 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-17 15:07:24 +08:00
• 2a6de583e1 fix: 树样式优化 xuziqiang 2024-07-17 15:07:23 +08:00
• ddf0514182 1.设备监测 接口对接 2.环境监测 平均数据 前台页面开发 fks-yangshouda 2024-07-17 15:06:11 +08:00
• 1be888feba feat: 部门权限补充 xuziqiang 2024-07-17 13:48:54 +08:00
• 5c902d174d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-17 11:14:01 +08:00
• c2e69b4d36 fix:添加设备告警 换图标 设备告警详情 状态流程 按钮权限 zhaohy 2024-07-17 11:13:56 +08:00
• 7690f72636 Merge branch 'deploy-dev' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into deploy-dev xuziqiang 2024-07-17 10:54:29 +08:00
• 211b013084 Merge branch 'temp' into deploy-dev xuziqiang 2024-07-17 10:54:24 +08:00
• 62f357c5d5 fix: 修改验证码更新时机 xuziqiang 2024-07-17 10:45:12 +08:00
• a94531bd57 Merge branch 'temp' into deploy-dev wangyan 2024-07-16 16:07:24 +08:00
• b06c9ddc84 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-16 15:50:43 +08:00
• 40021ba5d0 fix: bug修改 xuziqiang 2024-07-16 15:50:42 +08:00
• 1401d3611f Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-16 15:42:52 +08:00
• d29c724920 fix:联系方式 zhaohy 2024-07-16 15:42:49 +08:00
• 5eba9a35a0 taskid:084 remark:'commit' fks-xuxinyue 2024-07-16 15:36:47 +08:00
• 6278e3ff17 1.监控中心 - 环境监测 环境指数分析添加查询部分 2.修改 监控中心 - 能耗监测左侧树组件 fks-yangshouda 2024-07-16 15:31:05 +08:00
• 0b619fe937 fix: 补充相关限制 xuziqiang 2024-07-16 15:22:29 +08:00
• 48569345aa feat: 修改密码 xuziqiang 2024-07-16 14:31:27 +08:00
• dc0f2a164b fix: 修改登录多重submit xuziqiang 2024-07-16 10:48:10 +08:00
• 1aa294b998 fix: 设备型号取消关联 xuziqiang 2024-07-15 17:51:30 +08:00
• ef20fa58de Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-15 17:15:59 +08:00
• dac2e095e1 fix：分组管理逻辑补充 xuziqiang 2024-07-15 17:15:59 +08:00
• c68dc4deb7 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-15 17:02:45 +08:00
• 0e9743f598 fix:换成枚举 zhaohy 2024-07-15 17:02:42 +08:00
• 2fe6bb6d81 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-15 16:58:51 +08:00
• 58300c60e2 fix：设备台账补充筛选项去重逻辑 xuziqiang 2024-07-15 16:58:50 +08:00
• 3bf19ba70d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp zhaohy 2024-07-15 16:41:08 +08:00
• de0ce4ec2d fix: 添加联系人 zhaohy 2024-07-15 16:41:03 +08:00
• 8091bc10cc fix:能源告警换枚举 zhaohy 2024-07-15 16:40:03 +08:00
• e90efdb08d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp xuziqiang 2024-07-15 16:26:06 +08:00
• 86e0b30e81 fix: 分组逻辑调整 xuziqiang 2024-07-15 16:25:55 +08:00