Commit Graph

242 Commits

Author SHA1 Message Date
glj 1a82c09598 代码提交 2023-04-21 19:36:51 +08:00
glj fd2f43e882 代码提交 - 冲突解决 2023-04-21 18:29:50 +08:00
glj e5c1cb4781 代码提交 2023-04-21 18:25:35 +08:00
glj 60cec328df 代码提交-glj 2023-04-21 18:24:53 +08:00
yyhouc 931312d1da Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	src/utils/request.js
2023-04-21 18:12:43 +08:00
yyhouc 89e58d173c 完成爬虫调用联调,完成爬虫UI优化。 2023-04-21 18:11:21 +08:00
刘旋 12397d3556 flyTo 2023-04-21 15:32:45 +08:00
刘旋 e05ae8c05d 合并分支 2023-04-21 10:52:39 +08:00
刘旋 e723d17969 清除图层 2023-04-21 10:51:12 +08:00
刘旋 1d132e13bf nexttick=>settimeout 2023-04-21 10:02:40 +08:00
刘旋 ad649a1252 异步加载 2023-04-20 17:15:43 +08:00
刘旋 ddd10699eb . 2023-04-20 16:57:19 +08:00
刘旋 83fbd59ade Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-20 16:56:48 +08:00
刘旋 0f7539c39b npm install Leaflet-Geoman 2023-04-20 16:56:43 +08:00
glj c634b89aa0 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-20 14:39:48 +08:00
glj 3e1c449cc2 glj-代码提交 2023-04-20 14:39:35 +08:00
刘旋 c857578174 npm install Leaflet-Geoman 2023-04-20 10:58:37 +08:00
刘旋 90f976c368 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-20 10:46:21 +08:00
yyhouc be9637e1b1 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-19 20:53:44 +08:00
yyhouc e2890a2c8a 完成 tool 修改 完成contact 修改 完成数据审核分配chief 2023-04-19 20:51:32 +08:00
qqGroup0 b531d3ab95 Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-18 22:30:39 +08:00
qqGroup0 ea9ed374c4 zqq: 遥感影像数据下载检索条件 2023-04-18 22:28:07 +08:00
李宇辰 933ed73ed7 修改清空表格选项-liyuchen 2023-04-17 18:11:08 +08:00
李宇辰 7ef200e879 提交管理员管理灾害代码-liyuchen 2023-04-17 17:17:32 +08:00
qqGroup0 cd9cf8ec3f zqq:遥感影像数据下载 2023-04-17 16:31:47 +08:00
李宇辰 7baef94d3c 修改图片列表和普通管理员列表数据-liyuchen 2023-04-17 13:46:30 +08:00
yyhouc 16badc8908 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-17 09:08:05 +08:00
yyhouc ed94dcf10b 提交Data数据审核 2023-04-17 09:07:52 +08:00
李宇辰 efbd270626 提交首页统计代码-liyuchen 2023-04-15 17:08:54 +08:00
李宇辰 b897b3bc61 修改前端表格的列宽-liyuchen 2023-04-14 18:56:49 +08:00
李宇辰 d51b8566bf Merge remote-tracking branch 'origin/main' into main 2023-04-14 18:32:01 +08:00
李宇辰 ea416a68fc 修改前端分页i18n配置以及添加chief管理员的修改功能-liyuchen 2023-04-14 18:31:30 +08:00
yyhouc 50e319c45c Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-14 18:06:28 +08:00
yyhouc c5ca09b961 完成contact、tools部分修改。 2023-04-14 18:06:15 +08:00
李宇辰 47701783c3 Merge remote-tracking branch 'origin/main' into main 2023-04-14 17:00:10 +08:00
李宇辰 bee2007343 添加批量删除和批量审核功能-liyuchen 2023-04-14 16:59:55 +08:00
刘旋 36563a4679 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-14 14:47:13 +08:00
刘旋 16a70ab7d8 注释 2023-04-14 14:47:10 +08:00
李宇辰 aae226cb7c 修改请求前缀-liyuchen 2023-04-14 09:23:21 +08:00
yyhouc 22fefc3e35 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-14 09:18:03 +08:00
yyhouc a331b2b87e 完成tool 2023-04-14 09:17:51 +08:00
李宇辰 0c4867e91d 提交图片、其他数据、词云的功能-liyuchen 2023-04-13 19:45:57 +08:00
李宇辰 5ab2446cb4 提交图片、其他数据、词云的功能-liyuchen 2023-04-13 19:32:15 +08:00
刘旋 2e76e056f4 样式添加 2023-04-13 17:04:59 +08:00
yyhouc 6a09af20c4 添加tool contact基础列表。完成callforhelp审核页面 2023-04-13 14:03:05 +08:00
yyhouc db34dd3980 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-12 17:10:10 +08:00
yyhouc c8c3e40c54 暂存修改审核加入地图与其他信息修改 2023-04-12 17:09:51 +08:00
qqGroup0 196a3e9713 zqq:地图封装 2023-04-12 17:08:04 +08:00
qqGroup0 cfc4506cda Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-12 11:25:35 +08:00
yyhouc 7ea4fa8598 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-12 10:16:02 +08:00