Commit Graph

357 Commits (pc-master)

Author SHA1 Message Date
孙萌 2914d76401 1 2024-01-06 14:57:06 +08:00
孙萌 41e72c9a18 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2024-01-06 14:55:47 +08:00
孙萌 d9a914d963 1 2024-01-06 14:55:40 +08:00
pangdundun 943742204b 丽水跳转大屏权限 2024-01-05 11:37:06 +08:00
孙萌 478145c8e9 顶卷膜修改 2024-01-05 08:41:13 +08:00
孙萌 f889cd5daf 1 2024-01-02 16:53:12 +08:00
home孙 da2fbbce7e 1 2023-12-28 14:35:11 +08:00
孙萌 29cbeaaff3 ~ 2023-12-28 14:14:22 +08:00
孙萌 d69282026e 1 2023-12-26 14:08:18 +08:00
孙萌 3fd7594de0 1 2023-12-22 15:42:29 +08:00
孙萌 882eefb00e 1 2023-12-21 11:36:14 +08:00
孙萌 171db92c05 1 2023-12-18 16:19:51 +08:00
pangdundun 4fa55e01d7 ~ 2023-12-17 17:46:03 +08:00
home孙 7f718fd082 1 2023-12-16 18:06:23 +08:00
home孙 18c8159b0b 1 2023-12-16 13:40:10 +08:00
home孙 2295d61251 1 2023-12-16 13:36:54 +08:00
home孙 ce46ebeae3 1 2023-12-16 13:11:52 +08:00
home孙 e97ac08eb5 1 2023-12-16 09:53:45 +08:00
home孙 5d6a6058c4 五防页面接口逻辑更换 2023-12-15 10:31:24 +08:00
孙萌 389cdb3b70 修改参数成功后取消数据请求 2023-12-13 17:16:51 +08:00
孙萌 f9f00dda10 1 2023-12-12 15:53:58 +08:00
孙萌 6094cf64fc 1 2023-12-12 14:29:33 +08:00
孙萌 1603a9652f 1 2023-12-12 11:45:54 +08:00
pangdundun f65303a215 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-12-11 17:12:45 +08:00
pangdundun 0429b4e039 更换地图 2023-12-11 17:12:32 +08:00
home孙 ab9f3d9fd3 1 2023-12-11 10:35:35 +08:00
home孙 b068c8a833 1 2023-12-11 09:10:25 +08:00
759657 66c1556df7 fix(update):1 2023-12-10 20:12:38 +08:00
759657 24c3a084a9 fix(update): '更改代码冲突' 2023-12-10 20:06:09 +08:00
孙萌 5e8787d5e2 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-12-09 18:06:08 +08:00
孙萌 8e2c86ae0a 1 2023-12-09 18:05:58 +08:00
pangdundun 65d1d8dc34 修改东北弹框 2023-12-09 17:19:10 +08:00
xiaomeng f94ae07f6e Merge pull request 'pc-master' (#65) from pc-master into portal
Reviewed-on: #65
2023-12-09 06:54:11 +00:00
pangdundun f3bce25c73 修改右下角模块 2023-12-07 16:22:38 +08:00
pangdundun 3b38393e3b Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-12-07 10:37:51 +08:00
pangdundun 434a5c2330 修改东北code 2023-12-07 10:37:36 +08:00
孙萌 f1b90810cd 1 2023-12-07 10:17:59 +08:00
wmsjhappy@gmail.com 8d08393653 feat(component): add new feature 2023-12-07 09:23:43 +08:00
xiaomeng e0ce09bf87 Merge pull request 'pc-master' (#64) from pc-master into portal
Reviewed-on: #64
2023-12-07 00:57:05 +00:00
孙萌 d7251628c7 1 2023-12-06 17:36:41 +08:00
孙萌 b59b193b7f 1 2023-12-06 14:57:38 +08:00
孙萌 b49faf0d47 上风口新参数添加/实时数据status添加删除提交 2023-12-06 11:19:40 +08:00
孙萌 04be0ddef6 1 2023-12-06 11:11:01 +08:00
xiaomeng 6e70047bb5 Merge pull request 'pc-master' (#63) from pc-master into portal
Reviewed-on: #63
2023-12-05 10:01:21 +00:00
孙萌 efdaa5ec80 1 2023-12-05 18:00:10 +08:00
孙萌 463cc3b16f Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-12-05 11:44:26 +08:00
孙萌 542d2b79d4 1 2023-12-05 11:44:18 +08:00
pangdundun 416dba2437 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-12-05 10:40:04 +08:00
pangdundun 9486053800 新增东北大屏和大图 2023-12-05 10:39:57 +08:00
孙萌 5edfe5088c 1 2023-12-04 14:48:53 +08:00