Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -1212,13 +1212,14 @@
     }
 
     .cz, .xh {
-        width: 100px;
+        width: 80px;
     }
 
     .xzq, .djq, .djzq {
         width: 150px;
     }
 
+
     .search {
         color: #BBB !important;
     }

 <template>
-	<div class="content_box">
-		<el-tabs v-model="activeName" @tab-click="handleClick" type="card">
+		<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
 			<el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
 			<el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
 			<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
 			<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
 		</el-tabs>
-	</div>
 </template>
 
 <script>