修复一些问题

src/views/consumptionRecord/index.vue

@@ -39,12 +39,12 @@
 						</el-form>
 						<el-table :data="tableData" height="510" style="width: 100%" :cell-style="cell_style"
 							v-loading="loading" :header-cell-style="header_cell_style">
-							<el-table-column label="序号" align="center" width="90">
+							<el-table-column label="序号" align="center" width="80">
 								<template slot-scope="scope">
 									<span>{{(pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1}}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="姓名" align="center" width="100">
+							<el-table-column label="姓名" align="center" width="70">
 								<template slot-scope="scope">
 									<span>{{ scope.row.user_name }}</span>
 								</template>
@@ -59,12 +59,12 @@
 									<span>{{ scope.row.build }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="楼层" align="center" width="80">
+							<el-table-column label="楼层" align="center" width="60">
 								<template slot-scope="scope">
 									<span>{{ scope.row.floors }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="房间号" align="center" width="100">
+							<el-table-column label="房间号" align="center">
 								<template slot-scope="scope">
 									<span>{{ scope.row.dom }}</span>
 								</template>
@@ -84,18 +84,18 @@
 									<span>{{ scope.row.balance }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="支付状态" align="center" width="150">
+							<el-table-column label="支付状态" align="center" width="100">
 								<template slot-scope="scope">
 									<span v-if="scope.row.state == 1" class="txt-cell-green">支付成功</span>
 									<span v-else class="txt-cell-red">支付失败</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="交易流水号" align="center">
+							<el-table-column label="交易流水号" align="center" width="150">
 								<template slot-scope="scope">
 									<span>{{ scope.row.order_num }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="支付时间" align="center">
+							<el-table-column label="支付时间" align="center" width="160">
 								<template slot-scope="scope">
 									<span>{{ scope.row.time }}</span>
 								</template>
@@ -244,8 +244,23 @@
 					if (typeof res.rows !== 'undefined' && res.rows !== '') {
 						this.pagination.total = res.total
 						this.tableData = []
+						var item = {}
 						for (var i = 0; i < res.rows.length; i++) {
-							this.tableData.push(res.rows[i])
+							item = {
+								user_name: res.rows[i].user_name,
+								phone: res.rows[i].phone,
+								build: res.rows[i].build,
+								floors: res.rows[i].floors,
+								// dom: res.rows[i].air_name + ' ' + res.rows[i].air_ip,
+								dom: res.rows[i].dom.split('-')[1] + ' ' + res.rows[i].air_name + ' ' + res.rows[i].air_ip,
+								handler_state: res.rows[i].handler_state,
+								account: res.rows[i].account,
+								balance: res.rows[i].balance,
+								state: res.rows[i].state,
+								order_num: res.rows[i].order_num,
+								time: res.rows[i].time
+							}
+							this.tableData.push(item)
 						}
 					} else {
 						this.tableData = []

src/views/index/index.vue

@@ -62,7 +62,7 @@
 							</el-table-column>
 							<el-table-column prop="warningTime" label="告警时间" align="center">
 							</el-table-column>
-							<el-table-column prop="serviceTime" label="使用时长" align="center">
+							<el-table-column prop="durationUse" label="使用时长" align="center">
 							</el-table-column>
 							<el-table-column prop="contact" label="联系方式" align="center">
 							</el-table-column>
@@ -129,6 +129,7 @@
 		airRealTimeMonitor,
 		realTimeBusinessInformation
 	} from '@/api/index';
+	
 	import * as echarts from 'echarts/core';
 	import {
 		TitleComponent,
@@ -137,15 +138,17 @@
 		GridComponent,
 		LegendComponent
 	} from 'echarts/components';
-
 	import {
 		LineChart
 	} from 'echarts/charts';
-
 	import {
 		CanvasRenderer
 	} from 'echarts/renderers';
 
+	import {
+		getFormatDateTime
+	} from '@/utils/common';
+	
 	echarts.use([
 		TitleComponent, ToolboxComponent, TooltipComponent, GridComponent, LegendComponent, LineChart,
 		CanvasRenderer
@@ -480,7 +483,7 @@
 									.monthT[i].air_config,
 								warningTime: res.monthT[i].time,
 								operator: res.monthT[i].user_name,
-								serviceTime: res.monthT[i].auto_time,
+								durationUse: res.monthT[i].duration_use,
 								contact: res.monthT[i].phone
 							})
 						}
@@ -526,7 +529,7 @@
 			getThisMonthRecharge() {
 				this.showThisMonthRecharge.loading = true
 
-				thisMonthConsume().then((res) => {
+				thisMonthRecharge().then((res) => {
 					// console.log(res);
 					if (typeof res.code == 'undefined' || res.code == '') {
 						this.$message.error('返回数据格式问题，code未获取到！')
@@ -536,6 +539,9 @@
 					if (res.code == 200) {
 						this.showThisMonthRecharge.time = res.time
 						this.showThisMonthRecharge.amount = res.zongCo.tong
+					} else if (res.code == 205) {
+						this.showThisMonthRecharge.time = getFormatDateTime('datetime');
+						// this.$message.error('本月充值：' + res.message)
 					} else {
 						this.$message.error('本月充值返回的数据异常！')
 					}

src/views/serveAC/index.vue

@@ -88,12 +88,12 @@
 											element-loading-spinner="el-icon-loading"
 											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
 											:header-cell-style="setHeaderSellStyle">
-											<el-table-column label="名称" align="center">
+											<el-table-column label="名称" align="center" width="160">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="ID" align="center" width="130">
+											<el-table-column label="ID" align="center">
 												<template slot-scope="scope">
 													<span>{{ scope.row.ip }}</span>
 												</template>
@@ -168,12 +168,12 @@
 											element-loading-spinner="el-icon-loading"
 											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
 											:header-cell-style="setHeaderSellStyle">
-											<el-table-column label="名称" align="center">
+											<el-table-column label="名称" align="center" width="160">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="ID" align="center" width="130">
+											<el-table-column label="ID" align="center">
 												<template slot-scope="scope">
 													<span>{{ scope.row.ip }}</span>
 												</template>
@@ -250,12 +250,12 @@
 											element-loading-spinner="el-icon-loading"
 											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
 											:header-cell-style="setHeaderSellStyle">
-											<el-table-column label="名称" align="center">
+											<el-table-column label="名称" align="center" width="160">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="ID" align="center" width="130">
+											<el-table-column label="ID" align="center">
 												<template slot-scope="scope">
 													<span>{{ scope.row.ip }}</span>
 												</template>
@@ -330,12 +330,12 @@
 											element-loading-spinner="el-icon-loading"
 											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
 											:header-cell-style="setHeaderSellStyle">
-											<el-table-column label="名称" align="center">
+											<el-table-column label="名称" align="center" width="160">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="ID" align="center" width="130">
+											<el-table-column label="ID" align="center">
 												<template slot-scope="scope">
 													<span>{{ scope.row.ip }}</span>
 												</template>
@@ -401,7 +401,8 @@
 		<!-- 添加楼栋 -->
 		<el-dialog title="添加楼栋" custom-class="el-dialog-add-loudong" :visible.sync="dialog_add_loudong"
 			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('form_add_loudong')">
-			<el-form :model="form_add_loudong" ref="add_loudong_form" :rules="form_add_loudong_rules">
+			<!-- <el-form :model="form_add_loudong" ref="add_loudong_form" :rules="form_add_loudong_rules"> -->
+			<el-form :model="form_add_loudong" ref="add_loudong_form">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<span>{{form_add_loudong.school}}</span>
 				</el-form-item>
@@ -450,7 +451,8 @@
 		<!-- 添加房间 -->
 		<el-dialog title="新增房间" custom-class="el-dialog-add-room" :visible.sync="dialog_add_room"
 			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('form_add_room')">
-			<el-form :model="form_add_room" ref="add_room_form" :rules="form_add_room_rules">
+			<!-- <el-form :model="form_add_room" ref="add_room_form" :rules="form_add_room_rules"> -->
+			<el-form :model="form_add_room" ref="add_room_form">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_add_room.school}}</div>
 				</el-form-item>
@@ -512,7 +514,8 @@
 		<!-- 编辑房间 -->
 		<el-dialog title="编辑房间" custom-class="el-dialog-modify-room" :visible.sync="dialog_modify_room"
 			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('form_modify_room')">
-			<el-form :model="form_modify_room" ref="modify_room_form" :rules="form_modify_room_rules">
+			<!-- <el-form :model="form_modify_room" ref="modify_room_form" :rules="form_modify_room_rules"> -->
+			<el-form :model="form_modify_room" ref="modify_room_form">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_modify_room.school}}</div>
 				</el-form-item>
@@ -1118,7 +1121,7 @@
 						this.$message.error('返回数据格式问题，code未获取到！');
 						return;
 					}
-					console.log(res.data);
+					// console.log(res.data);
 					if (typeof res.data == 'undefined' || res.data == '') {
 						this.$message.error('返回数据格式问题，data未获取到！');
 						return;