Commit Graph

40 Commits

Author SHA1 Message Date
slaughter 42c34e7964 `#修改了乔木灌木草本图例与gis, 2020-07-09 08:59:22 +08:00
slaughter 926d35dab8 `#修改了乔木主页页面, 2020-07-08 17:44:11 +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 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 94cebbe19d `#修改了详细信息页面, 2020-06-28 20:39:24 +08:00
slaughter 66253edb17 `#修改了主页点进去的页面及限制高度, 2020-06-28 19:38:34 +08:00
slaughter 61873dc5ee `#修改了乔木,主页,footer响应式, 2020-06-26 21:46:55 +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 2f0a4a9a61 `#修改了导航栏, 2020-06-22 19:38:34 +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 cf305cb68e `#修改了灌木草本index1调查点等页面,添加了footer, 2020-06-21 14:56:19 +08:00
slaughter 32a339fbe4 `#修改了乔木灌木调查点页面, 2020-06-20 17:04:10 +08:00
slaughter a8405c88c6 `#修改了调查点,乔木灌木草本页面,添加了index1.vue, 2020-06-08 17:05:39 +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
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
slaughter 30256aad91 `#修改了和乔木,灌木,草本田间与修改页面的上传图片, 2020-06-01 18:52:58 +08:00
slaughter 684fbb9357 `#修改了确定删除和乔木,灌木,草本单位, 2020-05-29 15:30:08 +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
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
Bob 12b0da93cd Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/router/index.js
#	src/views/data/SampletreesAdd.vue
2020-05-21 10:14:45 +08:00
slaughter 16a0b2e7df #修改了乔木、灌木、草本添加和修改页面 2020-05-19 18:05:44 +08:00
slaughter f268f30fac #修改了SampletreesDisplayed1页面 2020-05-12 16:10:38 +08:00
slaughter 3a86179349 #修改了SampletreesAdd页面 2020-05-08 15:40:56 +08:00
Bob 82edb37b77 Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
#	src/router/index.js
#	src/views/data/SampletreesAdd.vue
2020-05-08 08:51:21 +08:00
slaughter c43891d523 #修改了SampletreesAdd页面 2020-05-07 10:31:17 +08:00
Bob f4471365ef #功能开发 2020-05-01 20:51:45 +08:00
Bob 62292b5361 #功能开发 2020-04-29 16:38:36 +08:00
Bob 745bd142df #功能开发 2020-04-29 16:37:25 +08:00
slaughter bccb04d94d #修改了SanpletreesUpdateForm,samplebushupdateform,sampleherbalupdateform页面 2020-04-27 14:56:44 +08:00
Bob 734beab66f #功能开发 2020-04-26 18:36:36 +08:00
slaughter 7191016051 #修改了FindingsUpdate.vue BarcodesAdd.vue ImvestigatorsUpdate.vue,InvestugatorsAdd.vue 2020-04-26 15:24:54 +08:00
Bob 36a7e3d601 #功能开发 2020-04-26 11:17:12 +08:00
slaughter b791eb5cc8 #修改了SampletreesAdd.vue 2020-04-21 17:59:39 +08:00
Bob f297871163 #功能开发 2020-04-17 10:05:42 +08:00
Bob 7eae1cebd5 #功能开发 2020-04-14 08:48:10 +08:00
Bob 1b0a07a90a #功能开发 2020-04-14 08:47:14 +08:00