heyang

pages/views/dataBoard/cagePosition.vue

@@ -55,6 +55,7 @@
 					legend: {
 						show: true,
 						position: "right",
+						fontColor:'#fff',
 					},
 					title: {
 						name: "",
@@ -97,7 +98,8 @@
 							opacity: 0.2,
 							max: 200,
 							labelShow: true,
-							border: true
+							border: true,
+							labelColor:'#fff',
 						}
 					}
 				},

pages/views/dataBoard/daYiReservation.vue

@@ -145,6 +145,7 @@
 					legend: {
 						show: true,
 						position: "right",
+						fontColor:'#fff',
 					},
 					title: {
 						name: "",
@@ -187,7 +188,8 @@
 							opacity: 0.2,
 							max: 200,
 							labelShow: true,
-							border: true
+							border: true,
+							labelColor:'#fff',
 						}
 					}
 				},

pages/views/dataBoard/equipmentControl.vue

@@ -90,16 +90,23 @@
 						disabled: true,
 						disableGrid: true,
 						axisLine: false,
+						fontColor:'#fff',
 					},
 					yAxis: {
 						disabled: false,
 						disableGrid: true,
-						data: [],
+						
+						data: [
+							{
+								type:'categories',
+							fontColor:'#fff',
+						}
+						],
 					},
 					extra: {
 						bar: {
 							type: "group",
-							width: 20,
+							width: 12,
 							meterBorde: 1,
 							meterFillColor: "#FFFFFF",
 							activeBgColor: "#000000",
@@ -215,22 +222,27 @@
 								"name": "5年内",
 								"value": 147,
 								"labelText":"5年内 147台 26%",
+								"textColor":"#fff",
 							}, {
 								"name": "10年内",
 								"value": 136,
 								"labelText":"10年内 136台 24%",
+								"textColor":"#fff",
 							}, {
 								"name": "12年内",
 								"value": 124,
 								"labelText":"12年内 124台 22%",
+								"textColor":"#fff",
 							}, {
 								"name": "20年内",
 								"value": 96,
 								"labelText":"20年内 96台 17%",
+								"textColor":"#fff",
 							}, {
 								"name": "超期服役",
 								"value": 67,
 								"labelText":"超期服役 67台 11%",
+								"textColor":"#fff",
 							}]
 						}]
 					};
@@ -245,16 +257,20 @@
 						series: [{
 							data: [{
 								"name": "13.2压力容器30%",
-								"value": 50
+								"value": 50,
+								"textColor":"#fff",
 							}, {
 								"name": "13.1起重类设备10%",
-								"value": 30
+								"value": 30,
+								"textColor":"#fff",
 							}, {
 								"name": "13.4加热及制冷装置管理40%",
-								"value": 20
+								"value": 20,
+								"textColor":"#fff",
 							}, {
 								"name": "13.3场（厂）内专用机动车辆20%",
-								"value": 18
+								"value": 18,
+								"textColor":"#fff",
 							}]
 						}]
 					};

pages/views/dataBoard/hazardSources.vue

@@ -43,7 +43,8 @@
 				</view>
 				<view class="table-tb" v-for="(item,index) in dataList" :key="index">
 					<view>
-						<text :class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+						<text
+							:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
 					</view>
 					<view>{{item.data1}}</view>
 					<view>{{item.data2}}</view>
@@ -77,11 +78,13 @@
 					legend: {
 						position: 'top',
 						legendShape: 'square',
+						fontColor: '#fff',
 					},
 					xAxis: {
 						disabled: true,
 						axisLine: false,
 						disableGrid: true,
+						fontColor: '#fff',
 					},
 					yAxis: {},
 					extra: {

pages/views/dataBoard/hazardousChemicals.vue

@@ -89,7 +89,7 @@
 					legend:{
 						show:false,
 					},
-					padding: [15, 15, 6, 15],
+					padding: [15, 85, 6, 5],
 					enableScroll: false,
 					extra: {
 						funnel: {
@@ -165,29 +165,29 @@
 						series: [{
 							data: [{
 								"name": "植物保护",
-								"centerText": "50",
 								"value": 50,
 								"labelText":"总量88.88kg",
+								"textColor":"#fff",
 							}, {
 								"name": "园林艺术",
-								"centerText": "30",
 								"value": 30,
-								"labelText":"总量88.88kg"
+								"labelText":"总量88.88kg",
+								"textColor":"#fff",
 							}, {
 								"name": "生命科学",
-								"centerText": "20",
 								"value": 20,
-								"labelText":"总量88.88kg"
+								"labelText":"总量88.88kg",
+								"textColor":"#fff",
 							}, {
 								"name": "理学院",
-								"centerText": "18",
 								"value": 18,
-								"labelText":"总量88.88kg"
+								"labelText":"总量88.88kg",
+								"textColor":"#fff",
 							}, {
 								"name": "农学院",
-								"centerText": "8",
 								"value": 8,
-								"labelText":"总量88.88kg"
+								"labelText":"总量88.88kg",
+								"textColor":"#fff",
 							}]
 						}]
 					};

pages/views/dataBoard/labPage.vue

@@ -118,6 +118,7 @@
 					dataPointShape: false,
 					legend: {
 						show: false,
+						fontColor:'#fff',
 					},
 					extra: {
 						tooltip: {
@@ -126,14 +127,14 @@
 					},
 					xAxis: {
 						disableGrid: true,
-						fontColor: '#999999',
+						fontColor: '#fff',
 					},
 					yAxis: {
 						gridType: "dash",
 						dashLength: 2,
 						data: [{
 							axisLine: false,
-							fontColor: '#999999',
+							fontColor: '#fff',
 						}]
 					},
 				},

pages/views/dataBoard/resourceReservation.vue

@@ -164,7 +164,8 @@
 							opacity: 0.2,
 							max: 200,
 							labelShow: true,
-							border: true
+							border: true,
+							labelColor:'#fff',
 						}
 					}
 				},

pages/views/dataBoard/securityHidden.vue

@@ -203,7 +203,8 @@
 							opacity: 0.2,
 							max: 200,
 							labelShow: true,
-							border: true
+							border: true,
+							labelColor:'#fff',
 						}
 					}
 				},
@@ -309,7 +310,7 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["维度1", "维度2", "维度3", "维度4", "维度5"],
+						categories: ["植物保护", "生命科学", "维度3", "维度4", "维度5"],
 						series: [{
 								name: "成交量1",
 								data: [90, 110, 165, 195, 187]

pages/views/login/login.vue

@@ -52,7 +52,7 @@
 			return {
 				identityStatus: 1,
 				// username:"dedsudiyu",//学生
-				username: "888", //教职工
+				username: "01", //教职工
 				password: "zd123456",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),