部分bug

src/views/dataBoard/cpts/tb.vue

@@ -10,7 +10,7 @@
 						</th>
 					</tr>
 				</thead></table>
-			<el-scrollbar :style="{height:treeHeight}" class="g-scrollar">
+			<el-scrollbar :style="{maxHeight:treeHeight}" class="g-scrollar">
 			<table class="table" border="0" cellspacing="0" cellpadding="0">
 				<col :align="item.align" :width="item.width" :key="'col' + index" v-for="(item, index) in colList" />
 				
@@ -273,6 +273,7 @@
 		.g-scrollar {
 			width: 100%;
 			overflow-x: hidden;
+			overflow-y: auto;
 		}
 
 		.orange {
@@ -303,7 +304,7 @@
 	}
 /deep/ .el-scrollbar__wrap {
 				width: 100% !important;
-				overflow-x: hidden !important;
+				overflow: hidden !important;
 			}
 	.m-pagination {
 		box-sizing: border-box;

src/views/dataBoard/sida/cpts/fw03zr.vue

@@ -3,13 +3,13 @@
 		<el-row :gutter="16">
 			<el-col :span="12">
 				<div class="kuangkuang">
-					<h3>公共服务数量</h3>
+					<h3>服务次数</h3>
 					<h2>{{ info.service_total }}</h2>
 				</div>
 			</el-col>
 			<el-col :span="12">
 				<div class="kuangkuang">
-					<h3>指派服务数量</h3>
+					<h3>服务人数</h3>
 					<h2>{{ info.service_person_total }}</h2>
 				</div>
 			</el-col>

src/views/dataBoard/sida/cpts/fwBarOption01.js

@@ -42,7 +42,10 @@ export function pieOption() {
 			axisTick: {
 				alignWithLabel: true
 			},
+			
 			axisLabel: {
+				  interval: 0,  
+				  rotate: 40    ,
 				show: true,
 				textStyle: {
 					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色

src/views/dataBoard/sida/cpts/fwBarOption04.js

@@ -43,6 +43,8 @@ export function pieOption() {
 				alignWithLabel: true
 			},
 			axisLabel: {
+				interval: 1,
+				rotate: 40,
 				show: true,
 				textStyle: {
 					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
@@ -53,7 +55,6 @@ export function pieOption() {
 		}],
 		yAxis: [{
 			type: 'value',
-		
 			splitNumber: 5,
 			splitLine: {
 				show: true,
@@ -64,6 +65,25 @@ export function pieOption() {
 				}
 			},
 			axisLabel: {
+				show: true,
+				textStyle: {
+					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
+					fontSize: 12 //更改坐标轴文字大小
+				}
+			},
+		}, {
+			type: 'value',
+			splitNumber: 5,
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: 'rgba(255,255,255,0.15)',
+					width: 1,
+					type: 'solid'
+				}
+			},
+			axisLabel: {
+				
 				show: true,
 				textStyle: {
 					color: 'rgba(255,255,255,0.85)', //更改坐标轴文字颜色
@@ -76,6 +96,7 @@ export function pieOption() {
 			type: 'bar',
 			stack: 'Ad',
 			barWidth: 12,
+			yAxisIndex: 0,
 			emphasis: {
 				focus: 'series'
 			},
@@ -94,6 +115,7 @@ export function pieOption() {
 			type: 'bar',
 			barWidth: 12,
 			stack: 'Ad',
+			yAxisIndex: 0,
 			emphasis: {
 				focus: 'series'
 			},
@@ -112,6 +134,7 @@ export function pieOption() {
 			type: 'line',
 			barWidth: 12,
 			stack: 'Ad',
+			yAxisIndex: 1,
 			emphasis: {
 				focus: 'series'
 			},

src/views/dataBoard/sida/fuwu/gonggongList.vue

@@ -178,7 +178,7 @@ export default {
 					}
 				},
 				{
-					mockId: 63070189
+					//mockId: 63070189
 				}
 			);
 

src/views/dataBoard/sida/zy/gonggongList.vue

@@ -178,7 +178,7 @@ export default {
 					}
 				},
 				{
-					mockId: 63070189
+					//mockId: 63070189
 				}
 			);
 

src/views/dataBoard/sida/zy/peopleRes-detail.vue

@@ -122,7 +122,7 @@
 						v-if="index != 2 || detailType == '联建单位'"
 						:class="currentTabIndex == index ? 'z-on' : ''"
 						:key="'tab' + index"
-						@click="currentTab = item"
+						@click="currentTab = item;currentTabIndex=index"
 						v-for="(item, index) in tabList"
 					>
 						{{ item }}