heyang

pages/views/dataBoard/cagePosition.vue

@@ -48,7 +48,7 @@
 				opts: {
 					rotate: false,
 					rotateLock: false,
-					color: ["#10C139", "#FF8400", "#0183FA", "#EE6666", "#73C0DE", "#3CA272", ],
+					color: ["#10C139", "#C42EFF", "#FF8400", "#19B6B6", "#0283FA", "#3CA272", ],
 					padding: [5, 5, 5, 5],
 					dataLabel: true,
 					enableScroll: false,
@@ -68,6 +68,7 @@
 							ringWidth: 10,
 							centerColor: '#3E414F',
 							activeOpacity: 0.5,
+							customRadius:46,
 							activeRadius: 20,
 							offsetAngle: 0,
 							labelWidth: 15,
@@ -151,18 +152,26 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "生物实验室",
+								"name": "维修",
 								"value": 50,
 								"labelShow": false
 							}, {
-								"name": "动物实验室",
+								"name": "预约",
 								"value": 30,
 								"labelShow": false
 							}, {
-								"name": "兽医实验室",
+								"name": "空闲",
 								"value": 20,
 								"labelShow": false
-							}, ]
+							}, {
+								"name": "消杀",
+								"value": 20,
+								"labelShow": false
+							}, {
+								"name": "锁定",
+								"value": 20,
+								"labelShow": false
+							},]
 						}]
 					};
 					this.chartData = JSON.parse(JSON.stringify(res));

pages/views/dataBoard/daYiReservation.vue

@@ -5,7 +5,7 @@
 			<view class="chart-t">
 				<viwe class="chart-t-l">
 					<text>设备总数：</text>
-					<text>333</text>
+					<text>325</text>
 				</viwe>
 				<viwe class="chart-tab">
 					<view class="chart-tab-li" :class="chartTabIndex==index?'tab-A':'tab-B'"
@@ -280,15 +280,15 @@
 					let res = {
 						series: [{
 							data: [{
-								"name": "压力容器",
+								"name": "预约",
 								"value": 50,
 								"labelShow": false
 							}, {
-								"name": "浓缩设备",
+								"name": "空闲",
 								"value": 30,
 								"labelShow": false
 							}, {
-								"name": "高压灭菌锅",
+								"name": "锁定",
 								"value": 20,
 								"labelShow": false
 							}, ]

pages/views/dataBoard/equipmentControl.vue

@@ -90,18 +90,16 @@
 						disabled: true,
 						disableGrid: true,
 						axisLine: false,
-						fontColor:'#fff',
+						fontColor: '#fff',
 					},
 					yAxis: {
 						disabled: false,
 						disableGrid: true,
-						
-						data: [
-							{
-								type:'categories',
-							fontColor:'#fff',
-						}
-						],
+
+						data: [{
+							type: 'categories',
+							fontColor: '#fff',
+						}],
 					},
 					extra: {
 						bar: {
@@ -136,7 +134,7 @@
 				},
 				chartDataTow: {},
 				optsThree: {
-					color: ["#10C139", "#FF8400", "#00FFE6", "#0183FA", "#73C0DE", "#3CA272",],
+					color: ["#10C139", "#FF8400", "#00FFE6", "#0183FA", "#73C0DE", "#3CA272", ],
 					legend: {
 						show: false,
 					},
@@ -221,28 +219,28 @@
 							data: [{
 								"name": "5年内",
 								"value": 147,
-								"labelText":"5年内 147台 26%",
-								"textColor":"#fff",
+								"labelText": "5年内 147台 26%",
+								"textColor": "#fff",
 							}, {
 								"name": "10年内",
 								"value": 136,
-								"labelText":"10年内 136台 24%",
-								"textColor":"#fff",
+								"labelText": "10年内 136台 24%",
+								"textColor": "#fff",
 							}, {
 								"name": "12年内",
 								"value": 124,
-								"labelText":"12年内 124台 22%",
-								"textColor":"#fff",
+								"labelText": "12年内 124台 22%",
+								"textColor": "#fff",
 							}, {
 								"name": "20年内",
 								"value": 96,
-								"labelText":"20年内 96台 17%",
-								"textColor":"#fff",
+								"labelText": "20年内 96台 17%",
+								"textColor": "#fff",
 							}, {
 								"name": "超期服役",
 								"value": 67,
-								"labelText":"超期服役 67台 11%",
-								"textColor":"#fff",
+								"labelText": "超期服役 67台 11%",
+								"textColor": "#fff",
 							}]
 						}]
 					};
@@ -258,19 +256,19 @@
 							data: [{
 								"name": "13.2压力容器30%",
 								"value": 50,
-								"textColor":"#fff",
+								"textColor": "#fff",
 							}, {
 								"name": "13.1起重类设备10%",
 								"value": 30,
-								"textColor":"#fff",
+								"textColor": "#fff",
 							}, {
 								"name": "13.4加热及制冷装置管理40%",
 								"value": 20,
-								"textColor":"#fff",
+								"textColor": "#fff",
 							}, {
 								"name": "13.3场（厂）内专用机动车辆20%",
 								"value": 18,
-								"textColor":"#fff",
+								"textColor": "#fff",
 							}]
 						}]
 					};

pages/views/dataBoard/hazardSources.vue

@@ -72,7 +72,15 @@
 						disableGrid: true,
 						fontColor: '#fff',
 					},
-					yAxis: {},
+					yAxis: {
+						disabled: false,
+						disableGrid: true,
+						
+						data: [{
+							type: 'categories',
+							fontColor: '#fff',
+						}],
+					},
 					extra: {
 						bar: {
 							type: "stack",

pages/views/dataBoard/hazardousChemicals.vue

@@ -25,7 +25,7 @@
 		</view>
 		<view class="small-title">
 			<view class="small-title-l">危化品存量排行TOP5</view>
-			<img class="small-title-r" src="@/pages/images/icon_wdwg_gd.png">
+			<!-- <img class="small-title-r" src="@/pages/images/icon_wdwg_gd.png"> -->
 		</view>
 		<view class="chart">
 			<view class="chart-t">

pages/views/dataBoard/securityHidden.vue

@@ -379,7 +379,7 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["植物保护", "生命科学", "维度3", "维度4", "维度5"],
+						categories: ["化学安全", "化学生物", "化学安全", "化学安全", "化学安全"],
 						series: [{
 								name: "成交量1",
 								data: [90, 110, 165, 195, 187]