Merge remote-tracking branch 'origin/feature/初版/base' into feature/初版/base

h5-datax-manager/src/components/common/cont.vue

@@ -2,7 +2,7 @@
 
 <template>
 	<div class="cont_cont">
-		<!-- <div class="cont_left" v-loading="leftloading">
+		 <div class="cont_left" v-loading="leftloading">
 			<div class="cont_header">
 				<p class="cont_header_title">{{title}}</p>
 				<p class="cont_header_subtitle">{{title}}</p>
@@ -14,7 +14,7 @@
 				 @updatafilelist="updatafilelist" @delectFun="delectFun">
 				</fileHome>
 			</div>
-		</div> -->
+		</div>
 		<div 
       class="cont_right" 
       v-loading="contloading"