Commit Graph

248 Commits

Author SHA1 Message Date
yang 6dc47699f2 #修改了乔木灌木草本展示页面# 2020-07-09 15:51:38 +08:00
yang 5c4411cf77 #修改了乔木灌木草本展示页面,主页,headenew,headerold# 2020-07-09 15:45:05 +08:00
slaughter 42c34e7964 `#修改了乔木灌木草本图例与gis, 2020-07-09 08:59:22 +08:00
slaughter a7559bb0f2 `#修改了乔木gis, 2020-07-08 18:09:35 +08:00
slaughter 926d35dab8 `#修改了乔木主页页面, 2020-07-08 17:44:11 +08:00
slaughter e54f854e28 `#修改了乔木页面, 2020-07-08 11:49:33 +08:00
slaughter 5fc7647e3d `#修改了详细信息页面, 2020-07-08 11:12:45 +08:00
slaughter 006b7250a9 `#修改了页面宽度, 2020-07-08 09:13:43 +08:00
slaughter 8cca5627b0 `#修改了乔木添加,乔木详情页, 2020-07-07 18:05:27 +08:00
slaughter 225d5c54e0 `#修改了页面样式及上传图片功能, 2020-07-06 20:05:37 +08:00
slaughter 82ff5776b4 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-07-06 09:07:33 +08:00
slaughter 52fea1b820 `#修改了乔木详细信息页面, 2020-07-06 09:07:16 +08:00
yang 79aca3daf0 #修改了乔木页面# 2020-07-06 00:37:23 +08:00
slaughter 3dd01432f7 `#修改了乔木添加页面,7.4下午, 2020-07-04 19:13:57 +08:00
slaughter 5e5a7bb70b `#修改了主页页面, 2020-07-04 08:37:43 +08:00
slaughter 7ce136d355 `#修改了主页,footer页面, 2020-07-02 20:02:01 +08:00
Bob a19f123554 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-07-02 17:57:02 +08:00
Bob 6f430c5f1c Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-29 17:59:22 +08:00
Bob 4e4264c4ac Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-29 17:28:55 +08:00
Bob b65fbdd8e2 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-29 17:25:12 +08:00
Bob 1ad95f9c61 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-29 17:24:50 +08:00
slaughter 58ca79109b `#修改了乔木数据 主页 经济植物页面, 2020-06-29 17:12:34 +08:00
slaughter 0e49a19ccf `#修改了header,修改密码,添加了忘记密码页面, 2020-06-29 11:41:09 +08:00
Bob c27bca10dc Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-29 09:45:48 +08:00
slaughter be412c2eb7 `#修改了header, 2020-06-29 09:27:28 +08:00
slaughter aa4281890d Merge remote-tracking branch 'origin/master' 2020-06-28 20:39:32 +08:00
slaughter 94cebbe19d `#修改了详细信息页面, 2020-06-28 20:39:24 +08:00
Bob f8731c2546 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-28 20:03:20 +08:00
Bob 0e7fd452bc Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-28 19:56:47 +08:00
slaughter 794df7bde7 `#修改了跳转链接及vue跳转到顶部, 2020-06-28 19:52:06 +08:00
Bob 57c8f8afed Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-28 19:42:22 +08:00
Bob 4579249b1a Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-28 19:41:41 +08:00
slaughter 66253edb17 `#修改了主页点进去的页面及限制高度, 2020-06-28 19:38:34 +08:00
Bob 77841be1e0 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-28 10:55:22 +08:00
slaughter c1265f5fd3 `#修改了headerold,headernew, 2020-06-28 10:54:57 +08:00
Bob 5c68c0e317 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-28 10:54:22 +08:00
slaughter a7e5b932ce `#修改了首页,项目数据,乔木灌木草本, 2020-06-28 10:45:27 +08:00
slaughter be26c09d57 `#修改了响应式,详细信息页面,添加了链接, 2020-06-27 19:54:23 +08:00
slaughter 61873dc5ee `#修改了乔木,主页,footer响应式, 2020-06-26 21:46:55 +08:00
Bob e798bf369a Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-26 18:33:04 +08:00
Bob f2ae37516c Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-26 18:32:37 +08:00
slaughter 58e2f2a2ce `#修改了乔木灌木草本调查点数据页面响应式, 2020-06-26 18:28:44 +08:00
Bob 794000b1c8 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-25 14:33:17 +08:00
Bob fec502b11d Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-25 14:33:03 +08:00
slaughter d08accf67c `#修改了项目数据页面,主页响应式, 2020-06-25 14:30:13 +08:00
slaughter ef73fbe113 `#修改了登陆注册, 2020-06-23 11:53:41 +08:00
slaughter 6bb604bab6 `#修改了调查点, 2020-06-23 09:02:47 +08:00
slaughter 2f0a4a9a61 `#修改了导航栏, 2020-06-22 19:38:34 +08:00
slaughter e3a215a604 Merge remote-tracking branch 'origin/master' 2020-06-22 16:21:06 +08:00
slaughter 1d1134c04d `#修改了导航栏, 2020-06-22 16:20:58 +08:00