Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster

# Conflicts:
#	src/view/components/Sourcedisaster.vue