heyang

pages/api/index.js

@@ -286,6 +286,38 @@ export const reportAppletReportBsEquipDangerList  = (data) => {
         data: {...data}
     })
 };
+//设备管控-超期服役设备-统计
+export const reportAppletReportApiEquipOverdueList  = (data) => {
+    return apiResquest({
+        url: `/report/applet/reportApiEquipOverdue/list`,
+        method: 'GET',
+        data: data,
+    })
+};
+//设备管控-设备使用寿命-统计
+export const reportAppletReportApiEquipLifeList  = (data) => {
+    return apiResquest({
+        url: `/report/applet/reportApiEquipLife/list`,
+        method: 'GET',
+        data: data,
+    })
+};
+//设备管控-超期服役设备-列表
+export const reportAppletReportApiEquipOverdueGetLifePageList  = (data) => {
+    return apiResquest({
+        url: `/report/applet/reportApiEquipOverdue/getLifePageList`,
+        method: 'GET',
+        data: data,
+    })
+};
+//设备管控-设备使用寿命-列表
+export const reportAppletReportApiEquipLifeGetReportBsEquipLifeList  = (data) => {
+    return apiResquest({
+         url: `/report/applet/reportApiEquipLife/getReportBsEquipLifeList`,
+        method: 'POST',
+        data: {...data}
+    })
+};
 //大仪预约-使用使用排行TOP10
 export const reportAppletReportApiEquipRankTopList  = (data) => {
     return apiResquest({
@@ -310,6 +342,23 @@ export const reportAppletReportBsEquipStatusList  = (data) => {
         data: data,
     })
 };
+
+//笼位预约概况
+export const reportAppletReportApiCageRateList  = (data) => {
+    return apiResquest({
+        url: `/report/applet/reportApiCageRate/list`,
+        method: 'GET',
+        data: data,
+    })
+};
+//资源预约情况
+export const reportAppletReportApiResourceRateResourceList  = (data) => {
+    return apiResquest({
+        url: `/report/applet/reportApiResourceRate/resourceList`,
+        method: 'GET',
+        data: data,
+    })
+};
 /************************扫码相关************************/
 
 //化学品终端-扫码登录

pages/views/dataBoard/cagePosition.vue

@@ -5,7 +5,7 @@
 			<view class="chart-t">
 				<viwe class="chart-t-l">
 					<text>笼位总数：</text>
-					<text>879</text>
+					<text>{{totalAppointNum}}</text>
 				</viwe>
 				<viwe class="chart-tab">
 					<view class="chart-tab-li" :class="chartTabIndex==index?'tab-A':'tab-B'"
@@ -18,10 +18,11 @@
 		</view>
 		<view class="small-title">
 			<view class="small-title-l">安全隐患统计</view>
-		</view>
-		<view class="small-title-tow">
-			<view class="small-title-tow-l">安全检查校级巡查计划标题标题标题标题标题</view>
-			<img class="small-title-tow-r" src="@/pages/images/dataBoard/icon_06.png">
+			<viwe class="chart-tab-tow">
+				<view class="chart-tab-li" :class="chartTabIndexThree==index?'tab-A':'tab-B'"
+					v-for="(item,index) in chartTabListThree" :key="index" @click="chartTabClickThree(index)">{{item}}
+				</view>
+			</viwe>
 		</view>
 		<view class="chart-tow">
 			<view class="chart-tow-b">
@@ -36,8 +37,9 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-
-	} from '@/pages_basics/api/index.js'
+	reportAppletReportApiCageRateList,
+	reportAppletReportBsEquipDangerList
+	} from '@/pages/api/index.js'
 	export default {
 		name: "cagePosition",
 		components: {
@@ -132,6 +134,10 @@
 					},
 				],
 				total: 0,
+				chartTabListThree: ['年度', '季度', '月度'],
+				chartTabIndexThree: 0,
+				type:1,//1年2季度3月度
+				totalAppointNum:0,
 			}
 		},
 		created() {
@@ -141,56 +147,76 @@
 
 		},
 		mounted() {
-			this.getServerData()
-			this.getServerDataTow()
+			this.reportAppletReportApiCageRateList()
+			this.reportAppletReportBsEquipDangerList()
 		},
 		methods: {
-			getServerData() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+			//隐患统计
+			async reportAppletReportApiCageRateList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiCageRateList({
+					type: this.type
+				});
+				if (data.code == 200) {
+					let list = [];
+					this.totalAppointNum=data.data.totalAppointNum;
+					list.push({
+						"name": "维修",
+						"value": data.data.reportBsCageRateList[0].repairNum,
+						"labelShow": false
+					}, {
+						"name": "预约",
+						"value": data.data.reportBsCageRateList[0].appointNum,
+						"labelShow": false
+					}, {
+						"name": "空闲",
+						"value": data.data.reportBsCageRateList[0].freeNum,
+						"labelShow": false
+					}, {
+						"name": "消杀",
+						"value": data.data.reportBsCageRateList[0].killNum,
+						"labelShow": false
+					}, {
+						"name": "锁定",
+						"value": data.data.reportBsCageRateList[0].lockedNum,
+						"labelShow": false
+					})
 					let res = {
 						series: [{
-							data: [{
-								"name": "维修",
-								"value": 50,
-								"labelShow": false
-							}, {
-								"name": "预约",
-								"value": 30,
-								"labelShow": false
-							}, {
-								"name": "空闲",
-								"value": 20,
-								"labelShow": false
-							}, {
-								"name": "消杀",
-								"value": 20,
-								"labelShow": false
-							}, {
-								"name": "锁定",
-								"value": 20,
-								"labelShow": false
-							},]
+							data: list
 						}]
 					};
 					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
+				}
 			},
-			getServerDataTow() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+			async reportAppletReportBsEquipDangerList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportBsEquipDangerList({dangerType:'2',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 res = {
-						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
+						categories: list,
 						series: [{
-			 				name: "",
-			 				data: [90, 110, 165, 195, 187]
-			  		}
+								name: "",
+								data: list2
+							},
 						]
 					};
 					this.chartDataTow = JSON.parse(JSON.stringify(res));
-				}, 500);
+				}
 			},
 			chartTabClick(index) {
 				this.chartTabIndex = index;
@@ -198,6 +224,11 @@
 			chartTabClickTow(index) {
 				this.chartTabIndexTow = index;
 			},
+			chartTabClickThree(index) {
+				this.chartTabIndexThree = index;
+				this.statisticsType = index+1;
+				this.reportAppletReportBsEquipDangerList();
+			},
 		},
 	}
 </script>

pages/views/dataBoard/daYiReservation.vue

@@ -64,6 +64,7 @@
 		reportAppletReportBsEquipStatusList,
 		reportAppletReportApiEquipRankTopList,
 		reportAppletReportBsEquipAppointTopList,
+		reportAppletReportBsEquipDangerList,
 	} from '@/pages/api/index.js'
 	export default {
 		name: "daYiReservation",
@@ -203,6 +204,7 @@
 				total: 0,
 				type:1,//type为1 按费用,2.按照机时,3.按照样品
 				deviceTotal:0,
+				statisticsType:1,//1.年度2.季度3.月度
 			}
 		},
 		created() {
@@ -215,10 +217,38 @@
 			this.reportAppletReportBsEquipStatusList()
 			this.reportAppletReportApiEquipRankTopList()
 			this.reportAppletReportBsEquipAppointTopList()
-			//this.getServerData()
-			this.getServerDataTow()
+			this.reportAppletReportBsEquipDangerList()
+			//this.getServerDataTow()
 		},
 		methods: {
+			//隐患统计
+			async reportAppletReportBsEquipDangerList() {
+				let self = this;
+				const {
+					data
+				} = 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 res = {
+						categories: list,
+						series: [{
+								name: "",
+								data: list2
+							},
+						]
+					};
+					this.chartDataTow = JSON.parse(JSON.stringify(res));
+				}
+			},
 			//设备总数
 			async reportAppletReportBsEquipStatusList() {
 				let self = this;
@@ -269,30 +299,7 @@
 					this.$set(this,'dataList2',data.data)
 				}
 			},
-			getServerData() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						series: [{
-							data: [{
-								"name": "预约",
-								"value": 50,
-								"labelShow": false
-							}, {
-								"name": "空闲",
-								"value": 30,
-								"labelShow": false
-							}, {
-								"name": "锁定",
-								"value": 20,
-								"labelShow": false
-							}, ]
-						}]
-					};
-					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
-			},
+			
 			getServerDataTow() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -318,9 +325,11 @@
 			},
 			chartTabClickThree(index) {
 				this.chartTabIndexThree = index;
-				this.type = index+1;
-				this.reportAppletReportApiEquipRankTopList();
+				this.statisticsType = index+1;
+				this.reportAppletReportBsEquipDangerList();
 			},
+			
+			
 		},
 	}
 </script>

pages/views/dataBoard/equipmentControl.vue

@@ -40,11 +40,16 @@
 		<view class="small-title">
 			<view class="small-title-l">特种设备与常规冷热设备安全隐患统计</view>
 		</view>
-		<view class="small-title-tow">
-			<view class="small-title-tow-l">安全检查校级巡查计划标题标题标题标题标题</view>
-			<img class="small-title-tow-r" src="@/pages/images/dataBoard/icon_06.png">
-		</view>
 		<view class="chart-three">
+			<view class="small-title-three">
+				<view class="small-title-l"></view>
+				<viwe class="chart-tab-tow">
+					<view class="chart-tab-li" :class="chartTabIndexThree==index?'tab-A':'tab-B'"
+						v-for="(item,index) in chartTabListThree" :key="index" @click="chartTabClickThree(index)">
+						{{item}}
+					</view>
+				</viwe>
+			</view>
 			<view class="chart-three-b">
 				<qiun-data-charts type="pie" :opts="optsThree" :echartsH5="true" :chartData="chartDataThree" />
 			</view>
@@ -72,6 +77,8 @@
 		reportAppletReportApiDeviceStatGetDeviceStat,
 		reportAppletReportBsEquipDangerCheckList,
 		reportAppletReportBsEquipDangerList,
+		reportAppletReportApiEquipOverdueList,
+		reportAppletReportApiEquipLifeList,
 	} from '@/pages/api/index.js'
 	export default {
 		name: "equipmentControl",
@@ -164,7 +171,9 @@
 				newlyAddToday: 0,
 				overdueDeviceNum: 0,
 				totalDeviceNum: 0,
-				statisticsType:1,//1.年度2.季度3.月度
+				statisticsType: 1, //1.年度2.季度3.月度
+				chartTabListThree: ['年度', '季度', '月度'],
+				chartTabIndexThree: 0,
 			}
 		},
 		created() {
@@ -177,11 +186,92 @@
 			this.reportAppletReportApiDeviceStatGetDeviceStat();
 			this.reportAppletReportBsEquipDangerCheckList();
 			this.reportAppletReportBsEquipDangerList();
-			this.getServerData();
-			this.getServerDataTow();
-			this.getServerDataThree();
+			this.reportAppletReportApiEquipOverdueList();
+			this.reportAppletReportApiEquipLifeList();
+			//this.getServerData();
+			//this.getServerDataTow();
 		},
 		methods: {
+			//隐患统计
+			async reportAppletReportBsEquipDangerList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportBsEquipDangerList({
+					dangerType: '3',
+					statisticsType: this.statisticsType
+				});
+				if (data.code == 200) {
+					let list = [];
+					data.data.subjectList.forEach(function(item, index) {
+						if (index < 5) {
+							list.push({
+								"name": item.subjectName,
+								"value": item.dangerNum,
+								"textColor": "#fff",
+							})
+						}
+
+					})
+
+					let res = {
+						series: [{
+							data: list
+						}]
+					};
+					this.chartDataThree = JSON.parse(JSON.stringify(res));
+				}
+			},
+			//超期服役统计
+			async reportAppletReportApiEquipOverdueList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiEquipOverdueList();
+				if (data.code == 200) {
+					let list = [];
+					let list2 = [];
+					data.data.forEach(function(item, index) {
+						list.push(item.deptName)
+						list2.push(item.deviceNum)
+					})
+
+					let res = {
+						categories: list,
+						series: [{
+							name: "目标值",
+							textColor: '#fff',
+							data: list2
+						}, ]
+					};
+					this.chartData = JSON.parse(JSON.stringify(res));
+				}
+			},
+			//设备使用寿命统计
+			async reportAppletReportApiEquipLifeList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiEquipLifeList();
+				if (data.code == 200) {
+					let list = [];
+					data.data.forEach(function(item, index) {
+						list.push({
+							"name":item.lifeInterval,
+							"value": item.deviceNum,
+							"labelText":item.lifeInterval +item.deviceNum+item.unit+ item.deviceRate+'%',
+							"textColor": "#fff",
+						})
+					})
+			
+					let res = {
+						series: [{
+							data: list
+						}]
+					};
+					this.chartDataTow = JSON.parse(JSON.stringify(res));
+				}
+			},
 			async reportAppletReportApiDeviceStatGetDeviceStat() {
 				let self = this;
 				const {
@@ -203,16 +293,6 @@
 					this.$set(self, 'dataList', data.data);
 				}
 			},
-			//特种设备与常规冷热设备安全隐患统计
-			async reportAppletReportBsEquipDangerList() {
-				let self = this;
-				const {
-					data
-				} = await reportAppletReportBsEquipDangerList({dangerType:'1',statisticsType:this.statisticsType});
-				if (data.code == 200) {
-					
-				}
-			},
 			getServerData() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -265,34 +345,7 @@
 					this.chartDataTow = JSON.parse(JSON.stringify(res));
 				}, 500);
 			},
-			getServerDataThree() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						series: [{
-							data: [{
-								"name": "13.2压力容器30%",
-								"value": 50,
-								"textColor": "#fff",
-							}, {
-								"name": "13.1起重类设备10%",
-								"value": 30,
-								"textColor": "#fff",
-							}, {
-								"name": "13.4加热及制冷装置管理40%",
-								"value": 20,
-								"textColor": "#fff",
-							}, {
-								"name": "13.3场（厂）内专用机动车辆20%",
-								"value": 18,
-								"textColor": "#fff",
-							}]
-						}]
-					};
-					this.chartDataThree = JSON.parse(JSON.stringify(res));
-				}, 500);
-			},
+
 			dateClick(index) {
 				this.dateIndex = index;
 			},
@@ -307,6 +360,11 @@
 					});
 				}
 			},
+			chartTabClickThree(index) {
+				this.chartTabIndexThree = index;
+				this.statisticsType = index + 1;
+				this.reportAppletReportBsEquipDangerList();
+			},
 		},
 	}
 </script>
@@ -392,6 +450,7 @@
 
 		}
 
+
 		.chart {
 			width: 690rpx;
 			height: 476rpx;
@@ -447,12 +506,66 @@
 
 		}
 
+		.small-title-three {
+			height: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 24rpx 30rpx;
+
+			.small-title-l {
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				line-height: 45rpx;
+			}
+
+			.chart-tab-tow {
+				width: 300rpx;
+				height: 50rpx;
+				border-radius: 25rpx;
+				overflow: hidden;
+				border: 1rpx solid #52545F;
+				display: flex;
+				justify-content: flex-start;
+
+				.chart-tab-li {
+					width: 100rpx;
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #999999;
+					line-height: 50rpx;
+					text-align: center;
+				}
+
+				.chart-tab-li:nth-of-type(1) {
+					border-right: 1rpx solid #52545F;
+				}
+
+				.chart-tab-li:nth-of-type(2) {
+					border-right: 1rpx solid #52545F;
+				}
+
+				.tab-A {
+					color: #FFFFFF;
+					background: #0183FA;
+				}
+
+				.tab-B {
+					color: #999999;
+					background: none;
+				}
+
+			}
+		}
+
 		.chart-three {
 			width: 690rpx;
-			height: 394rpx;
+			height: 509rpx;
 			background: #3E414F;
 			border-radius: 20rpx 20rpx 0rpx 0rpx;
 			margin: 34rpx 30rpx 0;
+			overflow: hidden;
 
 			.chart-three-b {
 				width: 690rpx;

pages/views/dataBoard/equipmentControlOverdue.vue

@@ -1,53 +1,58 @@
 <!-- 数据看板-设备管控-超期服役排行 -->
 <template>
-	<view class="equipmentControl">
-		<!-- 超期服役排行 -->
-		<view class="table" v-if="pageType==1">
-			<view class="table-border">
-				<view class="table-th">
-					<view class="table-th-li">
-						<view>排行</view>
-						<view>学院单位</view>
-						<view>设备总数(台)</view>
-						<view>超期服役数(台)</view>
+	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+		<view class="equipmentControl">
+			<!-- 超期服役排行 -->
+			<view class="table" v-if="pageType==1">
+				<view class="table-border">
+					<view class="table-th">
+						<view class="table-th-li">
+							<view>排行</view>
+							<view>学院单位</view>
+							<view>设备总数(台)</view>
+							<view>超期服役数(台)</view>
+						</view>
 					</view>
-				</view>
-				<view class="table-tb">
-					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>
-							<text :class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+					<view class="table-tb">
+						<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
+							<view>
+								<text
+									:class="index==0?'sortOne':(index==1?'sortTow':(index==2?'sortThree':'sortFive'))">{{index+1}}</text>
+							</view>
+							<view>{{item.deptName}}</view>
+							<view>{{item.deviceNum}}</view>
+							<view>{{item.extendedService}}</view>
 						</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<!-- 设备使用寿命 -->
-		<view class="table-tow" v-if="pageType==2">
-			<view class="table-border">
-				<view class="table-th">
-					<view class="table-th-li">
-						<view>学院单位</view>
-						<view>5年内(台)</view>
-						<view>10年内(台)</view>
-						<view>12年内(台)</view>
-						<view>20年内(台)</view>
+			<!-- 设备使用寿命 -->
+			<view class="table-tow" v-if="pageType==2">
+				<view class="table-border">
+					<view class="table-th">
+						<view class="table-th-li">
+							<view>学院单位</view>
+							<view>5年内(台)</view>
+							<view>10年内(台)</view>
+							<view>12年内(台)</view>
+							<view>20年内(台)</view>
+						</view>
 					</view>
-				</view>
-				<view class="table-tb">
-					<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
-						<view>{{item.data1}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
-						<view>{{item.data2}}</view>
+					<view class="table-tb">
+						<view class="table-tb-li" v-for="(item,index) in dataList" :key="index">
+							<view>{{item.deptName}}</view>
+							<view>{{item.fiveYears}}</view>
+							<view>{{item.tenYears}}</view>
+							<view>{{item.twelveYears}}</view>
+							<view>{{item.twentyYears}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
+			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</view>
-	</view>
+		
+	</scroll-view>
 </template>
 
 <script>
@@ -55,8 +60,9 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-
-	} from '@/pages_basics/api/index.js'
+		reportAppletReportApiEquipOverdueGetLifePageList,
+		reportAppletReportApiEquipLifeGetReportBsEquipLifeList
+	} from '@/pages/api/index.js'
 	export default {
 		name: "equipmentControl",
 		components: {
@@ -70,43 +76,9 @@
 					page: 1,
 					pageSize: 10,
 				},
-				dataList: [{
-						data1: '植物保护',
-						data2: '499',
-						data3: '47',
-						data4: '220',
-						data5: '137',
-					},
-					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
-					},
-					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
-					},
-					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
-					},
-					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
-					},
-				],
+				dataList: [],
 				total: 0,
+				getDataType:false,
 			}
 		},
 		onLoad(option) {
@@ -116,9 +88,9 @@
 					uni.setNavigationBarTitle({
 						title: '超期服役排行'
 					})
-				}else if(this.pageType == 2){
+				} else if (this.pageType == 2) {
 					uni.setNavigationBarTitle({
-						title:'设备使用寿命统计'
+						title: '设备使用寿命统计'
 					})
 				}
 			}
@@ -129,8 +101,73 @@
 		beforeMount() {
 
 		},
-		mounted() {},
+		mounted() {
+			if (this.pageType == 1) {
+				this.getList();
+			} else if (this.pageType == 2) {
+				this.getListTow();
+			}
+		},
 		methods: {
+			//滚动事件
+			scrollGet() {
+				let self = this;
+				if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
+					this.$set(this, 'getDataType', true);
+				} else {
+					this.queryParams.page += 1;
+					this.$nextTick(() => {
+						if (this.pageType == 1) {
+							this.getList();
+						} else if (this.pageType == 2) {
+							this.getListTow();
+						}
+					})
+				}
+			},
+			async getList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiEquipOverdueGetLifePageList(this.queryParams);
+				if (data.code == 200) {
+					if (self.queryParams.page == 1) {
+						this.dataList = data.data.records;
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.dataList = [...this.dataList, ...data.data.records]
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
+				}
+			},
+			async getListTow() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiEquipLifeGetReportBsEquipLifeList(this.queryParams);
+				if (data.code == 200) {
+					if (self.queryParams.page == 1) {
+						this.dataList = data.data.records;
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.dataList = [...this.dataList, ...data.data.records]
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
+				}
+			},
+			
 			dateClick(index) {
 				this.dateIndex = index;
 			},
@@ -139,6 +176,10 @@
 </script>
 
 <style lang="stylus" scoped>
+	.info-max-box{
+		height: 100%;
+		width: 100%;
+	}
 	.equipmentControl {
 		height: 100%;
 		width: 100%;
@@ -244,6 +285,7 @@
 			}
 
 		}
+
 		.sortOne {
 			display: inline-block;
 			width: 40rpx;
@@ -258,7 +300,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortTow {
 			display: inline-block;
 			width: 40rpx;
@@ -273,7 +315,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortThree {
 			display: inline-block;
 			width: 40rpx;
@@ -288,7 +330,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
-		
+
 		.sortFive {
 			display: inline-block;
 			width: 40rpx;
@@ -303,6 +345,7 @@
 			text-align: center;
 			border-radius: 20rpx;
 		}
+
 		.table-tow {
 			width: 750rpx;
 
@@ -380,4 +423,11 @@
 
 		}
 	}
+	.get-data-null-p {
+		text-align: center;
+		height: 100rpx;
+		line-height: 100rpx;
+		color: #999;
+		padding-bottom:200rpx;
+	}
 </style>

pages/views/dataBoard/resourceReservation.vue

@@ -23,6 +23,9 @@
 					<view class="chart-b-t-li">
 						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData3" />
 					</view>
+					<view class="chart-b-t-li">
+						<qiun-data-charts type="arcbar" :opts="opts3" :chartData="chartData3" />
+					</view>
 				</view>
 				<view class="chart-b-b">
 					<view class="chart-b-li">
@@ -37,6 +40,10 @@
 						<view>总数：230 </view>
 						<view>预约数：60</view>
 					</view>
+					<view class="chart-b-li">
+						<view>总数：230 </view>
+						<view>预约数：60</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -60,8 +67,9 @@
 		config
 	} from '@/api/request/config.js'
 	import {
-
-	} from '@/pages_basics/api/index.js'
+		reportAppletReportApiResourceRateResourceList,
+		reportAppletReportBsEquipDangerList
+	} from '@/pages/api/index.js'
 	export default {
 		name: "resourceReservation",
 		components: {
@@ -70,7 +78,7 @@
 		data() {
 			return {
 				opts: {
-					color: ["#fff",],
+					color: ["#fff", ],
 					padding: undefined,
 					title: {
 						name: "温室",
@@ -95,7 +103,7 @@
 				},
 				chartData: {},
 				opts2: {
-					color: ["#fff",],
+					color: ["#fff", ],
 					padding: undefined,
 					title: {
 						name: "温室",
@@ -120,7 +128,7 @@
 				},
 				chartData2: {},
 				opts3: {
-					color: ["#fff",],
+					color: ["#fff", ],
 					padding: undefined,
 					title: {
 						name: "温室",
@@ -165,7 +173,7 @@
 							max: 200,
 							labelShow: true,
 							border: true,
-							labelColor:'#fff',
+							labelColor: '#fff',
 						}
 					}
 				},
@@ -206,12 +214,25 @@
 
 		},
 		mounted() {
+			
+			this.reportAppletReportApiResourceRateResourceList();
 			this.getServerData();
 			this.getServerData2();
 			this.getServerData3();
 			this.getServerDataTow();
 		},
 		methods: {
+			async reportAppletReportApiResourceRateResourceList() {
+				let self = this;
+				const {
+					data
+				} = await reportAppletReportApiResourceRateResourceList({
+					type: this.type
+				});
+				if (data.code == 200) {
+					
+				}
+			},
 			getServerData() {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {
@@ -367,18 +388,18 @@
 
 			.chart-b {
 				width: 690rpx;
-				height: 300rpx;
+				height: 600rpx;
 				padding: 0 30rpx;
 				box-sizing: border-box;
 
 				.chart-b-t {
 					display: flex;
 					justify-content: flex-start;
+					flex-wrap: wrap;
 					width: 690rpx;
-
 					.chart-b-t-li {
-						width: 210rpx;
-						height: 210rpx;
+						width: 310rpx;
+						height: 310rpx;
 					}
 				}