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 |
|
Bob
|
1411c56c2b
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/views/index/Index.vue
|
2020-05-26 09:27:47 +08:00 |
|
Bob
|
1b22dcb392
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-26 09:18:53 +08:00 |
|
slaughter
|
2efeeb5b68
|
`#修改了乔木、灌木、草本,index,findingsadd,index.js,findingsreveal,findingsupdate,乔木添加页面,添加了优势灌木分布、珍稀濒危植物分布、经济植物分布,植物影像数据`
|
2020-05-25 18:52:40 +08:00 |
|
Bob
|
826760d2fe
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-21 15:16:28 +08:00 |
|
Bob
|
f86c5591da
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-21 15:16:13 +08:00 |
|
slaughter
|
e7dab94e3f
|
#修改了乔木、灌木、草本添加和修改页面
|
2020-05-21 11:14:14 +08:00 |
|
slaughter
|
49250d2f51
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-21 10:20:04 +08:00 |
|
slaughter
|
3bf3392a9f
|
#修改了乔木、灌木、草本添加和修改页面
|
2020-05-21 10:19:44 +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
|
c917295d53
|
#修改了乔木、灌木、草本添加和修改页面，还有调查点修改和调查者修改页面
|
2020-05-18 18:26:06 +08:00 |
|
slaughter
|
1ea92d5774
|
#修改了SampletreesUpdateForm,SampletreesDisplayed1页面
|
2020-05-15 15:18:38 +08:00 |
|
slaughter
|
ea05c08ac7
|
#修改了SampletreesAdd,SamplebushAdd1,SampleherbalAdd1,SampletreesUpdateForm,SamplebushUpdateForm,SampleherbalUpdateForm页面
|
2020-05-13 16:05:49 +08:00 |
|
slaughter
|
fe5a9022a7
|
#修改了SampletreesAdd,SampletreesDisplayed1页面
|
2020-05-13 10:35:38 +08:00 |
|
slaughter
|
f24063d6d2
|
#修改了SampletreesAdd页面
|
2020-05-12 16:23:47 +08:00 |
|
slaughter
|
1ebc41928b
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 16:15:38 +08:00 |
|
Bob
|
c5eb081044
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 16:15:07 +08:00 |
|
slaughter
|
f268f30fac
|
#修改了SampletreesDisplayed1页面
|
2020-05-12 16:10:38 +08:00 |
|
Bob
|
f10c56f402
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 15:35:58 +08:00 |
|
slaughter
|
25dfafaf35
|
#修改了SampletreesAdd页面，添加了SampletreesDisplayed1页面
|
2020-05-12 15:35:27 +08:00 |
|
Bob
|
1c09068509
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 15:34:18 +08:00 |
|
Bob
|
f9308c9f9a
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 08:54:26 +08:00 |
|
Bob
|
70a67e512f
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 08:53:43 +08:00 |
|
slaughter
|
ed6195dafc
|
#修改了SampletreesUpdateForm,SamplebushUpdateForm,SampleherbalUpdateForm,Enclosure,UAVphotos,Scenephotos,SamplebushAdd1,SampleherbalAdd1页面
|
2020-05-11 17:31:22 +08:00 |
|
Bob
|
6eea6b45ff
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-09 15:12:16 +08:00 |
|
slaughter
|
9b26a1ca50
|
#修改了SampletreesUpdateForm页面
|
2020-05-09 15:10:41 +08:00 |
|
Bob
|
eb7829ad87
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-09 15:09:14 +08:00 |
|
slaughter
|
3a86179349
|
#修改了SampletreesAdd页面
|
2020-05-08 15:40:56 +08:00 |