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
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
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
glj 1a82c09598 代码提交 2023-04-21 19:36:51 +08:00
glj fd2f43e882 代码提交 - 冲突解决 2023-04-21 18:29:50 +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
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
yyhouc 49204f6a06 修复显示问题 2023-04-12 10:14:27 +08:00
李宇辰 5c1c311084 修改查询-liyuchen 2023-04-12 10:08:51 +08:00
李宇辰 6d64d9996d Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	src/router/route.js
 2023-04-12 09:25:27 +08:00
李宇辰 23d5ec5f50 修改后台图标样式以及添加管理员审核功能-liyuchen 2023-04-12 09:23:29 +08:00
yyhouc 293a87ea5f 提交callfor 2023-04-12 09:06:14 +08:00
qqGroup0 057c650a68 zqq:moduleName 2023-04-11 22:35:19 +08:00
qqGroup0 40fd907fcd zqq:侧边栏调整 2023-04-11 22:34:38 +08:00
yyhouc 9a70fb21dd 提交字典 2023-04-11 15:52:50 +08:00
yyhouc 479388ff69 Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin 2023-04-11 10:05:51 +08:00
yyhouc 073a83dbc0 submit 2023-04-11 10:05:38 +08:00
qqGroup0 7a8d6919b9 zqq:代码提交 2023-04-11 09:42:44 +08:00
qqGroup0 7b895c0671 zqq:接口调整 2023-04-08 16:46:03 +08:00
qqGroup0 490aac5af2 zqq:添加侧边菜单栏 2023-04-07 11:07:27 +08:00
qqGroup0 91cc91ab33 zqq:0406合并 2023-04-06 20:00:34 +08:00
qqGroup0 21e0572f9a zqq:更改请求接口 2023-04-06 14:59:16 +08:00
qqGroup0 c73c93841f zqq:注释 2023-04-05 16:41:02 +08:00
qqGroup0 38ef4580b9 zqq:遥感影像数据请求接口 2023-04-05 16:30:59 +08:00
qqGroup0 82230f56dc zqq:遥感影像接口调试 2023-04-05 14:52:24 +08:00
qqGroup0 08a2c80743 zqq:0404版本 2023-04-04 13:57:33 +08:00
qqGroup0 e51960aa51 zqq:echart调整 2023-03-31 16:12:17 +08:00
刘霖泽 d3c06b6f01 llz:修改dashboard 2023-03-31 15:45:43 +08:00
刘旋 8cf81d82cf 位置更改 2023-03-31 14:41:20 +08:00