Commit Graph

225 Commits

Author SHA1 Message Date
glj c08ddeb816 glj-代码提交 2023-05-06 14:50:35 +08:00
qqGroup0 6c12bfc9ab zqq:callforhelp优化2 2023-05-05 21:41:36 +08:00
glj e89f3eb1b6 glj-冲突解决 2023-05-05 16:34:21 +08:00
glj 86003276d5 glj-代码提交 2023-05-05 16:08:58 +08:00
qqGroup0 abd46b930d zqq:call-for-help优化 2023-05-05 16:08:55 +08:00
glj 129b6cd5ac glj-代码提交 2023-05-05 09:28:06 +08:00
qqGroup0 1e1b223a6a Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-04 17:25:58 +08:00
glj c81befc92e glj-代码提交 2023-05-04 15:23:00 +08:00
glj 209340dbeb glj-代码提交 2023-05-04 09:32:34 +08:00
qqGroup0 186519cc7b zqq:更改图标 2023-04-27 15:05:44 +08:00
李宇辰 6771a91e40 添加查询状态-liyuchen 2023-04-27 14:46:07 +08:00
qqGroup0 12f4636320 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-27 14:13:00 +08:00
glj 90637718d5 glj-代码提交 2023-04-27 13:51:47 +08:00
glj 2e0c541270 glj-代码提交 2023-04-26 19:00:29 +08:00
glj 448be3757c glj-代码提交 2023-04-26 18:31:19 +08:00
glj d83825035b Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-26 16:33:08 +08:00
glj ca1211e85c glj-代码提交 2023-04-26 16:32:56 +08:00
李宇辰 b8dea4de18 Merge remote-tracking branch 'origin/main' into main 2023-04-26 16:14:10 +08:00
李宇辰 a5090d4c52 表格组件加入默认插槽-liyuchen 2023-04-26 16:13:53 +08:00
glj 9f3f6190f9 冲突解决-glj 2023-04-26 16:10:05 +08:00
glj 7157576afc glj-代码提交 2023-04-26 16:06:05 +08:00
qqGroup0 31ded8c1c0 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-26 16:03:53 +08:00
qqGroup0 1f5aeb58ca 完成爬虫调用联调,完成爬虫UI优化。 2023-04-26 16:03:24 +08:00
yyhouc 500e91cdc6 修改样式 2023-04-26 15:29:32 +08:00
yyhouc f9e7e64815 修复分页样式 2023-04-26 15:14:44 +08:00
yyhouc 5c875bcbc6 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-26 14:36:27 +08:00
yyhouc 8c733b9f62 全局英文设置,大部分样式修改 2023-04-26 14:35:42 +08:00
glj 355cd9d3aa glj-代码提交 2023-04-26 14:34:20 +08:00
glj 44bbe4036f glj-代码提交 2023-04-26 14:19:41 +08:00
glj f54b4108b2 冲突解决-glj 2023-04-26 11:41:14 +08:00
glj 0c7d010c53 glj-代码提交 2023-04-26 11:40:07 +08:00
why f6e4452c80 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-26 10:47:58 +08:00
why 9a9ed7fb6b 改颜色 2023-04-26 10:47:46 +08:00
yyhouc 37ab2316be Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	src/views/responseManagement/userResponse/index.vue
2023-04-26 10:46:45 +08:00
yyhouc cdc5784bb1 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	package-lock.json
#	src/utils/request.js
#	src/views/responseManagement/userResponse/index.vue
2023-04-26 10:20:00 +08:00
glj a2ab80af83 冲突解决-glj 2023-04-25 18:34:15 +08:00
glj 0d8bc1921a glj-代码提交 2023-04-25 18:30:08 +08:00
yyhouc 4611558cff 修改 2023-04-25 17:29:46 +08:00
刘旋 ef898bb74b Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-25 17:21:24 +08:00
刘旋 f30a3ff7dc bug修复 2023-04-25 17:21:21 +08:00
李宇辰 d7d8897fb8 Merge remote-tracking branch 'origin/main' into main 2023-04-25 16:15:31 +08:00
李宇辰 06be21e909 提交表格组件-liyuchen 2023-04-25 16:15:15 +08:00
glj b370c7cc01 glj-代码提交 2023-04-25 15:31:37 +08:00
glj 9990dbe154 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-25 11:11:40 +08:00
glj df9f19e6ab glj-代码提交 2023-04-25 10:58:09 +08:00
qqGroup0 c587d3218a zqq:遥感影像页绘制矩形 2023-04-25 10:14:11 +08:00
why 5f025a2c8e Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	src/api/disasterInfo/index.js
2023-04-24 18:49:18 +08:00
why a11a10b1d3 控制台 2023-04-24 18:46:06 +08:00
刘旋 97f9ceec69 翻译 2023-04-24 17:30:35 +08:00
刘旋 ba83f4e478 还原 2023-04-24 17:29:34 +08:00