Commit Graph

268 Commits

Author SHA1 Message Date
管李杰 40581c81d9 glj-代码提交 2024-07-09 18:15:33 +08:00
管李杰 89ca75b0be glj-代码提交 2024-07-09 11:47:18 +08:00
管李杰 5059788282 glj-代码提交 2024-05-30 09:10:55 +08:00
管李杰 d1b0be8913 glj-代码提交 2024-05-27 10:24:36 +08:00
管李杰 5890672f90 glj-代码提交 2024-03-19 16:07:04 +08:00
管李杰 e345ecd257 glj-代码提交 2024-03-17 17:59:31 +08:00
glj ba65cb9501 glj-代码提交 2024-01-19 10:01:38 +08:00
glj a2f8e81735 glj-代码提交 2023-12-26 15:35:47 +08:00
glj 7f505ecaa6 glj-代码提交 2023-12-16 21:01:17 +08:00
glj 2b8e2cf703 Merge branch 'main' of http://192.168.31.17:3000/VoRDM/vordm-admin 2023-11-17 17:18:05 +08:00
glj 40569ec5f0 glj-代码提交 2023-11-17 17:17:57 +08:00
why 02819dbfa2 字典项 2023-11-16 17:19:42 +08:00
glj 2065fb080d glj-代码提交 2023-11-14 14:07:00 +08:00
yyhouc 448143b1e1 submit 2023-09-13 17:36:42 +08:00
glj fac1297d73 glj-代码提交 2023-09-05 11:25:44 +08:00
glj 8ddaad2138 glj-代码提交 2023-07-10 16:44:30 +08:00
yyhouc 3fa1b7c991 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	src/layout/navBars/breadcrumb/user.vue
2023-07-10 11:04:17 +08:00
yyhouc 15e9f25ff7 添加修改密码 2023-07-10 11:02:26 +08:00
glj 2d92ca1eca glj-代码提交 2023-07-10 10:53:13 +08:00
glj ce8f57b50d Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-07-08 13:49:52 +08:00
glj 5ac1356488 glj-代码提交 2023-07-08 13:49:40 +08:00
yyhouc 4d63084f45 提交功能 2023-07-07 18:40:12 +08:00
yyhouc 5de7ce79ae Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin
# Conflicts:
#	src/views/dataService/remoteSensingData/components/searchCondition.vue
2023-06-26 09:52:46 +08:00
yyhouc 612335508b 提交代码 2023-06-26 09:46:12 +08:00
qqGroup0 9156a52d3f zqq:地图操作 2023-06-15 18:25:46 +08:00
qqGroup0 41435dee63 zqq:地图操作 2023-06-15 18:24:41 +08:00
qqGroup0 55d5508d27 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-06-15 10:46:05 +08:00
yyhouc 4c0daee6c6 提交vordm暂时屏蔽欧比特等1个卫星 2023-06-12 18:02:42 +08:00
yyhouc 608475eabe Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-06-12 15:04:45 +08:00
yyhouc 22a3e03122 修改分页问题 2023-06-12 15:04:26 +08:00
qqGroup0 61f7bc62b4 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-06-10 14:27:17 +08:00
glj c67287b910 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-06-09 17:58:57 +08:00
glj b524370bc6 glj-代码提交 2023-06-09 17:58:49 +08:00
yyhouc 3670a2bdcf 删除页面内部国际化,删除超时设置为null 2023-06-09 17:55:45 +08:00
yyhouc 50e43936b3 1.时间不会被清除 2.现在爬虫启动完成后会提示 xxx爬虫启动,是否返回列表页面 2023-06-09 17:19:56 +08:00
yyhouc 923d4ea2ab 1.area 选择的时候只有sentinel与landsat 否则选择其余的,2在切换成多边点位的时候依然显示坐标点 2023-06-09 17:04:40 +08:00
qqGroup0 1b9d9a5197 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq 2023-06-06 14:51:53 +08:00
yyhouc 6b0bf3ef80 修改地图选择 2023-06-05 10:29:12 +08:00
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