dedsudiyu месяцев назад: 3
Родитель
Сommit
07e46b641f

+ 54 - 5
pages/views/dataBoard/securityHidden.vue

@@ -1,6 +1,7 @@
 <!-- 数据看板-安全隐患 -->
 <template>
 	<view class="hazardSources">
+		<!-- 计划列表 -->
 		<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerList" range-key="planTitle">
 			<view class="small-title">
 				<view class="small-title-l">{{pickerList[pickerIndex].planTitle}}</view>
@@ -8,13 +9,16 @@
 			</view>
 		</picker>
 		<view class="chart">
+			<!-- 图表选项卡 -->
 			<view class="chart-t">
 				<view class="chart-t-li" :class="chartIndex==index?'color-A':'color-B'" @click="chartClick(index)"
 					v-for="(item,index) in chartTitle">{{item}}</view>
 			</view>
+			<!-- 安全隐患排行-图表 -->
 			<view class="chart-b" v-if="chartIndex==0">
 				<qiun-data-charts :canvas2d="true" type="column" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
+			<!-- 一级指标排行-图表 -->
 			<view class="chart-b2" v-if="chartIndex==0">
 				<view class="chart-b2-li" v-for="(item,index) in hiddenChartBottom">
 					<view class="chart-b2-li-t">
@@ -24,10 +28,12 @@
 					<view class="chart-b2-li-b">{{item.total}}</view>
 				</view>
 			</view>
+			<!-- 暂无法整改-图表 -->
 			<view class="chart-b-tow" v-if="chartIndex==1 || chartIndex==2">
 				<qiun-data-charts :canvas2d="true" type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
+		<!-- 选项卡 -->
 		<scroll-view scroll-x @scrolltolower="scrollGet" v-if="chartIndex!=0">
 			<view class="tabTitle_tow">
 				<view class="tabTitle_tow_li" @tap="tabClickTow(item,index)" :key="index"
@@ -274,13 +280,13 @@
 				this.chartIndex = index;
 				if(this.chartIndex==0){
 					//安全隐患排行
-					this.reportAppStatisticsDangerSort(this.pickerList[0].planId)
+					this.reportAppStatisticsDangerSort(this.pickerList[this.pickerIndex].planId)
 				}else if(this.chartIndex==1){
 					//一级指标排行
-					this.securityCheckDangerHazardOneCollect(this.pickerList[0].planId)
+					this.securityCheckDangerHazardOneCollect(this.pickerList[this.pickerIndex].planId)
 				}else if(this.chartIndex==2){
 					//暂无法整改
-					this.securityCheckDangerNotHazardOneCollect(this.pickerList[0].planId)
+					this.securityCheckDangerNotHazardOneCollect(this.pickerList[this.pickerIndex].planId)
 				}
 			},
 			//顶部tab点击
@@ -346,6 +352,28 @@
 							]
 						};
 						this.chartData = JSON.parse(JSON.stringify(res));
+					}else{
+						let res = {
+							categories: ['无数据'],
+							series: [{
+									name: "已整改",
+									textColor: '#fff',
+									data: [0]
+						
+								},
+								{
+									name: "未整改",
+									textColor: '#fff',
+									data: [0]
+								},
+								{
+									name: "暂无法整改",
+									textColor: '#fff',
+									data: [0]
+								}
+							]
+						};
+						this.chartData = JSON.parse(JSON.stringify(res));
 					}
 				}
 			},
@@ -384,6 +412,17 @@
 						};
 						this.chartDataTow = JSON.parse(JSON.stringify(res));
 						
+					}else{
+						
+						//图表
+						let res = {
+							categories:['无数据'],
+							series: [{
+								name: "",
+								data: [0]
+							}]
+						};
+						this.chartDataTow = JSON.parse(JSON.stringify(res));
 					}
 					
 				}
@@ -422,6 +461,17 @@
 						};
 						this.chartDataTow = JSON.parse(JSON.stringify(res));
 						
+					}else{
+						
+						//图表
+						let res = {
+							categories:['无数据'],
+							series: [{
+								name: "",
+								data: [0]
+							}]
+						};
+						this.chartDataTow = JSON.parse(JSON.stringify(res));
 					}
 					
 				}
@@ -429,7 +479,6 @@
 		},
 	}
 </script>
-
 <style lang="stylus" scoped>
 	.hazardSources {
 		height: 100%;
@@ -473,7 +522,7 @@
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			margin: 20rpx 30rpx 0;
 			overflow: hidden;
-
+			
 			.chart-t {
 				width: 570rpx;
 				height: 50rpx;

+ 1 - 0
uni_modules/zb-table/components/zb-table/zb-table.vue

@@ -1107,6 +1107,7 @@
 		justify-content: center;
 		align-items: center;
 		border-bottom: 1px solid #e8e8e8;
+		color:#fff;
 	}
 
 	.item-th {