Commit Graph

170 Commits

Author SHA1 Message Date
slaughter e2fc7947bf `#修改了乔木灌木草本调查点页面, 2020-06-21 16:57:59 +08:00
slaughter 34d6ae08d0 `#修改了项目数据页面, 2020-06-21 16:31:40 +08:00
slaughter 8529680ba1 `#修改了标题的页面, 2020-06-21 16:17:52 +08:00
slaughter 8fbf41be9d `#添加了displayed的页面, 2020-06-21 15:46:40 +08:00
slaughter f5a954f222 `#添加了displayed的页面, 2020-06-21 15:32:20 +08:00
slaughter cf305cb68e `#修改了灌木草本index1调查点等页面,添加了footer, 2020-06-21 14:56:19 +08:00
slaughter c4febc1408 `#修改了灌木草本index1调查点页面, 2020-06-20 20:27:36 +08:00
slaughter 34e2bccc6f `#修改了灌木草本index1调查点页面, 2020-06-20 19:48:52 +08:00
slaughter b173f814b2 `#修改了乔木灌木调查点页面, 2020-06-20 19:02:26 +08:00
slaughter 32a339fbe4 `#修改了乔木灌木调查点页面, 2020-06-20 17:04:10 +08:00
slaughter cf726ec4d1 `#修改了乔木页面, 2020-06-20 09:41:11 +08:00
slaughter 7061ee159c `#修改了乔木页面, 2020-06-19 15:16:14 +08:00
slaughter 39bbec718b `#修改了乔木页面, 2020-06-19 15:13:06 +08:00
slaughter 5139024d5b `#修改了所有页面的nav样式, 2020-06-19 11:50:44 +08:00
slaughter 0b0e4a0255 `#修改了首页点击页面页面, 2020-06-19 10:20:22 +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
slaughter 35bc264f73 `#修改了headernew页面, 2020-06-11 15:58:06 +08:00
slaughter 7f1e6fd8c9 `#修改了header,headernew,index1页面, 2020-06-11 15:37:11 +08:00
slaughter 9f04d0eea2 `#修改了主页,添加了headernew页面, 2020-06-10 18:18:49 +08:00
slaughter 58be406337 `#修改了调查点,草本,土壤页面, 2020-06-09 15:15:53 +08:00
slaughter c8d1140fab `#修改了调查点,草本页面, 2020-06-08 18:09:49 +08:00
slaughter a8405c88c6 `#修改了调查点,乔木灌木草本页面,添加了index1.vue, 2020-06-08 17:05:39 +08:00
slaughter 9c8bba6ed0 `#修改了DNA草本页面, 2020-06-05 17:58:18 +08:00
slaughter a251c1de1d Merge remote-tracking branch 'origin/master' 2020-06-04 18:23:50 +08:00
slaughter 0d5660e852 `#修改了6-14条页面, 2020-06-04 18:23:26 +08:00
Bob bde06572f8 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-04 11:58:02 +08:00
Bob 9eee11482b Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-04 10:54:58 +08:00
slaughter 9978b762b3 `#修改了investigatorsliat以及乔木灌木添加页面, 2020-06-04 10:13:57 +08:00
Bob b33073203e Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-04 09:08:57 +08:00
slaughter 5185e3cc0b `#修改了数据录入调查点模块, 2020-06-02 14:56:41 +08:00
Bob f192b34ef6 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-02 10:57:39 +08:00
Bob 7848b18f0d Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-02 10:51:24 +08:00
slaughter d13047333f `#修改了dna模块, 2020-06-02 10:48:07 +08:00
Bob 545939e08d Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-02 09:57:10 +08:00
slaughter 7032025dbc `#修改了首页模块, 2020-06-02 09:56:50 +08:00
Bob 2981afd068 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-02 09:43:46 +08:00
Bob 992087cce1 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-02 09:43:36 +08:00
slaughter 61cac8fb22 `#修改了数据录入模块, 2020-06-02 09:38:33 +08:00
slaughter 30256aad91 `#修改了和乔木,灌木,草本田间与修改页面的上传图片, 2020-06-01 18:52:58 +08:00
Bob 8a165f783b Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/data/SampletreesAdd.vue
2020-06-01 14:43:47 +08:00
Bob afd8e56074 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/index/Index.vue
2020-06-01 11:56:05 +08:00
slaughter 617a0ad85d `#修改了和乔木,灌木,草本修改页面的单位, 2020-06-01 11:54:14 +08:00
slaughter 684fbb9357 `#修改了确定删除和乔木,灌木,草本单位, 2020-05-29 15:30:08 +08:00
slaughter 6c66a4c3cd `#修改了header,header1页面, 2020-05-29 10:20:57 +08:00
slaughter 045917648e `#修改了index,珍稀植物,经济植物.优势灌木,植物影像页面, 2020-05-29 09:50:16 +08:00
Bob 0eb5058dd4 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-29 08:48:27 +08:00
Bob 36fdbb03d0 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/views/index/Index.vue
2020-05-29 08:45:51 +08:00