Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/assets/css/xpwyfyy.css

@@ -4193,5 +4193,5 @@ h3 {
 	margin-top:41px
 }
 .vongi-tab-top{
-	margin-top:100px
+	margin-top:82px
 }

src/projects/business/views/Master/Attendance/StatisticList.vue

@@ -19,15 +19,14 @@
 				<a href="" class="">早退(46)</a>
 				<a href="" class="">缺卡(46)</a>
 				<a href="" class="">出差(46)</a>
-				<a href="" class="">请假(46)</a>
-				<!-- <template v-for="(item,index) in navList">
-					<a :class="navCanClick(item,index)?'color4fc5f7':''" @click="reloadItem(item,index)" v-text="item.name"></a>
-					<span v-if="index!=navList.length-1" class="mui-icon mui-icon-forward"></span>
-				</template> -->
+				<a href="" class="">请假(46)</a>				
 			</div>
 			<div class="vongi-kqtj-center vongi-tab-top">
-				<div class="mui-content-padded">
-					<h5>荆鹏软件集团</h5>
+				<div class="vongi-bread">
+					<template v-for="(item,index) in navList">
+						<a :class="navCanClick(item,index)?'color4fc5f7':''" @click="reloadItem(item,index)" v-text="item.name"></a>
+						<span v-if="index!=navList.length-1" class="mui-icon mui-icon-forward"></span>
+					</template>
 				</div>
 				<ul v-if="!isLast" class="mui-table-view margin10">
 					<li v-for="(item,index) in companyList" class="mui-table-view-cell">