zc

pages/views/dataBoard/cagePosition.vue

@@ -169,10 +169,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#BEE0FF",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#0183FA"],
 						}
 					}
 				},
@@ -188,10 +191,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#B1FCBE",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#16BF32"],
 						}
 					}
 				},
@@ -207,10 +213,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#C0F5F3",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#03D8D0"],
 						}
 					}
 				},
@@ -226,10 +235,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#FFC0A7",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#FF4800"],
 						}
 					}
 				},
@@ -245,10 +257,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#FF9898",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#FF5F5F"],
 						}
 					}
 				},
@@ -264,10 +279,13 @@
 					extra: {
 						arcbar: {
 							width: 6,
-							backgroundColor: "#FFDDB5",
-							startAngle: 0,
-							endAngle: 1.5,
+							direction:"ccw",
+							startAngle: 1.5,
+							endAngle: 1.51,
 							gap: 2,
+							backgroundColor: "#373745",
+							linearType:"custom",
+							customColor:["#FF8C00"],
 						}
 					}
 				},
@@ -354,7 +372,7 @@
 				if (data.code == 200) {
 					self.dataList=data.data.reportBsCageRateList;
 					let nameList=['总数','空闲','预约','锁定','消杀','维修']
-					let colorList=['#0183FA','#16BF32','#03D8D0','#FF4800','#FF5F5F','#FF8C00']
+					let colorList=['#B5DEFC','#9FF7B2','#B5F2F0','#FFBCA2','#FC9893','#FFDCB5']
 					let numList=[
 						data.data.reportBsCageRateList[0].appointNum/100,
 						data.data.reportBsCageRateList[0].freeNum/100,

pages/views/dataBoard/daYiReservation.vue

@@ -302,7 +302,7 @@
 					this.chartData = JSON.parse(JSON.stringify(res));
 				}
 			},
-			//预约使用排行
+			//预约使用排行TOP10
 			async reportAppletReportApiEquipRankTopList() {
 				let self = this;
 				const {
@@ -311,7 +311,12 @@
 					type: this.type
 				});
 				if (data.code == 200) {
-
+					data.data.forEach((item)=>{
+						item.useTimeStr = item.useTimeStr.replace("小时", "时");
+						item.useTimeStr = item.useTimeStr.replace("分钟", "'");
+						item.useTimeStr = item.useTimeStr.replace("秒", '"');
+						item.appointFee = '¥'+item.appointFee
+					})
 					this.$set(this, 'dataList', data.data)
 				}
 			},
@@ -322,7 +327,15 @@
 					data
 				} = await reportAppletReportBsEquipAppointTopList();
 				if (data.code == 200) {
-
+					data.data.forEach((item)=>{
+						item.orderDuration = item.orderDuration+'';
+						if (item.orderDuration.indexOf('.') != -1){
+							item.orderDuration = item.orderDuration.replace(".", "时");
+							item.orderDuration = item.orderDuration+"'";
+						}else{
+							item.orderDuration = item.orderDuration+"时";
+						}
+					})
 					this.$set(this, 'dataList2', data.data)
 				}
 			},

pages/views/dataBoard/equipmentControl.vue

@@ -259,7 +259,7 @@
 						list.push({
 							"name":item.lifeInterval,
 							"value": item.deviceNum,
-							"labelText":item.lifeInterval +item.deviceNum+item.unit+ item.deviceRate+'%',
+							"labelText":item.lifeInterval+' '+item.deviceNum+item.unit+' '+item.deviceRate+'%',
 							"textColor": "#fff",
 						})
 					})

pages/views/dataBoard/hazardousChemicals.vue

@@ -214,15 +214,16 @@
 
 		.chart {
 			width: 690rpx;
-			height: 850rpx;
+			// height: 850rpx;
 			background: #3E414F;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			padding: 24rpx 20rpx 0;
+			padding: 24rpx 20rpx 1rpx;
 			box-sizing: border-box;
 
 			.chart-t {
 				width: 650rpx;
 				height: 452rpx;
+				margin-bottom:20rpx;
 			}
 
 			.chart-b {

pages/views/dataBoard/resourceReservation.vue

@@ -105,7 +105,7 @@
 							startAngle: 1.5,
 							endAngle: 1.51,
 							gap: 2,
-							backgroundColor: "#3C3E4B",
+							backgroundColor: "#373745",
 							linearType:"custom",
 							customColor:["#FFCB00"],
 						}
@@ -129,7 +129,7 @@
 							startAngle: 1.5,
 							endAngle: 1.51,
 							gap: 2,
-							backgroundColor: "#3C3E4B",
+							backgroundColor: "#373745",
 							linearType:"custom",
 							customColor:["#03F1CA"],
 						}
@@ -154,7 +154,7 @@
 							startAngle: 1.5,
 							endAngle: 1.51,
 							gap: 2,
-							backgroundColor: "#3C3E4B",
+							backgroundColor: "#373745",
 							linearType:"custom",
 							customColor:["#01EBEE"],
 						}
@@ -178,7 +178,7 @@
 							startAngle: 1.5,
 							endAngle: 1.51,
 							gap: 2,
-							backgroundColor: "#3C3E4B",
+							backgroundColor: "#373745",
 							linearType:"custom",
 							customColor:["#01EBEE"],
 						}