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

265 Commits

Author SHA1 Message Date
qqGroup0 de4185d394 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-06-02 09:25:25 +08:00
yyhouc 1ce8f01fa0 修改换行问题 2023-06-01 18:22:18 +08:00
yyhouc 0154a21f7d 修复登录问题，修复Generate词云生成 修复热点区域生成 2023-05-29 17:50:15 +08:00
yyhouc 1d1189f6bc Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-26 10:07:57 +08:00
yyhouc 8886fb13ae 删除所有文件的日志输出 2023-05-26 10:07:44 +08:00
glj 43f4b2f043 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-25 18:08:55 +08:00
glj d05b2a8e7e glj-代码提交 2023-05-25 18:08:46 +08:00
yyhouc ce598472b3 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 
# Conflicts:
#	src/api/remoteSensingSourceData/remoteSensingSourceData.js
#	src/views/dataService/remoteSensingData/components/retrievalCondition.vue
 2023-05-24 18:48:48 +08:00
yyhouc 7d10269a9a 提交修改 2023-05-24 18:41:30 +08:00
glj a8f1a3986f glj-代码提交 2023-05-24 18:19:11 +08:00
glj fdcf70cf38 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-23 18:08:38 +08:00
glj 83dc8464b6 glj-代码提交 2023-05-23 18:08:20 +08:00
yyhouc 35e785705e 修改爬虫状态回显问题 2023-05-23 17:49:58 +08:00
yyhouc b45651c803 修改字典bug 2023-05-23 17:24:18 +08:00
yyhouc 9bd0352569 提交爬虫显示修改 2023-05-23 16:16:41 +08:00
glj 49e8684b92 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-23 10:59:57 +08:00
glj b78a04c808 glj-代码提交 2023-05-23 10:59:49 +08:00
yyhouc dbdacb1afe 修改request 2023-05-23 10:17:59 +08:00
yyhouc c365bd38a9 修复爬虫参数不正确的问题。 2023-05-23 10:12:21 +08:00
yyhouc 740bead9e4 更新爬虫URL 更新爬虫参数列表 2023-05-23 10:10:10 +08:00
glj 5d40254b00 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-23 09:30:32 +08:00
glj 6fafbecfee glj-代码提交 2023-05-23 09:28:18 +08:00
yyhouc 76d3f26717 修复爬虫调用422错误 2023-05-22 18:14:50 +08:00
qqGroup0 f1688ee882 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-22 16:28:58 +08:00
yyhouc b89eca1fe6 submit 2023-05-22 10:20:35 +08:00
yyhouc 550fbb6659 提交API参数错误 2023-05-22 09:46:24 +08:00
yyhouc 9ddd36d935 修改API1 2023-05-22 09:30:52 +08:00
glj b0911036df Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-05-22 09:13:06 +08:00
glj e7fc73ff1f glj-代码提交 2023-05-22 09:12:53 +08:00
yyhouc 1b27bfdcd5 提交 2023-05-20 18:22:50 +08:00
yyhouc 39c3fb6446 修复审批定位，添加分配发送邮件，添加图层搜索 2023-05-19 10:14:52 +08:00
qqGroup0 cffa66d612 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-18 14:51:18 +08:00
yyhouc 592076ba70 修复卫星名称显示问题 2023-05-17 17:28:54 +08:00
qqGroup0 4f37f7ba42 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-16 21:04:52 +08:00
qqGroup0 4d68e01bda zqq:call-for-help小改 2023-05-16 20:59:32 +08:00
yyhouc 171a9e4ea1 上传优化 otherdata pub后刷新列表 2023-05-16 17:50:13 +08:00
yyhouc 1760f036af 提交upload 修改标题 2023-05-15 13:45:14 +08:00
yyhouc 0078d742e3 修复Otherdata 表头换行问题 2023-05-15 11:50:53 +08:00
yyhouc 47b8a4658a 修复控制台页面 显示不完整 2023-05-15 11:48:39 +08:00
yyhouc abcaaf5a3d 修改页面中的英文 2023-05-15 11:39:16 +08:00
glj 53ce25b4d6 glj-代码提交 2023-05-13 18:04:42 +08:00
glj 707bbb3f0b glj-代码提交 2023-05-12 09:12:14 +08:00
glj a045db3263 glj-代码提交 2023-05-11 09:54:05 +08:00
glj a2d1305482 glj-代码提交 2023-05-08 19:32:29 +08:00
glj 469e2b1e58 glj-代码提交 2023-05-08 18:30:42 +08:00
glj 87789a672b glj-代码提交 2023-05-08 13:50:52 +08:00
glj d5181a32e4 Merge branch 'zqq' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-08 09:12:06 +08:00
glj 105feccee5 glj-代码提交 2023-05-08 09:09:20 +08:00
qqGroup0 467117ffc3 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-05-06 21:56:43 +08:00
qqGroup0 563293b90a zqq:call-for-help添加校验 2023-05-06 21:56:25 +08:00
glj 4f7fea6259 Merge branch 'zqq' 2023-05-06 15:18:37 +08:00
glj 6b80bfcaab glj-代码提交 2023-05-06 15:17:47 +08:00
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
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
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
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
刘旋 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