zc

pages/views/dataBoard/cagePosition.vue

@@ -9,7 +9,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts" :canvas2d="true" :chartData="chartData0" />
+						<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartData0" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -18,7 +18,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartData1" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartData1" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].freeNum}}</text>
@@ -27,7 +27,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartData2" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData2" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -36,7 +36,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts4" :canvas2d="true" :chartData="chartData3" />
+						<qiun-data-charts type="arcbar" :opts="opts4" :chartData="chartData3" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].lockedNum}}</text>
@@ -45,7 +45,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts5" :canvas2d="true" :chartData="chartData4" />
+						<qiun-data-charts type="arcbar" :opts="opts5" :chartData="chartData4" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].killNum}}</text>
@@ -54,7 +54,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts6" :canvas2d="true" :chartData="chartData5" />
+						<qiun-data-charts type="arcbar" :opts="opts6" :chartData="chartData5" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].repairNum}}</text>
@@ -71,7 +71,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts" :canvas2d="true" :chartData="chartDataTow0" />
+						<qiun-data-charts type="arcbar" :opts="opts" :chartData="chartDataTow0" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -80,7 +80,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartDataTow1" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartDataTow1" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].freeNum}}</text>
@@ -89,7 +89,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartDataTow2" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartDataTow2" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].appointNum}}</text>
@@ -98,7 +98,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts4" :canvas2d="true" :chartData="chartDataTow3" />
+						<qiun-data-charts type="arcbar" :opts="opts4" :chartData="chartDataTow3" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].lockedNum}}</text>
@@ -107,7 +107,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts5" :canvas2d="true" :chartData="chartDataTow4" />
+						<qiun-data-charts type="arcbar" :opts="opts5" :chartData="chartDataTow4" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].killNum}}</text>
@@ -116,7 +116,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts6" :canvas2d="true" :chartData="chartDataTow5" />
+						<qiun-data-charts type="arcbar" :opts="opts6" :chartData="chartDataTow5" />
 					</view>
 					<view class="chart-b-li-r">
 						<text>{{dataList[0].repairNum}}</text>
@@ -135,7 +135,8 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataThree" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" 
+				type="bar" :opts="optsTow" :echartsH5="true" :chartData="chartDataThree" />
 			</view>
 		</view>
 	</view>
@@ -286,27 +287,36 @@
 				subNameTow:'',
 				
 				optsTow: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [5, 5, 5, 5],
-					dataLabel: false,
+					rotate: false,
+					rotateLock: false,
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+					padding: [15, 20, 15, 15],
+					dataLabel: true,
 					enableScroll: false,
+					fontColor:'#ffffff',
 					legend: {
-						show: false,
-						position: "right",
-						lineHeight: 25
+						show:false,
 					},
+					xAxis: {
+						boundaryGap: "justify",
+						disableGrid: false,
+						min: 0,
+						axisLine: false,
+						max: 40
+					},
+					yAxis: {},
 					extra: {
-						radar: {
-							gridType: "radar",
-							gridColor: "#CCCCCC",
-							gridCount: 3,
-							opacity: 0.2,
-							max: 200,
-							labelShow: true,
-							border: true,
-							labelColor: '#fff',
+						bar: {
+							type: "group",
+							width: 15,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							seriesGap: 2,
+							categoryGap: 2
 						}
 					}
 				},
@@ -400,24 +410,36 @@
 					statisticsType: this.statisticsType
 				});
 				if (data.code == 200) {
+					let categories = [];
 					let list = [];
-					let list2 = [];
-					data.data.subjectList.forEach(function(item, index) {
+					data.data.subjectList.forEach((item, index)=>{
 						if (index < 5) {
-							list.push(item.subjectName)
-							list2.push(item.dangerNum)
+							if (item.subjectName.length > 6) {
+								item.subjectName = item.subjectName.slice(0, 6) + '...';
+							}
+							categories.push(item.subjectName)
+							list.push(item.dangerNum)
 						}
-
 					})
-
-					let res = {
-						categories: list,
-						series: [{
-							name: "",
-							data: list2
-						}, ]
-					};
-					this.chartDataThree = JSON.parse(JSON.stringify(res));
+					let res = {};
+					if(categories[0]){
+						res = {
+							categories: categories,
+							series: [{
+								name: "",
+								data: list
+							}]
+						};
+					}else{
+						res = {
+							categories: ['无数据'],
+							series: [{
+								name: "",
+								data: [0]
+							}]
+						};
+					}
+					self.$set(this,'chartDataThree',res);
 				}
 			},
 			chartTabClick(index) {

pages/views/dataBoard/daYiReservation.vue

@@ -9,7 +9,8 @@
 				</viwe>
 			</view>
 			<view class="chart-b">
-				<qiun-data-charts type="ring" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" type="ring" :opts="opts" :echartsH5="true"
+					:chartData="chartData" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -50,7 +51,8 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" 
+				type="bar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 	</view>
@@ -76,8 +78,9 @@
 				opts: {
 					rotate: false,
 					rotateLock: false,
+					fontColor: '#fff',
 					color: ["#10C139", "#FF8400", "#0183FA", "#EE6666", "#73C0DE", "#3CA272", ],
-					padding: [5, 65, 5, 5],
+					padding: [5, 10, 5, 10],
 					dataLabel: true,
 					enableScroll: false,
 					legend: {
@@ -107,27 +110,36 @@
 				},
 				chartData: {},
 				optsTow: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [5, 5, 5, 5],
-					dataLabel: false,
+					rotate: false,
+					rotateLock: false,
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+					padding: [15, 20, 15, 15],
+					dataLabel: true,
 					enableScroll: false,
+					fontColor:'#ffffff',
 					legend: {
-						show: false,
-						position: "right",
-						lineHeight: 25
+						show:false,
+					},
+					xAxis: {
+						boundaryGap: "justify",
+						disableGrid: false,
+						min: 0,
+						axisLine: false,
+						max: 40
 					},
+					yAxis: {},
 					extra: {
-						radar: {
-							gridType: "radar",
-							gridColor: "#CCCCCC",
-							gridCount: 3,
-							opacity: 0.2,
-							max: 200,
-							labelShow: true,
-							border: true,
-							labelColor: '#fff',
+						bar: {
+							type: "group",
+							width: 15,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							seriesGap: 2,
+							categoryGap: 2
 						}
 					}
 				},
@@ -138,7 +150,7 @@
 				chartTabIndexTow: 0,
 				chartTabListThree: ['年度', '季度', '月度'],
 				chartTabIndexThree: 0,
-				
+
 				// 查询参数
 				queryParams: {
 					page: 1,
@@ -165,7 +177,7 @@
 					},
 					{
 						name: 'appointFee',
-						label: '使用费用',
+						label: '预约费用',
 						align: 'center',
 					},
 					{
@@ -202,9 +214,9 @@
 				dataList: [],
 				dataList2: [],
 				total: 0,
-				type:1,//type为1 按费用,2.按照机时,3.按照样品
-				deviceTotal:0,
-				statisticsType:1,//1.年度2.季度3.月度
+				type: 1, //type为1 按费用,2.按照机时,3.按照样品
+				deviceTotal: 0,
+				statisticsType: 1, //1.年度2.季度3.月度
 			}
 		},
 		created() {
@@ -226,27 +238,42 @@
 				let self = this;
 				const {
 					data
-				} = await reportAppletReportBsEquipDangerList({dangerType:'3',statisticsType:this.statisticsType});
+				} = await reportAppletReportBsEquipDangerList({
+					dangerType: '3',
+					statisticsType: this.statisticsType
+				});
 				if (data.code == 200) {
-					let list=[];
-					let list2=[];
-					data.data.subjectList.forEach(function(item,index){
-						if(index<5){
-							list.push(item.subjectName)
-							list2.push(item.dangerNum)
+					let categories = [];
+					let list = [];
+					data.data.subjectList.forEach((item, index)=>{
+						if (index < 5) {
+							if (item.subjectName.length > 6) {
+								item.subjectName = item.subjectName.slice(0, 6) + '...';
+							}
+							categories.push(item.subjectName)
+							list.push(item.dangerNum)
 						}
-						
 					})
-					
-					let res = {
-						categories: list,
-						series: [{
+					let res = {};
+					if(categories[0]){
+						res = {
+							categories: categories,
+							series: [{
 								name: "",
-								data: list2
-							},
-						]
-					};
-					this.chartDataTow = JSON.parse(JSON.stringify(res));
+								data: list
+							}]
+						};
+					}else{
+						res = {
+							categories: ['无数据'],
+							series: [{
+								name: "",
+								data: [0]
+							}]
+						};
+					}
+					console.log('res',res);
+					self.$set(this,'chartDataTow',res);
 				}
 			},
 			//设备总数
@@ -256,19 +283,17 @@
 					data
 				} = await reportAppletReportBsEquipStatusList();
 				if (data.code == 200) {
-					let list=[];
-					data.data.forEach(function(item,index){
-						if(index<6){
+					let list = [];
+					data.data.forEach(function(item, index) {
+						if (index < 6) {
 							list.push({
-								"name": item.name,
-								"value":item.value,
-								"labelShow": false,
+								"name": item.name + ' ' + item.value,
+								"value": item.value,
+								// "labelShow": false,
 							})
-							self.deviceTotal+=item.value
+							self.deviceTotal += item.value
 						}
-						
 					})
-					
 					let res = {
 						series: [{
 							data: list
@@ -282,10 +307,12 @@
 				let self = this;
 				const {
 					data
-				} = await reportAppletReportApiEquipRankTopList({type:this.type});
+				} = await reportAppletReportApiEquipRankTopList({
+					type: this.type
+				});
 				if (data.code == 200) {
-					
-					this.$set(this,'dataList',data.data)
+
+					this.$set(this, 'dataList', data.data)
 				}
 			},
 			//大仪预约排行
@@ -295,11 +322,11 @@
 					data
 				} = await reportAppletReportBsEquipAppointTopList();
 				if (data.code == 200) {
-					
-					this.$set(this,'dataList2',data.data)
+
+					this.$set(this, 'dataList2', data.data)
 				}
 			},
-			
+
 			getServerDataTow() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -307,10 +334,9 @@
 					let res = {
 						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
-								name: "",
-								data: [90, 110, 165, 195, 187]
-							},
-						]
+							name: "",
+							data: [90, 110, 165, 195, 187]
+						}, ]
 					};
 					this.chartDataTow = JSON.parse(JSON.stringify(res));
 				}, 500);
@@ -320,16 +346,16 @@
 			},
 			chartTabClickTow(index) {
 				this.chartTabIndexTow = index;
-				this.type = index+1;
+				this.type = index + 1;
 				this.reportAppletReportApiEquipRankTopList();
 			},
 			chartTabClickThree(index) {
 				this.chartTabIndexThree = index;
-				this.statisticsType = index+1;
+				this.statisticsType = index + 1;
 				this.reportAppletReportBsEquipDangerList();
 			},
-			
-			
+
+
 		},
 	}
 </script>
@@ -658,4 +684,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/views/dataBoard/equipmentControl.vue

@@ -25,7 +25,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
+				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -34,7 +34,7 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="funnel" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
+				<qiun-data-charts type="funnel" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 		<view class="small-title">
@@ -51,7 +51,7 @@
 				</viwe>
 			</view>
 			<view class="chart-three-b">
-				<qiun-data-charts type="pie" :opts="optsThree" :echartsH5="true" :canvas2d="true" :chartData="chartDataThree" />
+				<qiun-data-charts type="pie" :opts="optsThree" :echartsH5="true" :chartData="chartDataThree" />
 			</view>
 		</view>
 		<view class="chart-title">

pages/views/dataBoard/hazardSources.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-b">
-				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
+				<qiun-data-charts type="bar" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
 		</view>
 		<view class="table">

pages/views/dataBoard/hazardousChemicals.vue

@@ -29,7 +29,7 @@
 		</view>
 		<view class="chart">
 			<view class="chart-t">
-				<qiun-data-charts type="funnel" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
+				<qiun-data-charts type="funnel" :opts="opts" :echartsH5="true" :chartData="chartData" />
 			</view>
 			<view class="chart-b" v-for="(item,index) in dataList" :key="index">
 				<view :class="index==0?'chartOne':(index==1?'chartTow':(index==2?'chartThree':'chartFive'))">

pages/views/dataBoard/labPage.vue

@@ -10,7 +10,7 @@
 				</view>
 			</view> -->
 			<view class="chart-b">
-				<qiun-data-charts type="line" :opts="opts" :echartsH5="true" :chartData="chartData" :canvas2d="true" :ontouch="true" />
+				<qiun-data-charts type="line" :opts="opts" :echartsH5="true" :chartData="chartData" :ontouch="true" />
 			</view>
 		</view>
 		<view class="statistics">

pages/views/dataBoard/resourceReservation.vue

@@ -15,7 +15,7 @@
 			<view class="chart-b">
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts0" :canvas2d="true" :chartData="chartData0" />
+						<qiun-data-charts type="arcbar" :opts="opts0" :chartData="chartData0" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[0].equNumber}}</view>
@@ -25,7 +25,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts1" :canvas2d="true" :chartData="chartData1" />
+						<qiun-data-charts type="arcbar" :opts="opts1" :chartData="chartData1" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[1].equNumber}}</view>
@@ -35,7 +35,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts2" :canvas2d="true" :chartData="chartData2" />
+						<qiun-data-charts type="arcbar" :opts="opts2" :chartData="chartData2" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[2].equNumber}}</view>
@@ -45,7 +45,7 @@
 				</view>
 				<view class="chart-b-li">
 					<view class="chart-b-li-l">
-						<qiun-data-charts type="arcbar" :opts="opts3" :canvas2d="true" :chartData="chartData3" />
+						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData3" />
 					</view>
 					<view class="chart-b-li-r">
 						<view>总数: {{dataList[3].equNumber}}</view>
@@ -65,7 +65,8 @@
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataThree" />
+				<qiun-data-charts :tapLegend="false" :tooltipShow="false" 
+				type="bar" :opts="optsTow" :echartsH5="true" :chartData="chartDataThree" />
 			</view>
 		</view>
 	</view>
@@ -100,10 +101,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#FF5201",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#3C3E4B",
+							linearType:"custom",
+							customColor:["#FFCB00"],
 						}
 					}
 				},
@@ -121,10 +125,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#04A44C",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#3C3E4B",
+							linearType:"custom",
+							customColor:["#03F1CA"],
 						}
 					}
 				},
@@ -143,10 +150,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#0283FA",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#3C3E4B",
+							linearType:"custom",
+							customColor:["#01EBEE"],
 						}
 					}
 				},
@@ -164,10 +174,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#0283FA",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#3C3E4B",
+							linearType:"custom",
+							customColor:["#01EBEE"],
 						}
 					}
 				},
@@ -176,27 +189,36 @@
 				chartData2: {},
 				chartData3: {},
 				optsTow: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [5, 5, 5, 5],
-					dataLabel: false,
+					rotate: false,
+					rotateLock: false,
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+					padding: [15, 20, 15, 15],
+					dataLabel: true,
 					enableScroll: false,
+					fontColor:'#ffffff',
 					legend: {
-						show: false,
-						position: "right",
-						lineHeight: 25
+						show:false,
 					},
+					xAxis: {
+						boundaryGap: "justify",
+						disableGrid: false,
+						min: 0,
+						axisLine: false,
+						max: 40
+					},
+					yAxis: {},
 					extra: {
-						radar: {
-							gridType: "radar",
-							gridColor: "#CCCCCC",
-							gridCount: 3,
-							opacity: 0.2,
-							max: 200,
-							labelShow: true,
-							border: true,
-							labelColor: '#fff',
+						bar: {
+							type: "group",
+							width: 15,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							seriesGap: 2,
+							categoryGap: 2
 						}
 					}
 				},
@@ -210,6 +232,7 @@
 				totalNum: 0,
 				chartTabListThree: ['年度', '季度', '月度'],
 				chartTabIndexThree: 0,
+				chartDataThree:{},
 			}
 		},
 		created() {
@@ -233,14 +256,12 @@
 				});
 				if (data.code == 200) {
 					this.dataList = data.data;
-					let colorList = ['#FFCC00', '#00FFDD', '#00FFEE', '#00FFEE']
-
+					let colorList = ['#FF5301', '#03A951', '#018EFA', '#018EFA']
 					data.data.forEach(function(item, index) {
 						self.totalNum += item.equNumber;
 						const optsName = `opts${index}`;
 						self[optsName].title.name = item.equType
 						self[optsName].subtitle.name = item.useRate + '%'
-
 						let res = {
 							series: [{
 								name: item.equType,
@@ -262,24 +283,37 @@
 					statisticsType: this.statisticsType
 				});
 				if (data.code == 200) {
+					let categories = [];
 					let list = [];
-					let list2 = [];
-					data.data.subjectList.forEach(function(item, index) {
+					data.data.subjectList.forEach((item, index)=>{
 						if (index < 5) {
-							list.push(item.subjectName)
-							list2.push(item.dangerNum)
+							if (item.subjectName.length > 6) {
+								item.subjectName = item.subjectName.slice(0, 6) + '...';
+							}
+							categories.push(item.subjectName)
+							list.push(item.dangerNum)
 						}
-
 					})
-
-					let res = {
-						categories: list,
-						series: [{
-							name: "",
-							data: list2
-						}, ]
-					};
-					this.chartDataThree = JSON.parse(JSON.stringify(res));
+					let res = {};
+					if(categories[0]){
+						res = {
+							categories: categories,
+							series: [{
+								name: "",
+								data: list
+							}]
+						};
+					}else{
+						res = {
+							categories: ['无数据'],
+							series: [{
+								name: "",
+								data: [0]
+							}]
+						};
+					}
+					console.log('res',res)
+					self.$set(this,'chartDataThree',res);
 				}
 			},
 			chartTabClickThree(index) {

pages/views/dataBoard/securityHidden.vue

@@ -13,7 +13,7 @@
 					v-for="(item,index) in chartTitle">{{item}}</view>
 			</view>
 			<view class="chart-b" v-if="chartIndex==0">
-				<qiun-data-charts type="column" :opts="opts" :echartsH5="true" :canvas2d="true" :chartData="chartData" />
+				<qiun-data-charts 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">
@@ -25,7 +25,7 @@
 				</view>
 			</view>
 			<view class="chart-b-tow" v-if="chartIndex==1 || chartIndex==2">
-				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :canvas2d="true" :chartData="chartDataTow" />
+				<qiun-data-charts type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 		<scroll-view scroll-x @scrolltolower="scrollGet" v-if="chartIndex!=0">