heyang

api/request/config.js

@@ -4,10 +4,10 @@ const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
-	 base_url: 'http://192.168.1.17:8080',//小飞
+	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
-	// base_url: 'http://192.168.1.39:8080',//高升
+	 base_url: 'http://192.168.1.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试

pages/views/dataBoard/equipmentControl.vue

@@ -68,8 +68,8 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-
-	} from '@/pages_basics/api/index.js'
+		reportAppletReportApiDeviceStatGetDeviceStat
+	} from '@/pages/api/index.js'
 	export default {
 		name: "equipmentControl",
 		components: {
@@ -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,
 					},
@@ -192,11 +190,25 @@
 
 		},
 		mounted() {
+			this.reportAppletReportApiDeviceStatGetDeviceStat();
 			this.getServerData();
 			this.getServerDataTow();
 			this.getServerDataThree();
 		},
 		methods: {
+			async reportAppletReportApiDeviceStatGetDeviceStat() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiDeviceStatGetDeviceStat();
+				if (data.code == 200) {
+					/* this.dataList = data.data.warningList;
+					this.$set(self, 'todayTotal', data.data.warning.todayTotal);
+					this.$set(self, 'yesterdayTotal', data.data.warning.yesterdayTotal);
+					this.$set(self, 'rate', data.data.warning.rate);
+			 */
+				}
+			},
 			getServerData() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -221,28 +233,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 +270,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",
 							}]
 						}]
 					};