yaowang
/
vordm-admin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
192 Commits 1 Branch 0 Tags 5.8 MiB
Commit Graph

192 Commits

Author SHA1 Message Date
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
刘旋 454a10534c Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-24 15:46:24 +08:00
刘旋 1e71ff9577 删除语言切换 2023-04-24 15:46:21 +08:00
glj 72e001b0b1 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-24 15:37:08 +08:00
glj d7d0092fcf 代码提交-glj 2023-04-24 15:36:58 +08:00
刘旋 c9743536fa Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-24 15:20:20 +08:00
刘旋 dbcc24580d 翻译 2023-04-24 15:19:20 +08:00
glj ec7a294540 代码提交-glj 2023-04-24 15:10:53 +08:00
glj 98e358af97 代码提交 2023-04-24 11:26:28 +08:00
glj 03b19879c3 代码提交-glj 2023-04-24 11:16:59 +08:00
glj 624fa36db7 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-24 09:28:04 +08:00
glj ea97ed4f29 代码提交-glj 2023-04-24 09:19:38 +08:00
刘旋 f99d0ce5f4 翻译 2023-04-23 20:54:54 +08:00
刘旋 c35e8635d6 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-23 20:39:42 +08:00
刘旋 c492cdd552 翻译 2023-04-23 20:39:40 +08:00
qqGroup0 40502ca822 zqq:遥感影像合并冲突 2023-04-23 19:54:02 +08:00
刘旋 8e47d830bf Merge branch 'zqq' into main 2023-04-23 19:28:34 +08:00
qqGroup0 f86dcaa494 Merge branch 'zqq' 2023-04-23 19:04:35 +08:00
刘旋 899b187082 . 2023-04-23 17:55:12 +08:00
刘旋 e183745ca3 翻译 2023-04-23 17:53:27 +08:00
刘旋 73493ba319 Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-23 17:36:58 +08:00
刘旋 cf31fe552c 翻译 2023-04-23 17:35:28 +08:00
yyhouc dc2dda607f Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-23 17:17:45 +08:00
yyhouc 5b1b8b3f89 修改样式 2023-04-23 17:17:36 +08:00
qqGroup0 4c817a82ce Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-23 17:10:53 +08:00
刘旋 71db5daf80 . 2023-04-23 16:54:46 +08:00
刘旋 d31ca1d967 编辑 2023-04-23 16:53:40 +08:00
刘旋 a48d1ae1b1 . 2023-04-23 16:46:41 +08:00
刘旋 3730a1c981 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into main 2023-04-23 16:45:51 +08:00
刘旋 50a8460afb . 2023-04-23 16:45:33 +08:00
qqGroup0 ce15e1a8c3 Merge branch 'zqq' 2023-04-23 16:45:12 +08:00
qqGroup0 3d68dcfe9c zqq:遥感爬虫接口（待补充） 2023-04-23 16:42:10 +08:00
glj ac02974a87 代码提交，分页转右侧 2023-04-23 16:00:18 +08:00
qqGroup0 69995d027d Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-04-23 10:32:46 +08:00