提交show文件修改

src/views/Show.vue

@@ -3,7 +3,6 @@
       <el-header class="headers">
 		  <span class="title">实事分析展示</span>
 	  </el-header>
-<<<<<<< HEAD
       <el-container style="min-height:calc(100vh - 64px);" class="showbox">
 		<el-main style="padding: 12px;overflow:hidden">
 			<div style="margin-bottom: 12px;">
@@ -39,27 +38,6 @@
 					</el-col>
 				</el-row>
 				<div style="clear: both;"></div>
-=======
-      <el-container>
-        <el-main class="mainDiv">
-			<div class="topDiv">
-				<div class="videoCon">
-					<!-- 加入视频 -->
-				</div>
-				<div class="imgCon">
-					<div class="imgDiv">
-							<!-- 加入img 100% -->
-					</div>
-					<div class="textDiv">
-						<p>抓拍时间：2019年10月29日 17:01:47</p>
-						<p>抓拍地点：丰豪东路与北清路交叉口</p>
-						<p>车牌号码：京B123456</p>
-						<p>车辆类型：小轿车</p>
-						<p>车身颜色：白色</p>
-						<p>违法类型：占用公交车道年</p>
-					</div>
-				</div>
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 			</div>
 			<el-row class="bottomDiv" :gutter="10">
 				<!-- 循环生成lDiv -->
@@ -274,7 +252,6 @@ export default {
 		-webkit-background-clip:text;
 	}
 	.videoCon{
-<<<<<<< HEAD
 		background: #FFFFFF;
 		width:100%;
 		height:70vh;
@@ -293,38 +270,13 @@ export default {
 	}
 	.lDiv{
 		float: left;
-=======
-		flex:1212;
-		height:682px;
-		background: red;
-		margin-right: 12px;
-	}
-	.imgCon{
-		background: #FFFFFF;
-		padding: 12px;
-		flex:644;
-	}
-	.imgDiv{
-		width:100%;
-		height:360px;
-		background:rgba(216,216,216,1);
-	}
-	.lDiv{
-		margin-right: 12px;
-		flex: 1;
-		display: flex;
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 	}
 	.lDiv:nth-last-of-type(2){
 		margin: 0;
 	}
 	.rightDiv{
-<<<<<<< HEAD
 		width:10.5vw;
 		height:20vh;
-=======
-		flex:226;
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 		border:1px solid rgba(229,229,229,1);
 		border-left: none;
 		color: #555555;
@@ -336,11 +288,7 @@ export default {
 		margin-left: 10px;
 	}
 	.textDiv{
-<<<<<<< HEAD
 		height:29vh;
-=======
-		height:286px;
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 		border:1px solid rgba(229,229,229,1);
 		color: #555555;
 		font-size:22px;
@@ -356,18 +304,12 @@ export default {
 		flex-flow: row nowrap;
 	}
 	.leftImg{
-<<<<<<< HEAD
 		width: 21vw;
 		height: 20.2vh;
-=======
-		flex: 390;
-		height: 186px;
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 		background: #d8d8d8;
 		overflow: hidden;
 		float: left;
 	}
-<<<<<<< HEAD
 	.leftImg>div{
 		height: 100%;
 		width: 100%;
@@ -375,69 +317,5 @@ export default {
 	.photos{
 		width: 100%;
 		height: 100%;
-=======
-	.topDiv{
-		margin-bottom: 8px;
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-	}
-	.mainDiv{
-		padding: 8px;
-	}
-	@media screen and (max-width: 1366px) {
-		.topDiv{
-			margin-bottom: 5px;
-		}
-		.mainDiv{
-			padding: 5px 40px;
-		}
-	   .videoCon{
-			flex:1212;
-			height:446.78px;
-			margin-right: 12px;
-	   }
-	   .imgDiv{
-		   height: 237.46px;
-	   }
-	   .textDiv{
-		   height: 171px;
-		   font-size: 16px;
-		   padding-top: 4px;
-		   padding-bottom: 9px;
-	   }
-	   .textDiv p{
-	       margin: 7px 0;
-	       margin-left: 37px;
-	   }
-	   .leftImg{
-		   height: 143px;
-	   }
-	   .rightDiv p {
-	       margin: -1px 0;
-	       margin-left: 7px;
-	   }
-	   .rightDiv{
-		   padding-top: 0px;
-	   }
-	}
-	@media (min-height:1080px){
-		.headers{
-			line-height: 120px!important;
-			height: 120px!important;
-		}
-		.title{
-			font-size:40px;
-			font-family:MicrosoftYaHeiUI;
-			color:rgba(255,255,255,1);
-			-webkit-background-clip:text;
-		}
-		.mainDiv{
-			padding-top: 20px;
-		}
-		.topDiv{
-			margin-bottom: 16px;
-		}
->>>>>>> c156293e5665c9ed403aab57b2df7ed02e5cce09
 	}
 </style>
\ No newline at end of file