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
Bob b8de5bd19e Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-06-11 15:39:33 +08:00
slaughter 7f1e6fd8c9 `#修改了header,headernew,index1页面, 2020-06-11 15:37:11 +08:00
Bob fc1ca1b041 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/data/SampletreesAdd.vue
 2020-06-11 15:35:00 +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
slaughter 4284670c3b `#修改了无人机照片,现场照片.附件页面, 2020-05-28 17:58:29 +08:00
Bob 6d81c2e3cd Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-28 16:54:08 +08:00
Bob 8cdcda78b7 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/index/Index.vue
 2020-05-28 16:53:05 +08:00
slaughter 35bdefe58b `#修改了乔木草木灌木,调查点页面, 2020-05-28 16:53:00 +08:00
Bob eb3e38a371 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-28 08:52:15 +08:00
Bob acae8392f5 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/index/Index.vue
 2020-05-28 08:51:50 +08:00
slaughter d5f709fdfb `#修改了页面, 2020-05-27 18:22:40 +08:00
slaughter b3650f937f `#修改了乔木,灌木,草木页面,修改了面包屑,添加了display灌木,草木页面, 2020-05-27 17:45:31 +08:00
Bob 7ae701de4a Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-27 09:19:27 +08:00
slaughter 2aad6cef48 `#修改了乔木,乔木修改,乔木revel,优势灌木,珍稀濒危,经济植物,植物影像页面, 2020-05-27 09:18:56 +08:00
Bob 02565446bb Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/index/Index.vue
 2020-05-27 09:18:52 +08:00
slaughter a90dc477f5 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-26 16:26:32 +08:00
slaughter b55f17346d `#修改了乔木,乔木修改,乔木revel,优势灌木,珍稀濒危,经济植物,植物影像页面, 2020-05-26 16:25:59 +08:00
Bob 836baecc30 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/index/Index.vue
 2020-05-26 16:24:03 +08:00
slaughter 19b28594d3 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-26 09:37:44 +08:00
Bob 47ec525c39 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 
# Conflicts:
#	src/views/index/Index.vue
 2020-05-26 09:37:18 +08:00
slaughter af9ab1838b Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend 2020-05-26 09:36:10 +08:00
slaughter 6f85a4e388 `#修改了乔木添加页面, 2020-05-26 09:35:45 +08:00