xieshen
/
des
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
274 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

274 Commits

Author SHA1 Message Date
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
Bob dbf089f718 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-22 16:10:33 +08:00
slaughter 701d970dc2 `#修改了返回按钮, 2020-06-22 16:10:09 +08:00
Bob c3dd39b6a2 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-22 16:10:06 +08:00
Bob 9601238053 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-22 15:35:22 +08:00
Bob 513c3dfea8 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-22 15:35:07 +08:00
slaughter 4e471208c4 `#修改了注册，调查点，乔木灌木草本页面, 2020-06-22 15:34:38 +08:00
Bob 1b0c66f514 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-22 11:15:50 +08:00
slaughter ec0894ac34 `#修改了headerold new页面, 2020-06-22 11:15:26 +08:00
Bob 3854c1aa06 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-22 11:15:16 +08:00
slaughter e2fc7947bf `#修改了乔木灌木草本调查点页面, 2020-06-21 16:57:59 +08:00
Bob b509d007cc Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-21 16:32:02 +08:00
slaughter 34d6ae08d0 `#修改了项目数据页面, 2020-06-21 16:31:40 +08:00
Bob 6ba4631fed Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-21 16:18:46 +08:00
slaughter 8529680ba1 `#修改了标题的页面, 2020-06-21 16:17:52 +08:00
Bob e04168d83f Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-21 15:47:00 +08:00
slaughter 8fbf41be9d `#添加了displayed的页面, 2020-06-21 15:46:40 +08:00
Bob f20d700eb1 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-21 15:33:59 +08:00
Bob c73f3a52b6 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-21 15:33:46 +08:00
slaughter f5a954f222 `#添加了displayed的页面, 2020-06-21 15:32:20 +08:00
Bob 1d3933687e Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-21 14:56:51 +08:00
slaughter cf305cb68e `#修改了灌木草本index1调查点等页面，添加了footer, 2020-06-21 14:56:19 +08:00
Bob 89a069484a Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-20 20:28:12 +08:00
slaughter c4febc1408 `#修改了灌木草本index1调查点页面, 2020-06-20 20:27:36 +08:00
Bob d4d3ee7a6c Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-20 19:49:16 +08:00