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

202 Commits

Author SHA1 Message Date
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
slaughter 34e2bccc6f `#修改了灌木草本index1调查点页面, 2020-06-20 19:48:52 +08:00
Bob a9e768b54f Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-20 19:03:05 +08:00
slaughter b173f814b2 `#修改了乔木灌木调查点页面, 2020-06-20 19:02:26 +08:00
Bob fe45b6a7bd Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-20 17:07:42 +08:00
Bob 7d06811647 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-20 17:07:32 +08:00
slaughter 32a339fbe4 `#修改了乔木灌木调查点页面, 2020-06-20 17:04:10 +08:00
Bob de3ee8fa67 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-20 09:45:32 +08:00
slaughter cf726ec4d1 `#修改了乔木页面, 2020-06-20 09:41:11 +08:00
Bob 6925cedd44 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-19 15:16:43 +08:00
slaughter 7061ee159c `#修改了乔木页面, 2020-06-19 15:16:14 +08:00
Bob 74162a9507 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-19 15:15:39 +08:00
slaughter 39bbec718b `#修改了乔木页面, 2020-06-19 15:13:06 +08:00
slaughter 5139024d5b `#修改了所有页面的nav样式, 2020-06-19 11:50:44 +08:00
Bob 89f51105ab Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-19 10:20:52 +08:00
slaughter 0b0e4a0255 `#修改了首页点击页面页面, 2020-06-19 10:20:22 +08:00
Bob fcb4872284 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-19 08:59:05 +08:00
slaughter 9bf72afa22 `#修改了乔木灌木草本和调查点页面, 2020-06-18 19:01:25 +08:00
slaughter f098913ad1 `#修改了乔木灌木草本和土壤页面, 2020-06-16 18:12:18 +08:00
slaughter bd8e618f2c `#修改了header,headernew,index1页面,修改乔木及修改字段, 2020-06-12 18:31:43 +08:00
slaughter 865c96cb81 `#修改了headernew,灌木，草本。土壤页面, 2020-06-11 19:02:01 +08:00
Bob 83f8ae4c8e Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-11 15:59:14 +08:00
slaughter 35bc264f73 `#修改了headernew页面, 2020-06-11 15:58:06 +08:00