需求优化

src/api/serveAC.js

@@ -205,4 +205,12 @@ export function selAirsStatus(forData) {
 		method: 'post',
 		data
 	})
+}
+
+// 设备类型
+export function getDevices() {
+	return request({
+		url: '/airManage/fakequery.action',
+		method: 'post'
+	})
 }

src/router/index.js

@@ -176,6 +176,21 @@ export const constantRoutes = [{
 			}
 		}]
 	},
+	
+	{
+		path: '/systemLogging',
+		component: Layout,
+		redirect: '/systemLogging',
+		children: [{
+			path: 'systemLogging',
+			name: 'SystemSet',
+			component: () => import('@/views/systemLogging/index'),
+			meta: {
+				title: '操作日志',
+				icon: 'systemLogging'
+			}
+		}]
+	},
 	// 404页面 必须放在最后!!
 	{
 		path: '*',

src/store/getters.js

@@ -1,8 +1,10 @@
 const getters = {
-  sidebar: state => state.app.sidebar,
-  device: state => state.app.device,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name
+	sidebar: state => state.app.sidebar,
+	device: state => state.app.device,
+	token: state => state.user.token,
+	avatar: state => state.user.avatar,
+	name: state => state.user.name,
+	fullname: state => state.user.fullname,
+	phone: state => state.user.phone
 }
-export default getters
+export default getters

src/store/modules/user.js

@@ -17,7 +17,9 @@ const getDefaultState = () => {
 		token: getToken(),
 		name: '',
 		level: '',
-		avatar: ''
+		avatar: '',
+		fullname: '',
+		phone: ''
 	}
 }
 
@@ -33,6 +35,12 @@ const mutations = {
 	SET_NAME: (state, name) => {
 		state.name = name
 	},
+	SET_PHONE: (state, phone) => {
+		state.phone = phone
+	},
+	SET_FULLNAME: (state, fullname) => {
+		state.fullname = fullname
+	},
 	SET_PWD: (state, pwd) => {
 		state.pwd = pwd
 	},
@@ -65,13 +73,17 @@ const actions = {
 					setToken(token)
 					// 添加：
 					commit('SET_LEVEL', response.data[0].level)
-					commit('SET_NAME', username)
+					commit('SET_NAME', response.data[0].admin_name)
 					commit('SET_PWD', password)
+					commit('SET_PHONE', response.data[0].phone)
+					commit('SET_FULLNAME', response.data[0].fullname)
 				} else {
-					commit('SET_TOKEN')
-					commit('SET_LEVEL')
-					commit('SET_NAME')
-					commit('SET_PWD')
+					commit('SET_TOKEN', '')
+					commit('SET_LEVEL', '')
+					commit('SET_NAME', '')
+					commit('SET_PWD', '')
+					commit('SET_PHONE', '')
+					commit('SET_FULLNAME', '')
 				}
 				// commit('SET_TOKEN', data.token)
 				// setToken(data.token)
@@ -121,10 +133,12 @@ const actions = {
 			removeToken() // must remove  token  first
 			resetRouter()
 			commit('RESET_STATE')
-			commit('SET_NAME')
-			commit('SET_PWD')
-			commit('SET_LEVEL')
+			commit('SET_NAME', '')
+			commit('SET_PWD', '')
+			commit('SET_LEVEL', '')
 			commit('SET_TOKEN', '')
+			commit('SET_PHONE', '')
+			commit('SET_FULLNAME', '')
 			resolve()
 		})
 		// 修改：下面被注释了
@@ -157,4 +171,4 @@ export default {
 	state,
 	mutations,
 	actions
-}
+}

src/views/consumptionRecord/index.vue

@@ -17,7 +17,7 @@
 					<div class="cell-body">
 						<el-form :inline="true" :model="formInline" class="demo-form-inline">
 							<el-form-item label="关键字：">
-								<el-input v-model="formInline.user" placeholder="请输入姓名或身份证" clearable></el-input>
+								<el-input v-model="formInline.user" placeholder="请输入姓名" clearable></el-input>
 							</el-form-item>
 							<el-form-item>
 								<el-button type="warning" @click="btn_search">查询</el-button>

src/views/feilvSet/index.vue

@@ -4,10 +4,10 @@
 			<el-col :span="24">
 				<div class="cell">
 					<div class="cell-title">
-						<div class="title">费率管理</div>
+						<div class="title">费率设置</div>
 						<div class="title-right">
 							<!-- <el-button type="primary" @click="handler_download_excel">导出表单</el-button> -->
-							<el-button type="warning" @click="add_feilv">新增费率</el-button>
+							<!-- <el-button type="warning" @click="add_feilv">新增费率</el-button> -->
 						</div>
 					</div>
 					<div class="cell-body">
@@ -23,7 +23,7 @@
 									<span>{{ scope.row.air_config }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column label="费率(元)" align="center" width="180">
+							<el-table-column label="元/分钟" align="center" width="180">
 								<template slot-scope="scope">
 									<span>{{ scope.row.rate }}</span>
 								</template>
@@ -32,9 +32,9 @@
 								<template slot-scope="scope">
 									<el-button v-if="currentUserLevel == 2" size="mini" class="btn-table"
 										@click="modifyFeilv_dialog(scope.$index, scope.row)">修改</el-button>
-									<el-button size="mini" class="btn-table" type="danger"
+									<!-- <el-button size="mini" class="btn-table" type="danger"
 										@click="delete_feilv(scope.$index, scope.row)">
-										删除</el-button>
+										删除</el-button> -->
 								</template>
 							</el-table-column>
 						</el-table>
@@ -43,11 +43,11 @@
 			</el-col>
 		</el-row>
 		<!-- 新增费率对话框 -->
-		<el-dialog title="新增费率" custom-class="add-user-dialog" :visible.sync="dialogAddFeilvVisible"
+		<!-- <el-dialog title="新增费率" custom-class="add-user-dialog" :visible.sync="dialogAddFeilvVisible"
 			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('addFeilvForm')">
 			<el-form :model="addForm" ref="addFeilvForm" :rules="addFormRules">
 				<el-form-item label="型号：" :label-width="formLabelWidth" :required="true" prop="air_config">
-					<el-input v-model="addForm.air_config" autocomplete="off" maxlength="3" ref="airconfig_focus">
+					<el-input v-model="addForm.air_config" autocomplete="off" maxlength="6" ref="airconfig_focus">
 						<template slot="append">匹</template>
 					</el-input>
 				</el-form-item>
@@ -61,7 +61,7 @@
 				<el-button @click="dialogAddFeilvVisible = false">取 消</el-button>
 				<el-button type="primary" @click="handler_add_feilv">新 增</el-button>
 			</div>
-		</el-dialog>
+		</el-dialog> -->
 		<!-- 修改费率对话框 -->
 		<el-dialog title="修改费率" custom-class="modify-feilv-dialog" :visible.sync="dialogModifyFeilvVisible"
 			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('modifyForm')">
@@ -114,9 +114,9 @@
 					return callback(new Error('请输入型号，最多3位整数或小数！'));
 				}
 				setTimeout(() => {
-					var reg = /^[1-9]{1}$|^[1-9][\.][0-9]{1}$/
+					var reg = /^[1-9]{1}$|^[1-9][\.][0-9]{1}|^[\u4e00-\u9fa5]{1,3}[1-9][\.][0-9]{1}|^[\u4e00-\u9fa5]{1,3}[1-9]{1}$/
 					if (!reg.test(value)) {
-						callback(new Error('必须正整数或小数，如：1.5 或 5'));
+						callback(new Error('必须填写，格式如：1.5 或 5 或 天花机3'));
 					} else {
 						callback();
 					}

src/views/index/index.vue

@@ -16,7 +16,13 @@
 					<div class="cell-title">本月充值</div>
 					<div class="cell-time">截止时间为 {{ showThisMonthRecharge.time }}</div>
 					<div class="cell-bottom">
-						<div class="cell-bottom-amount">{{ showThisMonthRecharge.amount.toFixed(2) }}</div>
+						<div class="cell-footer">
+							<div class="cell-bottom-amount">{{ showThisMonthRecharge.amount.toFixed(2) }}</div>
+							<div class="cell-footer-amount">线上：{{ showThisMonthRecharge.online_amount.toFixed(2) }}
+							</div>
+							<div class="cell-footer-amount">线下：{{ showThisMonthRecharge.offline_amount.toFixed(2) }}
+							</div>
+						</div>
 						<div class="rmb2">¥</div>
 					</div>
 				</div>
@@ -129,7 +135,7 @@
 		airRealTimeMonitor,
 		realTimeBusinessInformation
 	} from '@/api/index';
-	
+
 	import * as echarts from 'echarts/core';
 	import {
 		TitleComponent,
@@ -148,7 +154,7 @@
 	import {
 		getFormatDateTime
 	} from '@/utils/common';
-	
+
 	echarts.use([
 		TitleComponent, ToolboxComponent, TooltipComponent, GridComponent, LegendComponent, LineChart,
 		CanvasRenderer
@@ -167,6 +173,8 @@
 				showThisMonthRecharge: {
 					time: '0000/00/00 00:00:00',
 					amount: 0.00,
+					online_amount: 0.00,
+					offline_amount: 0.00,
 					loading: false
 				},
 				// 本月消费
@@ -650,6 +658,21 @@
 							color: #292B34;
 						}
 
+						.cell-footer {
+							display: flex;
+							flex-direction: row;
+							justify-content: space-between;
+							align-items: flex-end;
+							font-family: Microsoft YaHei-3970(82674968);
+							font-weight: bold;
+							color: #292B34;
+
+							.cell-footer-amount {
+								font-size: 16px;
+								margin-left: 10px;
+							}
+						}
+
 						.rmb1 {
 							display: flex;
 							justify-content: center;
@@ -747,4 +770,4 @@
 			}
 		}
 	}
-</style>
+</style>

src/views/login/index.vue

@@ -111,6 +111,7 @@
 						this.loading = true
 						this.$store.dispatch('user/login', this.loginForm)
 							.then((res) => {
+								console.log(res);
 								if (res.code == 200) {
 									this.$router.push({
 										path: this.redirect || '/'

src/views/rechargeRecord/index.vue

@@ -8,6 +8,8 @@
 							<div class="title">充值记录</div>
 							<div class="title-detail">总余额：{{total_balance}}元</div>
 							<div class="title-detail">总充值：{{total_recharge}}元</div>
+							<div class="title-detail">线上：{{online_recharge}}元</div>
+							<div class="title-detail">线下：{{offline_recharge}}元</div>
 							<div class="title-detail">总交易笔数：{{total_number}}笔</div>
 						</div>
 						<div class="title-right">
@@ -31,9 +33,12 @@
 							</el-form-item>
 							<el-form-item label="">
 								<el-select v-model="formInline.state" placeholder="支付状态" @change="search_state_change">
-									<el-option label="已支付已到账" value="2"></el-option>
+									<!-- <el-option label="已支付已到账" value="2"></el-option>
 									<el-option label="已支付未到账" value="1"></el-option>
-									<el-option label="未支付" value="0"></el-option>
+									<el-option label="未支付" value="0"></el-option> -->
+									<el-option label="全部" value="0"></el-option>
+									<el-option label="线上" value="1"></el-option>
+									<el-option label="线下" value="2"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-form>
@@ -71,9 +76,17 @@
 							</el-table-column>
 							<el-table-column label="支付状态" align="center" width="150">
 								<template slot-scope="scope">
-									<span v-if="scope.row.state == 0" class="txt-cell-red">未支付</span>
+									<!-- <span v-if="scope.row.state == 0" class="txt-cell-red">未支付</span>
 									<span v-else-if="scope.row.state == 1" class="txt-cell-red">已支付未到账</span>
-									<span v-else class="txt-cell-green">已支付已到账</span>
+									<span v-else class="txt-cell-green">已支付已到账</span> -->
+									<!-- 线上 -->
+									<span v-if="scope.row.state == 1" class="txt-cell-green">充值己到账</span>
+									<span v-else-if="scope.row.state == 2" class="txt-cell-red">充值未到账</span>
+									<span v-else-if="scope.row.state == 3" class="txt-cell-red">未到账</span>
+									<!-- 线下 -->
+									<span v-else-if="scope.row.state == 4" class="txt-cell-green">补充</span>
+									<span v-else-if="scope.row.state == 5" class="txt-cell-green">赠送</span>
+									<span v-else class="txt-cell-red">未接收到值</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="交易流水号" align="center">
@@ -111,6 +124,8 @@
 			return {
 				total_balance: 0.0.toFixed(2), // 总余额
 				total_recharge: 0.0.toFixed(2), // 总充值
+				online_recharge: 0.0.toFixed(2), // 线上充值
+				offline_recharge: 0.0.toFixed(2), // 线下充值
 				total_number: 0, // 总交易笔数
 				formLabelWidth: '120px',
 				// 表格单元格样式
@@ -132,7 +147,7 @@
 					user: '',
 					startTime: '',
 					endTime: '',
-					state: '2'
+					state: '0'
 				},
 				tableData: [],
 				cond_data: {},

src/views/serveAC/index.vue

@@ -44,10 +44,12 @@
 					<div class="cell-title">
 						<div class="title-left">
 							<div class="title">{{currentData.title_any_where}} 空调管理</div>
-							<div class="title-detail">房间数：{{room_number}}间</div>
+							<div class="title-detail">房间：{{room_number}}间</div>
 							<div class="title-detail">设备：{{device_number}}台</div>
-							<div class="title-detail">已开启：{{open_number}}台</div>
-							<div class="title-detail">预警台数：{{warning_number}}台</div>
+							<div class="title-detail">离线：{{offline_device_number}}台</div>
+							<div class="title-detail">关机：{{shutdown_device_number}}台</div>
+							<div class="title-detail">已开：{{open_number}}台</div>
+							<div class="title-detail">预警：{{warning_number}}台</div>
 						</div>
 						<div class="title-right">
 							<el-button type="primary" @click="add_room">新增房间</el-button>
@@ -88,7 +90,7 @@
 											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" width="160">
+											<el-table-column label="名称" align="center" width="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
@@ -98,7 +100,7 @@
 													<span>{{ scope.row.ip }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="类型" align="center">
+											<el-table-column label="类型" align="center" width="85">
 												<template slot-scope="scope">
 													<span>{{ scope.row.device }}</span>
 												</template>
@@ -168,7 +170,7 @@
 											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" width="160">
+											<el-table-column label="名称" align="center" width="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
@@ -178,7 +180,7 @@
 													<span>{{ scope.row.ip }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="类型" align="center">
+											<el-table-column label="类型" align="center" width="85">
 												<template slot-scope="scope">
 													<span>{{ scope.row.device }}</span>
 												</template>
@@ -250,7 +252,7 @@
 											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" width="160">
+											<el-table-column label="名称" align="center" width="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
@@ -260,7 +262,7 @@
 													<span>{{ scope.row.ip }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="类型" align="center">
+											<el-table-column label="类型" align="center" width="85">
 												<template slot-scope="scope">
 													<span>{{ scope.row.device }}</span>
 												</template>
@@ -330,7 +332,7 @@
 											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" width="160">
+											<el-table-column label="名称" align="center" width="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
 												</template>
@@ -340,7 +342,7 @@
 													<span>{{ scope.row.ip }}</span>
 												</template>
 											</el-table-column>
-											<el-table-column label="类型" align="center">
+											<el-table-column label="类型" align="center" width="85">
 												<template slot-scope="scope">
 													<span>{{ scope.row.device }}</span>
 												</template>
@@ -451,8 +453,7 @@
 		<!-- 添加房间 -->
 		<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">
+			<el-form :model="form_add_room" ref="add_room_form" :rules="form_add_room_rules">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_add_room.school}}</div>
 				</el-form-item>
@@ -481,13 +482,13 @@
 					<div>{{form_add_device.school + ' / ' + form_add_device.build + ' / ' + form_add_device.floors}}
 					</div>
 				</el-form-item>
-				<el-form-item label="操作员：" :label-width="formLabelWidth" prop="cao" :required="true">
-					<el-input v-model="form_add_device.cao" autocomplete="off" placeholder="请输入操作员" ref="ref_cao"
+				<el-form-item label="操作员：" :label-width="formLabelWidth" prop="cao">
+					<el-input v-model="cao" autocomplete="off" placeholder="请输入操作员" ref="ref_cao" readonly=""
 						maxlength="10"></el-input>
 				</el-form-item>
-				<el-form-item label="手机号码：" :label-width="formLabelWidth" prop="contact" :required="true">
-					<el-input v-model="form_add_device.contact" autocomplete="off" placeholder="请输入手机号码"
-						ref="ref_contact" maxlength="11"></el-input>
+				<el-form-item label="手机号码：" :label-width="formLabelWidth" prop="contact">
+					<el-input v-model="contact" autocomplete="off" placeholder="请输入手机号码" ref="ref_contact"
+						maxlength="11" readonly=""></el-input>
 				</el-form-item>
 				<el-form-item label="设备名称：" :label-width="formLabelWidth" prop="deviceName" :required="true">
 					<el-input v-model="form_add_device.deviceName" autocomplete="off" placeholder="请输入设备名称"
@@ -514,8 +515,7 @@
 		<!-- 编辑房间 -->
 		<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">
+			<el-form :model="form_modify_room" ref="modify_room_form" :rules="form_modify_room_rules">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_modify_room.school}}</div>
 				</el-form-item>
@@ -578,9 +578,10 @@
 		delRooms,
 		startAirs,
 		stopAirs,
-		selAirsStatus
+		selAirsStatus,
+		getDevices
 	} from '@/api/serveAC'
-	const deviceOptions = ['1匹', '1.5匹', '2匹', '3匹', '天花机器（3匹）'];
+	var deviceOptions = [];
 	export default {
 		data() {
 			// var checkloudong = (rule, value, callback) => {
@@ -608,54 +609,59 @@
 						callback();
 					}
 				}, 100);
-			}
-			// var checkroom = (rule, value, callback) => {
+			};
+			var checkroom = (rule, value, callback) => {
+				if (!value) {
+					return callback(new Error('请输入房间号'));
+				}
+
+				setTimeout(() => {
+					callback();
+				}, 100);
+				// setTimeout(() => {
+				// 	var regH = /[\d]$/g;
+				// 	var floor = this.currentData.floor.replace(regH, '');
+				// 	var reg = /[1-9]{1}[0-9]{2,3}$/
+				// 	if (value.indexOf(floor)) {
+				// 		callback(new Error('房间号数字部分，必须以楼层号开头！'));
+				// 	} else if (!reg.test(value)) {
+				// 		callback(new Error('房间号数字部分，为3-4个数字，非0开头！栋号不需要添加！'));
+				// 	} else {
+				// 		callback();
+				// 	}
+				// }, 100);
+			};
+
+			// var checkCao = (rule, value, callback) => {
 			// 	if (!value) {
-			// 		return callback(new Error('请输入房间号'));
-			// 	}
+			// 		return callback(new Error('请输入操作员'));
+			// 	};
 
 			// 	setTimeout(() => {
-			// 		var regH = /[\d]$/g;
-			// 		var floor = this.currentData.floor.replace(regH, '');
-			// 		var reg = /[1-9]{1}[0-9]{2,3}$/
-			// 		if (value.indexOf(floor)) {
-			// 			callback(new Error('房间号数字部分，必须以楼层号开头！'));
-			// 		} else if (!reg.test(value)) {
-			// 			callback(new Error('房间号数字部分，为3-4个数字，非0开头！栋号不需要添加！'));
+			// 		var reg = /^[\u4e00-\u9fa5]{2,10}$/
+			// 		if (!reg.test(value)) {
+			// 			callback(new Error('必须为2-10个汉字！'));
 			// 		} else {
 			// 			callback();
 			// 		}
 			// 	}, 100);
-			// }
-			var checkCao = (rule, value, callback) => {
-				if (!value) {
-					return callback(new Error('请输入操作员'));
-				}
+			// };
 
-				setTimeout(() => {
-					var reg = /^[\u4e00-\u9fa5]{2,10}$/
-					if (!reg.test(value)) {
-						callback(new Error('必须为2-10个汉字！'));
-					} else {
-						callback();
-					}
-				}, 100);
-			}
-			var checkcontact = (rule, value, callback) => {
-				if (!value) {
-					return callback(new Error('请输入手机号码'));
-				}
+			// var checkcontact = (rule, value, callback) => {
+			// 	if (!value) {
+			// 		return callback(new Error('请输入手机号码'));
+			// 	};
 
-				setTimeout(() => {
-					var reg =
-						/^((13[0-9])|(14[0|5|6|7|9])|(15[0-3])|(15[5-9])|(16[6|7])|(17[2|3|5|6|7|8])|(18[0-9])|(19[1|8|9]))\d{8}$/
-					if (!reg.test(value)) {
-						callback(new Error('手机号码输入不规范！'));
-					} else {
-						callback();
-					}
-				}, 100);
-			}
+			// 	setTimeout(() => {
+			// 		var reg =
+			// 			/^((13[0-9])|(14[0|5|6|7|9])|(15[0-3])|(15[5-9])|(16[6|7])|(17[2|3|5|6|7|8])|(18[0-9])|(19[1|8|9]))\d{8}$/
+			// 		if (!reg.test(value)) {
+			// 			callback(new Error('手机号码输入不规范！'));
+			// 		} else {
+			// 			callback();
+			// 		}
+			// 	}, 100);
+			// };
 			var checkDeviceName = (rule, value, callback) => {
 				if (!value) {
 					return callback(new Error('请输入设备名称'));
@@ -669,7 +675,7 @@
 						callback();
 					}
 				}, 100);
-			}
+			};
 			var checkDeviceIp = (rule, value, callback) => {
 				if (!value) {
 					return callback(new Error('请输入设备IP/ID'));
@@ -683,17 +689,21 @@
 						callback();
 					}
 				}, 100);
-			}
+			};
 			var checkCheckedDevice = (rule, value, callback) => {
 				if (!value[0]) {
 					return callback(new Error('请选择设备类型'));
 				} else {
 					callback();
 				}
-			}
+			};
 			return {
+				cao: this.$store.state.user.name, // 操作员
+				contact: this.$store.state.user.phone,
 				room_number: 0, // 房间数量
 				device_number: 0, // 设备数量
+				offline_device_number: 0, // 离线数量
+				shutdown_device_number: 0, // 关机数量
 				open_number: 0, // 已开启
 				warning_number: 0, // 预警台数
 				search_datatime: '',
@@ -728,11 +738,11 @@
 					floor: '',
 					room: ''
 				},
-				// form_add_room_rules: { // 添加房间表单验证
-				// 	room: [{
-				// 		validator: checkroom
-				// 	}]
-				// },
+				form_add_room_rules: { // 添加房间表单验证
+					room: [{
+						validator: checkroom
+					}]
+				},
 				// 修改房间
 				dialog_modify_room: false,
 				form_modify_room: { // 修改房间数据
@@ -741,11 +751,11 @@
 					floor: '',
 					room: ''
 				},
-				// form_modify_room_rules: { // 修改房间表单验证
-				// 	room: [{
-				// 		validator: checkroom
-				// 	}]
-				// },
+				form_modify_room_rules: { // 修改房间表单验证
+					room: [{
+						validator: checkroom
+					}]
+				},
 				// 添加设备
 				dialog_add_device: false,
 				form_add_device: { // 添加设备数据
@@ -759,9 +769,7 @@
 					devices: deviceOptions,
 					duration_use: 0.00, // 使用时长
 					is_normal: '1', // 是否正常
-					is_on: '0', // 是否开启
-					cao: '', // 操作员
-					contact: ''
+					is_on: '0' // 是否开启
 				},
 				form_add_device_rules: {
 					deviceName: [{
@@ -773,12 +781,12 @@
 					checkedDevice: [{
 						validator: checkCheckedDevice
 					}],
-					cao: [{
-						validator: checkCao
-					}],
-					contact: [{
-						validator: checkcontact
-					}]
+					// cao: [{
+					// 	validator: checkCao
+					// }],
+					// contact: [{
+					// 	validator: checkcontact
+					// }]
 				},
 				dialog_operator_details: false, // 操作员详情
 				form_operator_details: { // 操作员详情数据
@@ -863,12 +871,38 @@
 					clearInterval(auto_click);
 				}
 			}, 200);
+
+			// 空调设备类型
+			this.get_Devices();
 		},
 		mounted() {
 			document.getElementsByClassName("el-pagination__jump")[0].childNodes[0].nodeValue = "跳至";
 		},
 		methods: {
 			/**
+			 * 获取费率列表数据
+			 */
+			get_Devices() {
+				// 开始发送请求，获取配置数据
+				getDevices().then((res) => {
+					// console.log(res.data);
+					if (res.code == 200) {
+						let resdata = res.data;
+						deviceOptions = []
+						for (var i = 0; i < resdata.length; i++) {
+							deviceOptions.push(resdata[i].air_config);
+						}
+						deviceOptions.sort((a, b) => a.localeCompare(b))
+					} else {
+						deviceOptions = [];
+						this.$message.warning('没有符合条件的数据！');
+					}
+				}).catch((err) => {
+					// console.log(err);
+					this.$message.error(err.message);
+				});
+			},
+			/**
 			 * 开关空调
 			 * @param {Object} roomIndex
 			 * @param {Object} rowIndex
@@ -966,7 +1000,7 @@
 			 * @param {Object} air_ip
 			 */
 			getAirsStatus(roomIndex, rowIndex, air_ip) {
-				console.log(roomIndex, rowIndex);
+				// console.log(roomIndex, rowIndex);
 				selAirsStatus({
 					air_ip: air_ip
 				}).then((res) => {
@@ -991,61 +1025,73 @@
 			 * 编辑修改房间
 			 */
 			dialog_modify_room_click(room) {
-				updateRooms({
-					school: this.form_modify_room.school,
-					build: this.form_modify_room.building,
-					floors: this.form_modify_room.floor,
-					dom: this.form_modify_room.room,
-					old_dom: room
-				}).then((res) => {
-					// console.log(res);
-					if (typeof res.code == 'undefined' || res.code == '') {
-						this.$message.error('返回数据格式问题，code未获取到！')
-						return
-					}
+				this.$refs["modify_room_form"].validate(validate => {
+					if (validate) {
+						updateRooms({
+							school: this.form_modify_room.school,
+							build: this.form_modify_room.building,
+							floors: this.form_modify_room.floor,
+							dom: this.form_modify_room.room,
+							old_dom: room
+						}).then((res) => {
+							// console.log(res);
+							if (typeof res.code == 'undefined' || res.code == '') {
+								this.$message.error('返回数据格式问题，code未获取到！')
+								return
+							}
 
-					if (res.code == 200) {
-						// 隐藏删除对话框
-						this.dialog_modify_room = false
-						// 更新本地变量中的房间
-						let tmp = this.navData
-						for (var i = 0; i < tmp.length; i++) {
-							if (tmp[i].label == this.form_modify_room.school && typeof tmp[i].children !==
-								'undefined' && tmp[i].children.length > 0) {
-								let tmp1 = tmp[i].children;
-								for (var j = 0; j < tmp1.length; j++) {
-									if (tmp1[j].label == this.form_modify_room.building && typeof tmp1[j]
-										.children !== 'undefined' && tmp1[j].children.length > 0) {
-										let tmp2 = tmp1[j].children;
-										for (var k = 0; k < tmp2.length; k++) {
-											if (tmp2[k].label == this.form_modify_room.floor &&
-												typeof tmp2[k]
-												.rooms !== 'undefined' && tmp2[k].rooms.length > 0) {
-												let tmp3 = tmp2[k].rooms;
-												for (var p = 0; p < tmp3.length; p++) {
-													if (tmp3[p] == room) {
-														this.navData[i].children[j].children[k].rooms[p] =
-															this
-															.form_modify_room.building + '-' + this
-															.form_modify_room.room;
+							if (res.code == 200) {
+								// 隐藏删除对话框
+								this.dialog_modify_room = false
+								// 更新本地变量中的房间
+								let tmp = this.navData
+								for (var i = 0; i < tmp.length; i++) {
+									if (tmp[i].label == this.form_modify_room.school && typeof tmp[i]
+										.children !==
+										'undefined' && tmp[i].children.length > 0) {
+										let tmp1 = tmp[i].children;
+										for (var j = 0; j < tmp1.length; j++) {
+											if (tmp1[j].label == this.form_modify_room.building &&
+												typeof tmp1[j]
+												.children !== 'undefined' && tmp1[j].children.length > 0) {
+												let tmp2 = tmp1[j].children;
+												for (var k = 0; k < tmp2.length; k++) {
+													if (tmp2[k].label == this.form_modify_room.floor &&
+														typeof tmp2[k]
+														.rooms !== 'undefined' && tmp2[k].rooms.length > 0
+													) {
+														let tmp3 = tmp2[k].rooms;
+														for (var p = 0; p < tmp3.length; p++) {
+															if (tmp3[p] == room) {
+																this.navData[i].children[j].children[k]
+																	.rooms[p] =
+																	this
+																	.form_modify_room.building + '-' + this
+																	.form_modify_room.room;
+															}
+														}
+														this.navData[i].children[j].children[k].rooms
+															.sort();
 													}
 												}
-												this.navData[i].children[j].children[k].rooms.sort();
 											}
 										}
 									}
 								}
+								// 自动点击
+								this.currentData.clickElement.click()
+							} else {
+								this.$message.error(res.message)
 							}
-						}
-						// 自动点击
-						this.currentData.clickElement.click()
+						}).catch((err) => {
+							// console.log(err);
+							this.$message.error(err.message)
+						})
 					} else {
-						this.$message.error(res.message)
+						this.$message.error('验证不通过')
+						return false
 					}
-				}).catch((err) => {
-					// console.log(err);
-					this.$message.error(err.message)
-				})
+				});
 			},
 			/**
 			 * 删除房间
@@ -1664,7 +1710,7 @@
 			 * @param {Object} row
 			 */
 			alarm_status_click(index, row) {
-				console.log(index, row);
+				// console.log(index, row);
 				this.form_operator_details.name = row.userName
 				this.form_operator_details.contact = row.contact
 				// 显示操作详情
@@ -1876,21 +1922,21 @@
 			 * @param {Object} room
 			 */
 			add_device(room) {
-				// this.$message.success(room)
-				this.currentData.addDevice = room
+				// this.$message.success(room);
+				this.currentData.addDevice = room;
 				// 填充数据
-				this.form_add_device.school = this.currentData.school
-				this.form_add_device.build = this.currentData.building
-				this.form_add_device.floors = this.currentData.floor
-				this.form_add_device.room = room
+				this.form_add_device.school = this.currentData.school;
+				this.form_add_device.build = this.currentData.building;
+				this.form_add_device.floors = this.currentData.floor;
+				this.form_add_device.room = room;
 				// 显示对话框
-				this.dialog_add_device = true
+				this.dialog_add_device = true;
 
 				setTimeout(() => {
 					this.$nextTick(() => {
-						this.$refs.ref_cao.focus()
-					})
-				}, 500)
+						this.$refs.ref_deviceName.focus();
+					});
+				}, 500);
 			},
 			/**
 			 * 操作编辑修改房间
@@ -1979,7 +2025,6 @@
 						duration_use: 0.00, // 使用时长
 						is_normal: '0', // 是否正常
 						is_on: '0', // 是否开启
-						cao: '' // 操作员
 					}
 				}
 
@@ -2211,8 +2256,11 @@
 						border-bottom: 1px solid #CCCCCC;
 
 						.title-left {
+							width: 88%;
 							display: flex;
+							justify-content: space-between;
 							align-items: center;
+							white-space: nowrap;
 
 							.title {
 								font-size: 22px;
@@ -2222,7 +2270,7 @@
 							}
 
 							.title-detail {
-								margin-left: 40px;
+								margin-left: 16px;
 								font-size: 18px;
 								font-family: Microsoft YaHei-3970(82674968);
 								color: #1A202B;
@@ -2371,7 +2419,7 @@
 												cursor: pointer;
 												color: #00ff00;
 											}
-											
+
 											.power-icon-off {
 												font-size: 22px;
 												cursor: pointer;
@@ -2585,7 +2633,7 @@
 		height: fit-content !important;
 		width: fit-content !important;
 	}
-	
+
 	.dialog-footer {
 		height: 68px !important;
 	}
@@ -2594,4 +2642,4 @@
 	.el-dialog-delete-air .el-dialog__header {
 		display: none !important;
 	}
-</style>
+</style>

src/views/systemLogging/index.vue

@@ -0,0 +1,508 @@
+<template>
+	<div class="app-container">
+		<el-row>
+			<el-col :span="24">
+				<div class="cell">
+					<div class="cell-title">
+						<div class="title-left">
+							<div class="title">操作日志</div>
+							<!-- <div class="title-detail">总余额：{{total_balance}}元</div>
+							<div class="title-detail">总充值：{{total_recharge}}元</div>
+							<div class="title-detail">总交易笔数：{{total_number}}笔</div> -->
+						</div>
+						<!-- <div class="title-right">
+							<el-button type="primary" @click="handler_download_excel">导出表单</el-button>
+						</div> -->
+					</div>
+					<div class="cell-body">
+						<el-form :inline="true" :model="formInline" class="demo-form-inline">
+							<el-form-item label="关键字：">
+								<el-input v-model="formInline.user" clearable placeholder="请输入姓名或身份证"></el-input>
+							</el-form-item>
+							<el-form-item>
+								<el-button type="warning" @click="btn_search">查询</el-button>
+							</el-form-item>
+							<el-form-item label="时间筛选：">
+								<el-date-picker v-model="search_datatime" type="datetimerange" align="right"
+									start-placeholder="开始日期" end-placeholder="结束日期" @change="search_datetime_change"
+									:default-time="['23:59:59', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss"
+									format="yyyy-MM-dd HH:mm:ss" clearable>
+								</el-date-picker>
+							</el-form-item>
+							<el-form-item label="">
+								<el-select v-model="formInline.re_state" clearable placeholder="请选择" @change="search_state_change">
+									<el-option label="补充" value="补充"></el-option>
+									<el-option label="赠送" value="赠送"></el-option>
+								</el-select>
+							</el-form-item>
+						</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="100">
+								<template slot-scope="scope">
+									<span>{{(pagination.currentPage - 1) * pagination.pageSize + scope.$index + 1}}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作账号" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.user_name }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作模块" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.phone }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作页面" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.account }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作时间" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.time }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作人IP" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.order_num }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="内容" align="center">
+								<template slot-scope="scope">
+									<span>{{ scope.row.balance }}</span>
+								</template>
+							</el-table-column>
+							<el-table-column label="操作" align="center">
+								<template slot-scope="scope">
+									<span v-if="scope.row.re_state == '补充'" class="txt-cell-green">{{ scope.row.re_state }}</span>
+									<span v-else class="txt-cell-red">{{ scope.row.re_state }}</span>
+								</template>
+							</el-table-column>
+						</el-table>
+						<div class="pagination-table">
+							<el-pagination @current-change="currentPageChange"
+								:current-page.sync="pagination.currentPage" :page-size="pagination.pageSize"
+								layout="prev, pager, next, jumper" :total="pagination.total">
+							</el-pagination>
+						</div>
+					</div>
+				</div>
+			</el-col>
+		</el-row>
+	</div>
+</template>
+
+<script>
+	import {
+		getThreeData,
+		getTableData,
+		downloadExcel
+	} from '@/api/operationRecord'
+	export default {
+		data() {
+			return {
+				// total_balance: 0.0.toFixed(2), // 总余额
+				// total_recharge: 0.0.toFixed(2), // 总充值
+				// total_number: 0, // 总交易笔数
+				formLabelWidth: '120px',
+				// 表格单元格样式
+				cell_style: {
+					color: '#1A202B',
+					'font-size': '14px',
+					'font-family': 'Microsoft YaHei-3970(82674968)'
+				},
+				// 表格头部样式
+				header_cell_style: {
+					background: '#E6ECFE',
+					color: '#1A202B',
+					'font-size': '16px',
+					'font-family': 'Microsoft YaHei-3970(82674968)'
+				},
+				search_datatime: '',
+				// 表单数据
+				formInline: {
+					user: '',
+					startTime: '',
+					endTime: '',
+					re_state: ''
+				},
+				tableData: [],
+				cond_data: {},
+				// 分页参数
+				pagination: {
+					currentPage: 1,
+					pageSize: 9,
+					total: 0
+				},
+				loading: true
+			}
+		},
+		created() {
+			// 获取3个数据
+			// this.get_three_data()
+			// 获取消费记录,表格数据
+			this.get_table_data('list')
+		},
+		mounted() {
+			document.getElementsByClassName("el-pagination__jump")[0].childNodes[0].nodeValue = "跳至";
+		},
+		methods: {
+			/**
+			 * 下载Excel表格
+			 */
+			// handler_download_excel() {
+			// 	this.get_condtion();
+			// 	// 开始发送请求，获取配置数据
+			// 	downloadExcel(this.cond_data).then((res) => {
+			// 		// console.log(res);
+			// 		if (typeof res.code == 'undefined' || res.code == '') {
+			// 			this.$message.error('返回数据格式问题，code未获取到！')
+			// 			return
+			// 		}
+
+			// 		if (res.code == 200) {
+			// 			this.$message.success('下载成功！')
+			// 			let xls = 'https://chtech.ncjti.edu.cn/air-conditioner-control/' + res.downurl
+			// 			window.open(xls)
+			// 		} else {
+			// 			this.$message.error(res.message)
+			// 		}
+			// 	}).catch((err) => {
+			// 		// console.log(err);
+			// 		this.$message.error(err.message)
+			// 	})
+			// },
+			/**
+			 * 选取的时间进行格式化，赋值给formInline
+			 */
+			search_datetime_change() {
+				// console.log(this.search_datatime);
+				if (this.search_datatime == null) {
+					this.formInline.startTime = ''
+					this.formInline.endTime = ''
+				} else {
+					this.formInline.startTime = this.search_datatime[0]
+					this.formInline.endTime = this.search_datatime[1]
+				}
+				// 刷新列表
+				this.get_table_data('search')
+			},
+			/**
+			 * 搜索状态
+			 */
+			search_state_change() {
+				// 刷新列表
+				this.get_table_data('search')
+			},
+			/**
+			 * 获取3个数据
+			 */
+			// get_three_data() {
+			// 	this.get_condtion();
+				
+			// 	getThreeData(this.cond_data).then((res) => {
+			// 		// console.log(res);
+			// 		if (res.code == 200) {
+			// 			this.total_balance = res.TotalYe.toFixed(2) // 总余额
+			// 			this.total_recharge = res.zongRecharge.toFixed(2) // 总消费
+			// 			this.total_number = res.zongRecord // 总交易笔数
+			// 		} else {
+			// 			this.$message.error(res.message)
+			// 		}
+			// 	}).catch((err) => {
+			// 		// console.log(err);
+			// 		this.$message.error(err.message)
+			// 	})
+			// },
+			/**
+			 * 获取消费记录,表格数据
+			 */
+			get_table_data(param) {
+				this.loading = true
+				this.get_condtion();
+				
+				let data = this.cond_data;
+				if (param == 'search') {
+					data.page = 1
+					this.pagination.currentPage = 1
+				}
+				// console.log(data);
+				getTableData(data).then((res) => {
+					// console.log(res);
+					if (typeof res.rows !== 'undefined' && res.rows !== '') {
+						this.pagination.total = res.total
+						this.tableData = []
+						for (var i = 0; i < res.rows.length; i++) {
+							this.tableData.push(res.rows[i])
+						}
+					} else {
+						this.tableData = []
+						this.$message.warning('没有符合条件的数据！')
+					}
+				}).catch((err) => {
+					// console.log(err);
+					this.$message.error(err.message)
+				});
+				this.loading = false;
+
+				// if (param == 'search') {
+				// 	this.get_three_data();
+				// }
+			},
+			/**
+			 * 条件
+			 */
+			get_condtion() {
+				let data = {
+					page: this.pagination.currentPage,
+					rows: this.pagination.pageSize
+				}
+				if (this.formInline.user !== '') {
+					data.name_card = this.formInline.user
+				}
+				if (this.formInline.startTime !== '') {
+					data.start_time = this.formInline.startTime
+				}
+				if (this.formInline.endTime !== '') {
+					data.end_time = this.formInline.endTime
+				}
+				if (this.formInline.re_state !== '') {
+					data.re_state = this.formInline.re_state
+				}
+				
+				this.cond_data = data;
+			},
+			/**
+			 * 搜索
+			 */
+			btn_search() {
+				this.get_table_data('search')
+			},
+			/**
+			 * currentPage 改变时会触发
+			 * @param {Object} val
+			 */
+			currentPageChange(val) {
+				this.pagination.currentPage = val
+				this.get_table_data('pages')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.app-container {
+		background-color: #EFF2F7;
+		padding: 10px;
+
+		.el-row {
+
+			.el-col {
+				padding: 10px;
+
+				.cell {
+					padding: 30px;
+					border-radius: 10px;
+					background-color: #FFFFFF;
+					// box-shadow: 5px 5px 15px #979797;
+					box-shadow: 0px 3px 21px 0px rgba(60, 108, 254, 0.16);
+
+					.cell-title {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						margin-bottom: 30px;
+						padding-bottom: 30px;
+						border-bottom: 1px solid #CCCCCC;
+
+						.title-left {
+							display: flex;
+							align-items: center;
+
+							.title {
+								font-size: 22px;
+								font-family: Microsoft YaHei-3970(82674968);
+								font-weight: bold;
+								color: #1A202B;
+							}
+
+							.title-detail {
+								margin-left: 50px;
+								font-size: 18px;
+								font-family: Microsoft YaHei-3970(82674968);
+								color: #1A202B;
+							}
+						}
+
+						.title-right {
+							display: flex;
+							justify-content: space-between;
+							align-items: center;
+
+							.el-button {
+								width: 110px;
+								height: 46px;
+								background: #2B4CFE;
+								font-size: 18px;
+								color: #FFFFFF;
+								font-family: Microsoft YaHei-3970(82674968);
+								border-radius: 5px;
+							}
+
+							.el-button--warning {
+								background: #F88A64;
+							}
+						}
+					}
+
+					.cell-body {
+
+						.el-form {
+							display: flex;
+							flex-wrap: wrap;
+							align-items: center;
+
+							.el-button--warning {
+								background: #F88A64;
+							}
+
+							.el-date-editor--datetimerange {
+								padding: 3px 8px;
+								width: 370px;
+							}
+
+							.el-select {
+								width: 130px;
+							}
+						}
+
+						.btn-cell-blue {
+							color: #2B4CFE;
+							border: none;
+							font-size: 18px;
+						}
+
+						.btn-cell-black {
+							color: #53575A;
+							border: none;
+							font-size: 18px;
+						}
+
+						.txt-cell-green {
+							color: #67C23A;
+						}
+
+						.txt-cell-red {
+							color: #F56C6C;
+							font-size: 16px;
+						}
+
+						.pagination-table {
+							display: flex;
+							justify-content: flex-end;
+							align-items: center;
+							height: 30px;
+							margin-top: 20px;
+							padding-right: 100px;
+
+							::v-deep .el-pagination {
+								display: flex;
+								justify-content: flex-end;
+								align-items: center;
+							}
+
+							::v-deep .el-pagination ul {
+								display: flex;
+
+							}
+
+							::v-deep .el-pagination button,
+							::v-deep .el-pagination li {
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								width: 50px;
+								height: 36px;
+								border: 1px solid #626262;
+								border-radius: 3px;
+								font-size: 14px;
+								margin: 0 5px;
+							}
+
+							::v-deep .el-pagination span {
+								margin-left: 10px;
+							}
+
+							::v-deep .el-pagination .el-pagination__jump {
+								font-size: 16px;
+							}
+
+							::v-deep .el-pagination .el-pagination__editor {
+								width: 50px;
+								height: 36px;
+								margin: 0 5px;
+							}
+
+							::v-deep .el-pagination .el-input__inner {
+								width: 50px;
+								height: 36px;
+								border: 1px solid #626262;
+								margin: -4px 0 0 0;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		::v-deep .el-dialog {
+			margin: 0 !important;
+			width: 400px;
+			height: 320px;
+			background: #FFFFFF;
+			box-shadow: 0px 0px 13px 0px rgba(0, 0, 0, 0.29);
+			border-radius: 10px;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+
+			.el-dialog__header {
+				display: flex;
+				align-items: center;
+				width: 100%;
+				height: 58px;
+				padding: 30px;
+				background: #E6EBFE;
+				border-radius: 10px 10px 0px 0px;
+				font-weight: bold;
+			}
+
+			.el-dialog__body {
+				padding-bottom: 0;
+
+				.el-form-item {
+					margin-bottom: 0;
+
+					.el-form-item__label,
+					.el-form-item__content {
+						font-size: 16px;
+						font-family: Microsoft YaHei-3970(82674968);
+						color: #53575A;
+					}
+
+					.el-input__inner {
+						width: 100px;
+					}
+				}
+			}
+		}
+	}
+</style>

src/views/systemSet/index.vue

@@ -10,7 +10,7 @@
 					</div>
 					<div class="cell-body">
 						<el-form ref="formData" :rules="formRules" :model="formData">
-							<el-form-item prop="one">
+							<!-- <el-form-item prop="one">
 								<span>空调开启每分钟为</span>
 								<el-input v-model="formData.one" maxlength="4" placeholder="请输入金额"></el-input>
 								<span>元</span>
@@ -18,7 +18,7 @@
 							<el-form-item prop="isauto">
 								<span>自动扣款</span>
 								<el-switch v-model="formData.isauto" active-color="#2B4CFE"></el-switch>
-							</el-form-item>
+							</el-form-item> -->
 							<el-form-item prop="start_tiao">
 								<span>账户余额少于</span>
 								<el-input v-model="formData.start_tiao" maxlength="4" placeholder="请输入金额"></el-input>
@@ -43,11 +43,11 @@
 								<el-input v-model="formData.overtime" maxlength="2" placeholder="请输入小时数"></el-input>
 								<span>小时预警</span>
 							</el-form-item>
-							<el-form-item prop="end_jian">
+							<!-- <el-form-item prop="end_jian">
 								<span>开启空调后</span>
 								<el-input v-model="formData.end_jian" maxlength="2" placeholder="请输入秒数"></el-input>
 								<span>秒可以关闭</span>
-							</el-form-item>
+							</el-form-item> -->
 							<el-form-item prop="phone">
 								<span>使用问题联系方式</span>
 								<el-input v-model="formData.phone" placeholder="请输入手机号" maxlength="11"