Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/Jsmsdialog.vue

src/components/Jsmsdialog.vue

@@ -395,6 +395,7 @@ export default {
 		display: flex;
 		flex-direction: row;
 		background: #18326c;
+    z-index: 2;
 	}
 	.Jsmsdialog-left .Jsmsdialog-map .Jsmsdialog-yatz span{
 		color: #fff;

src/components/Rightnav.vue

@@ -9,7 +9,7 @@
 			</div>
 			<div class="jydw-zs">
 				<span>救援队伍总数：</span>
-				<b>205</b>
+				<b>150</b>
 				<span>人</span>
 			</div>
 			<div id="Jydw"></div>
@@ -54,22 +54,6 @@
 						<p>人数：24人</p>
 					</div>
 				</div>
-				<div class="jydw-li">
-					<img src="../assets/images/yj-img1.png"/>
-					<div class="jydw-txt">
-						<h2>东兴村救援队伍</h2>
-						<p>队长：李礼</p>
-						<p>人数：30人</p>
-					</div>
-				</div>
-				<div class="jydw-li">
-					<img src="../assets/images/yj-img1.png"/>
-					<div class="jydw-txt">
-						<h2>劳动村救援队伍</h2>
-						<p>队长：周剑桥</p>
-						<p>人数：25人</p>
-					</div>
-				</div>
 			</div>
 		</div>
 	</div>