界面优化显示

src/layout/components/Navbar.vue

@@ -1,8 +1,6 @@
 <template>
 	<div class="navbar">
 		<hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-		<!-- 路由路径 -->
-		<!-- <breadcrumb class="breadcrumb-container" /> -->
 		<div class="title-container-index">
 			<div class="index-top-title">
 				<img src="../../icons/images/login/logo_login.png" alt="">
@@ -32,29 +30,6 @@
 					<div class="right-exit">退出</div>
 				</div>
 			</div>
-
-			<!-- <div class="right-menu">
-				<el-dropdown class="avatar-container" trigger="click">
-					<div class="avatar-wrapper">
-						<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
-						<i class="el-icon-caret-bottom" />
-					</div>
-					<el-dropdown-menu slot="dropdown" class="user-dropdown">
-						<router-link to="/">
-							<el-dropdown-item>个人中心</el-dropdown-item>
-						</router-link>
-						<a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
-							<el-dropdown-item>项目地址</el-dropdown-item>
-						</a>
-						<a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
-							<el-dropdown-item>Docs</el-dropdown-item>
-						</a>
-						<el-dropdown-item divided @click.native="logout">
-							<span style="display:block;">退出登录</span>
-						</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div> -->
 		</div>
 	</div>
 </template>

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,95 +1,98 @@
 <template>
-  <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
-        </el-menu-item>
-      </app-link>
-    </template>
+	<div v-if="!item.hidden">
+		<template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
+			<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
+				<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
+					<item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
+				</el-menu-item>
+			</app-link>
+		</template>
 
-    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
-      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
-      </template>
-      <sidebar-item
-        v-for="child in item.children"
-        :key="child.path"
-        :is-nest="true"
-        :item="child"
-        :base-path="resolvePath(child.path)"
-        class="nest-menu"
-      />
-    </el-submenu>
-  </div>
+		<el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+			<template slot="title">
+				<item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+			</template>
+			<sidebar-item v-for="child in item.children" :key="child.path" :is-nest="true" :item="child" :base-path="resolvePath(child.path)"
+				class="nest-menu" />
+		</el-submenu>
+	</div>
 </template>
 
 <script>
-import path from 'path'
-import { isExternal } from '@/utils/validate'
-import Item from './Item'
-import AppLink from './Link'
-import FixiOSBug from './FixiOSBug'
+	import path from 'path'
+	import {
+		isExternal
+	} from '@/utils/validate'
+	import Item from './Item'
+	import AppLink from './Link'
+	import FixiOSBug from './FixiOSBug'
 
-export default {
-  name: 'SidebarItem',
-  components: { Item, AppLink },
-  mixins: [FixiOSBug],
-  props: {
-    // route object
-    item: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    },
-    basePath: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
-    // TODO: refactor with render function
-    this.onlyOneChild = null
-    return {}
-  },
-  methods: {
-    hasOneShowingChild(children = [], parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
+	export default {
+		name: 'SidebarItem',
+		components: {
+			Item,
+			AppLink
+		},
+		mixins: [FixiOSBug],
+		props: {
+			// route object
+			item: {
+				type: Object,
+				required: true
+			},
+			isNest: {
+				type: Boolean,
+				default: false
+			},
+			basePath: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			// To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
+			// TODO: refactor with render function
+			this.onlyOneChild = null
+			return {}
+		},
+		methods: {
+			hasOneShowingChild(children = [], parent) {
+				const showingChildren = children.filter(item => {
+					if (item.hidden) {
+						return false
+					} else {
+						// Temp set(will be used if only has one showing child)
+						this.onlyOneChild = item
+						return true
+					}
+				})
 
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
+				// When there is only one child router, the child router is displayed by default
+				if (showingChildren.length === 1) {
+					return true
+				}
 
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
+				// Show parent if there are no child router to display
+				if (showingChildren.length === 0) {
+					this.onlyOneChild = {
+						...parent,
+						path: '',
+						noShowingChildren: true
+					}
+					return true
+				}
 
-      return false
-    },
-    resolvePath(routePath) {
-      if (isExternal(routePath)) {
-        return routePath
-      }
-      if (isExternal(this.basePath)) {
-        return this.basePath
-      }
-      return path.resolve(this.basePath, routePath)
-    }
-  }
-}
-</script>
+				return false
+			},
+			resolvePath(routePath) {
+				if (isExternal(routePath)) {
+					return routePath
+				}
+				if (isExternal(this.basePath)) {
+					return this.basePath
+				}
+				return path.resolve(this.basePath, routePath)
+			}
+		}
+	}
+</script>

src/styles/sidebar.scss

@@ -66,7 +66,7 @@
     .el-menu {
       border: none;
       height: 100%;
-      width: 93% !important;
+      // width: 100% !important;
 	  margin: 0 auto;
 	  
 	  li {
@@ -111,11 +111,11 @@
     }
 	// 添加
 	.router-link-exact-active.router-link-active {
-		border-radius: 10px !important;
+		// border-radius: 10px !important;
 		background: linear-gradient(0deg, #2B4CFE, #3E6EFF) !important;
 		
 		.el-menu-item.is-active {
-			border-radius: 10px !important;
+			// border-radius: 10px !important;
 			background: linear-gradient(0deg, #2B4CFE, #3E6EFF) !important;
 		}
 	}
@@ -136,6 +136,7 @@
 
       .el-tooltip {
         padding: 0 !important;
+		left: -5px !important;
 
         .svg-icon {
           margin-left: 20px;

src/views/index/index.vue

@@ -46,9 +46,8 @@
 							<img src="../../icons/images/index/zoushi.png" alt="">
 							<span>用电消费走势图</span>
 						</div>
-						<el-date-picker v-model="showEchartsDate" @change="echartsDate_change" class="select-year"
-							type="year" :picker-options="pickerOptions" :clearable="false" :editable="false"
-							value-format="yyyy" placeholder="年份">
+						<el-date-picker v-model="showEchartsDate" @change="echartsDate_change" class="select-year" type="year" :picker-options="pickerOptions"
+							:clearable="false" :editable="false" value-format="yyyy" placeholder="年份">
 						</el-date-picker>
 						<div id="main-echart" class="line-echart"></div>
 					</el-card>
@@ -61,9 +60,8 @@
 							<img src="../../icons/images/index/yujing.png" alt="">
 							<span>超时预警</span>
 						</div>
-						<el-table :data="yujing_tableData" height="350" stripe :cell-style="cell_style"
-							v-loading="airTimeoutWarning_loading" :header-cell-style="header_cell_style"
-							style="width: 100%">
+						<el-table :data="yujing_tableData" height="350" stripe :cell-style="cell_style" v-loading="airTimeoutWarning_loading"
+							:header-cell-style="header_cell_style" style="width: 100%">
 							<el-table-column prop="deviceId" label="设备号" align="center">
 							</el-table-column>
 							<el-table-column prop="warningTime" label="告警时间" align="center">
@@ -87,9 +85,8 @@
 							<img src="../../icons/images/index/yewu.png" alt="">
 							<span>实时业务信息</span>
 						</div>
-						<el-table :data="yewu_tableData" height="350" stripe :cell-style="handle_cell_style"
-							:header-cell-style="header_cell_style" v-loading="realTimeBusinessInformation_loading"
-							style="width: 100%" :show-header="false">
+						<el-table :data="yewu_tableData" height="350" stripe :cell-style="handle_cell_style" :header-cell-style="header_cell_style"
+							v-loading="realTimeBusinessInformation_loading" style="width: 100%" :show-header="false">
 							<el-table-column prop="desc" label="说明" align="left">
 							</el-table-column>
 							<el-table-column prop="dataTime" label="时间" align="right">
@@ -112,10 +109,9 @@
 								<div class="card-desc">A/B=已开机/总设备</div>
 							</div>
 						</div>
-						<el-table :data="zhuangtai_tableData" height="350" stripe :cell-style="cell_style"
-							:header-cell-style="header_cell_style" style="width: 100%"
-							v-loading="airRealTimeMonitor_loading">
-							<el-table-column v-for="col in cols" :prop="col.prop" :label="col.label" :align="col.align">
+						<el-table :data="zhuangtai_tableData" height="350" stripe :cell-style="cell_style" :header-cell-style="header_cell_style"
+							style="width: 100%" v-loading="airRealTimeMonitor_loading">
+							<el-table-column v-for="col in cols" :prop="col.prop" :label="col.label" :align="col.align" :width="col.width">
 							</el-table-column>
 						</el-table>
 					</el-card>
@@ -220,11 +216,7 @@
 				air_on_total: 0,
 				air_total: 0,
 				// 列
-				cols: [{
-					prop: 'floor',
-					label: '楼层',
-					align: "center"
-				}],
+				cols: [],
 				// 折线图数据
 				option: {
 					tooltip: {
@@ -347,7 +339,9 @@
 						let rowData = {};
 						let columns = [{
 							prop: 'floor',
-							label: '楼层'
+							label: '楼层',
+							align: "center",
+							width: 40
 						}];
 						for (var i = 0; i < data.length; i++) {
 							rowData = {
@@ -360,7 +354,8 @@
 								} else {
 									columns.push({
 										prop: `Build_${j}`,
-										label: data[i][j].build
+										label: data[i][j].build,
+										align: "center"
 									});
 								}
 							}

src/views/serveAC/index.vue

@@ -9,18 +9,14 @@
 							<i v-if="item0.isShow" class="el-icon-arrow-down"></i>
 							<i v-else class="el-icon-arrow-right"></i>
 						</div>
-						<div class="item-loudong" v-for="(item1, index1) in item0.children" :key="index1"
-							:style="{display: item0.isShow ? '' : 'none'}">
-							<div class="loudong"
-								@click="loudong_toggle(item1.id + '|' + item0.id, item1.label + '|'+ item0.label)">
+						<div class="item-loudong" v-for="(item1, index1) in item0.children" :key="index1" :style="{display: item0.isShow ? '' : 'none'}">
+							<div class="loudong" @click="loudong_toggle(item1.id + '|' + item0.id, item1.label + '|'+ item0.label)">
 								<div class="louidong_text" :title="item1.label">{{item1.label}}</div>
 								<i v-if="item1.isShow" class="el-icon-arrow-down"></i>
 								<i v-else class="el-icon-arrow-right"></i>
 							</div>
-							<div class="item-louceng" v-for="(item2, index2) in item1.children" :key="index2"
-								:style="{display: item1.isShow ? '' : 'none'}">
-								<div :id="`louceng${index0}${index1}${index2}`" class="louceng"
-									:class="louceng_click_id == item2.id ? 'louceng-clicked' : '' "
+							<div class="item-louceng" v-for="(item2, index2) in item1.children" :key="index2" :style="{display: item1.isShow ? '' : 'none'}">
+								<div :id="`louceng${index0}${index1}${index2}`" class="louceng" :class="louceng_click_id == item2.id ? 'louceng-clicked' : '' "
 									@click="louceng_click($event, item2.id + '|' + item1.id + '|' + item0.id, item2.label + '|' + item1.label + '|'+ item0.label, item2.rooms)">
 									{{item2.label}}
 								</div>
@@ -31,8 +27,7 @@
 								<div class="loudong-add-louceng-txt">添加楼层</div>
 							</div>
 						</div>
-						<div class="add-loudong" @click="add_loudong(item0.id, item0.label)"
-							:style="{display: item0.isShow ? '' : 'none'}">
+						<div class="add-loudong" @click="add_loudong(item0.id, item0.label)" :style="{display: item0.isShow ? '' : 'none'}">
 							<i class="el-icon-circle-plus-outline"></i>
 							<div class="add-loudong-txt">添加楼栋</div>
 						</div>
@@ -57,19 +52,18 @@
 					</div>
 					<div class="cell-body" v-loading="listLoading">
 						<div class="cell-body-top-btns">
-							<el-button :class="btnActive == 'all' ? 'btn-active':'btn-no-active'" type="primary"
-								size="medium" round @click="top_btn_click('all')">全部</el-button>
-							<el-button :class="btnActive == 'powerOn' ? 'btn-active':'btn-no-active'" type="primary"
-								size="medium" round @click="top_btn_click('powerOn')">开机</el-button>
-							<el-button :class="btnActive == 'powerOff' ? 'btn-active':'btn-no-active'" type="primary"
-								size="medium" round @click="top_btn_click('powerOff')">关机</el-button>
-							<el-button :class="btnActive == 'abnormal' ? 'btn-active':'btn-no-active'" type="primary"
-								size="medium" round @click="top_btn_click('abnormal')">离线</el-button>
+							<el-button :class="btnActive == 'all' ? 'btn-active':'btn-no-active'" type="primary" size="medium" round
+								@click="top_btn_click('all')">全部</el-button>
+							<el-button :class="btnActive == 'powerOn' ? 'btn-active':'btn-no-active'" type="primary" size="medium" round
+								@click="top_btn_click('powerOn')">开机</el-button>
+							<el-button :class="btnActive == 'powerOff' ? 'btn-active':'btn-no-active'" type="primary" size="medium" round
+								@click="top_btn_click('powerOff')">关机</el-button>
+							<el-button :class="btnActive == 'abnormal' ? 'btn-active':'btn-no-active'" type="primary" size="medium" round
+								@click="top_btn_click('abnormal')">离线</el-button>
 						</div>
 						<el-row>
 							<el-col :span="12">
-								<div class="panel-left"
-									:style="{display: currentData.rooms[0].room == '' ? 'none' : ''}">
+								<div class="panel-left" :style="{display: currentData.rooms[0].room == '' ? 'none' : ''}">
 									<div class="panel-header">
 										<div class="panel-title-caption">
 											<svg-icon icon-class="panel-home" class="panel-title-icon" />
@@ -84,12 +78,9 @@
 										</div>
 									</div>
 									<div class="panel-body">
-										<el-table :data="currentData.rooms[0].tableData" height="170"
-											v-loading="airsLoading[0].loading"
-											:element-loading-text="airsLoading[0].text"
-											element-loading-spinner="el-icon-loading"
-											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
-											:header-cell-style="setHeaderSellStyle">
+										<el-table :data="currentData.rooms[0].tableData" height="170" v-loading="airsLoading[0].loading"
+											:element-loading-text="airsLoading[0].text" element-loading-spinner="el-icon-loading" :cell-style="setCellStyle"
+											element-loading-background="rgba(0, 0, 0, 0.8)" :header-cell-style="setHeaderSellStyle">
 											<el-table-column label="名称" align="center" width="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
@@ -112,8 +103,7 @@
 											</el-table-column>
 											<el-table-column label="告警状态" align="center">
 												<template slot-scope="scope">
-													<span
-														v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
+													<span v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
 													<span v-else @click="alarm_status_click(scope.$index, scope.row)"
 														class="txt-cell-blue">{{ scope.row.alarmStatus }}</span>
 												</template>
@@ -148,8 +138,7 @@
 								</div>
 							</el-col>
 							<el-col :span="12">
-								<div class="panel-right"
-									:style="{display: currentData.rooms[1].room == '' ? 'none' : ''}">
+								<div class="panel-right" :style="{display: currentData.rooms[1].room == '' ? 'none' : ''}">
 									<div class="panel-header">
 										<div class="panel-title-caption">
 											<svg-icon icon-class="panel-home" class="panel-title-icon" />
@@ -164,12 +153,9 @@
 										</div>
 									</div>
 									<div class="panel-body">
-										<el-table :data="currentData.rooms[1].tableData" height="170"
-											v-loading="airsLoading[1].loading"
-											:element-loading-text="airsLoading[1].text"
-											element-loading-spinner="el-icon-loading"
-											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
-											:header-cell-style="setHeaderSellStyle">
+										<el-table :data="currentData.rooms[1].tableData" height="170" v-loading="airsLoading[1].loading"
+											:element-loading-text="airsLoading[1].text" 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="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
@@ -192,8 +178,7 @@
 											</el-table-column>
 											<el-table-column label="告警状态" align="center">
 												<template slot-scope="scope">
-													<span
-														v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
+													<span v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
 													<span v-else @click="alarm_status_click(scope.$index, scope.row)"
 														class="txt-cell-blue">{{ scope.row.alarmStatus }}</span>
 												</template>
@@ -230,8 +215,7 @@
 						</el-row>
 						<el-row>
 							<el-col :span="12">
-								<div class="panel-left"
-									:style="{display: currentData.rooms[2].room == '' ? 'none' : ''}">
+								<div class="panel-left" :style="{display: currentData.rooms[2].room == '' ? 'none' : ''}">
 									<div class="panel-header">
 										<div class="panel-title-caption">
 											<svg-icon icon-class="panel-home" class="panel-title-icon" />
@@ -246,12 +230,9 @@
 										</div>
 									</div>
 									<div class="panel-body">
-										<el-table :data="currentData.rooms[2].tableData" height="170"
-											v-loading="airsLoading[2].loading"
-											:element-loading-text="airsLoading[2].text"
-											element-loading-spinner="el-icon-loading"
-											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
-											:header-cell-style="setHeaderSellStyle">
+										<el-table :data="currentData.rooms[2].tableData" height="170" v-loading="airsLoading[2].loading"
+											:element-loading-text="airsLoading[2].text" 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="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
@@ -274,8 +255,7 @@
 											</el-table-column>
 											<el-table-column label="告警状态" align="center">
 												<template slot-scope="scope">
-													<span
-														v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
+													<span v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
 													<span v-else @click="alarm_status_click(scope.$index, scope.row)"
 														class="txt-cell-blue">{{ scope.row.alarmStatus }}</span>
 												</template>
@@ -310,8 +290,7 @@
 								</div>
 							</el-col>
 							<el-col :span="12">
-								<div class="panel-right"
-									:style="{display: currentData.rooms[3].room == '' ? 'none' : ''}">
+								<div class="panel-right" :style="{display: currentData.rooms[3].room == '' ? 'none' : ''}">
 									<div class="panel-header">
 										<div class="panel-title-caption">
 											<svg-icon icon-class="panel-home" class="panel-title-icon" />
@@ -326,12 +305,9 @@
 										</div>
 									</div>
 									<div class="panel-body">
-										<el-table :data="currentData.rooms[3].tableData" height="170"
-											v-loading="airsLoading[3].loading"
-											:element-loading-text="airsLoading[3].text"
-											element-loading-spinner="el-icon-loading"
-											element-loading-background="rgba(0, 0, 0, 0.8)" :cell-style="setCellStyle"
-											:header-cell-style="setHeaderSellStyle">
+										<el-table :data="currentData.rooms[3].tableData" height="170" v-loading="airsLoading[3].loading"
+											:element-loading-text="airsLoading[3].text" 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="140">
 												<template slot-scope="scope">
 													<span>{{ scope.row.name }}</span>
@@ -354,8 +330,7 @@
 											</el-table-column>
 											<el-table-column label="告警状态" align="center">
 												<template slot-scope="scope">
-													<span
-														v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
+													<span v-if="scope.row.alarmStatus == '正常'">{{ scope.row.alarmStatus }}</span>
 													<span v-else @click="alarm_status_click(scope.$index, scope.row)"
 														class="txt-cell-blue">{{ scope.row.alarmStatus }}</span>
 												</template>
@@ -392,8 +367,8 @@
 						</el-row>
 						<div class="pagination-table">
 							<el-pagination @current-change="currentPageChange" :hide-on-single-page="hideOnSinglePage"
-								:current-page.sync="pagination.currentPage" :page-size="pagination.pageSize"
-								layout="prev, pager, next, jumper" :total="pagination.total">
+								:current-page.sync="pagination.currentPage" :page-size="pagination.pageSize" layout="prev, pager, next, jumper"
+								:total="pagination.total">
 							</el-pagination>
 						</div>
 					</div>
@@ -401,16 +376,15 @@
 			</el-col>
 		</el-row>
 		<!-- 添加楼栋 -->
-		<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-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">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<span>{{form_add_loudong.school}}</span>
 				</el-form-item>
 				<el-form-item label="楼栋：" :label-width="formLabelWidth" prop="building" :required="true">
-					<el-input v-model="form_add_loudong.building" autocomplete="off" placeholder="请输入楼栋名称"
-						ref="ref_loudong" maxlength="15"></el-input>
+					<el-input v-model="form_add_loudong.building" autocomplete="off" placeholder="请输入楼栋名称" ref="ref_loudong" maxlength="15"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -419,8 +393,8 @@
 			</div>
 		</el-dialog>
 		<!-- 添加楼层 -->
-		<el-dialog title="添加楼层" custom-class="el-dialog-add-louceng" :visible.sync="dialog_add_louceng"
-			:close-on-click-modal="false" :close-on-press-escape="false" @close="dialog_close('form_add_louceng')">
+		<el-dialog title="添加楼层" custom-class="el-dialog-add-louceng" :visible.sync="dialog_add_louceng" :close-on-click-modal="false"
+			:close-on-press-escape="false" @close="dialog_close('form_add_louceng')">
 			<el-form :model="form_add_louceng" ref="add_louceng_form" :rules="form_add_louceng_rules">
 				<el-form-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_add_louceng.school}}</div>
@@ -429,8 +403,8 @@
 					<div>{{form_add_louceng.building}}</div>
 				</el-form-item>
 				<el-form-item label="楼层：" :label-width="formLabelWidth" prop="floor" :required="true">
-					<el-input v-model="form_add_louceng.floor" autocomplete="off" placeholder="请输入楼层号" ref="ref_louceng"
-						maxlength="1" @keydown.enter.native="dialog_add_louceng_click"></el-input>
+					<el-input v-model="form_add_louceng.floor" autocomplete="off" placeholder="请输入楼层号" ref="ref_louceng" maxlength="1"
+						@keydown.enter.native="dialog_add_louceng_click"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -451,8 +425,8 @@
 			</el-form>
 		</el-dialog>
 		<!-- 添加房间 -->
-		<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-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-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_add_room.school}}</div>
@@ -464,8 +438,8 @@
 					<div>{{form_add_room.floor}}</div>
 				</el-form-item>
 				<el-form-item label="房间：" :label-width="formLabelWidth" :required="true" prop="room">
-					<el-input v-model="form_add_room.room" autocomplete="off" placeholder="请输入房间名称" ref="ref_add_room"
-						maxlength="10" @keydown.enter.native="dialog_add_room_click"></el-input>
+					<el-input v-model="form_add_room.room" autocomplete="off" placeholder="请输入房间名称" ref="ref_add_room" maxlength="10"
+						@keydown.enter.native="dialog_add_room_click"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -474,29 +448,24 @@
 			</div>
 		</el-dialog>
 		<!-- 添加空调设备 -->
-		<el-dialog :title="currentData.addDevice + ' 添加设备'" custom-class="el-dialog-add-device"
-			:visible.sync="dialog_add_device" :close-on-click-modal="false" :close-on-press-escape="false"
-			@close="dialog_close('form_add_device')">
+		<el-dialog :title="currentData.addDevice + ' 添加设备'" custom-class="el-dialog-add-device" :visible.sync="dialog_add_device" :close-on-click-modal="false"
+			:close-on-press-escape="false" @close="dialog_close('form_add_device')">
 			<el-form :model="form_add_device" ref="add_device_form" :rules="form_add_device_rules">
 				<el-form-item label="当前坐标：" :label-width="formLabelWidth">
 					<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">
-					<el-input v-model="cao" autocomplete="off" placeholder="请输入操作员" ref="ref_cao" readonly=""
-						maxlength="10"></el-input>
+					<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">
-					<el-input v-model="contact" autocomplete="off" placeholder="请输入手机号码" ref="ref_contact"
-						maxlength="11" readonly=""></el-input>
+					<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="请输入设备名称"
-						ref="ref_deviceName" maxlength="10"></el-input>
+					<el-input v-model="form_add_device.deviceName" autocomplete="off" placeholder="请输入设备名称" ref="ref_deviceName" maxlength="10"></el-input>
 				</el-form-item>
 				<el-form-item label="设备IP/ID：" :label-width="formLabelWidth" prop="deviceIp" :required="true">
-					<el-input v-model="form_add_device.deviceIp" autocomplete="off" placeholder="请输入设备IP/ID"
-						maxlength="4">
+					<el-input v-model="form_add_device.deviceIp" autocomplete="off" placeholder="请输入设备IP/ID" maxlength="4">
 					</el-input>
 				</el-form-item>
 				<el-form-item label="设备类型：" :label-width="formLabelWidth" prop="checkedDevice" :required="true">
@@ -513,8 +482,8 @@
 			</div>
 		</el-dialog>
 		<!-- 编辑房间 -->
-		<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-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-item label="校区：" :label-width="formLabelWidth">
 					<div>{{form_modify_room.school}}</div>
@@ -526,8 +495,7 @@
 					<div>{{form_modify_room.floor}}</div>
 				</el-form-item>
 				<el-form-item label="房间：" :label-width="formLabelWidth" :required="true" prop="room">
-					<el-input v-model="form_modify_room.room" autocomplete="off" placeholder="请输入房间号"
-						ref="ref_modi_room" maxlength="10"
+					<el-input v-model="form_modify_room.room" autocomplete="off" placeholder="请输入房间号" ref="ref_modi_room" maxlength="10"
 						@keydown.enter.native="dialog_modify_room_click(show_modify_room)"></el-input>
 				</el-form-item>
 			</el-form>
@@ -537,8 +505,8 @@
 			</div>
 		</el-dialog>
 		<!-- 删除房间 -->
-		<el-dialog custom-class="el-dialog-delete-room" :visible.sync="dialog_delete_room" :close-on-click-modal="false"
-			:close-on-press-escape="false" :show-close="false">
+		<el-dialog custom-class="el-dialog-delete-room" :visible.sync="dialog_delete_room" :close-on-click-modal="false" :close-on-press-escape="false"
+			:show-close="false">
 			<div slot="" class="del-air-body">
 				<img src="../../icons/serveAC/del_warning.png" alt="">
 				<div class="del-air-body-txt">是否确定删除房间【{{ show_delete_room }}】？</div>
@@ -549,8 +517,8 @@
 			</div>
 		</el-dialog>
 		<!-- 删除空调 -->
-		<el-dialog custom-class="el-dialog-delete-air" :visible.sync="dialog_delete_air" :close-on-click-modal="false"
-			:close-on-press-escape="false" :show-close="false">
+		<el-dialog custom-class="el-dialog-delete-air" :visible.sync="dialog_delete_air" :close-on-click-modal="false" :close-on-press-escape="false"
+			:show-close="false">
 			<div slot="" class="del-air-body">
 				<img src="../../icons/serveAC/del_warning.png" alt="">
 				<div class="del-air-body-txt">是否确定刪除IP/ID为【{{delAir.deleteAirIp}}】的空调？</div>
@@ -2236,14 +2204,14 @@
 								}
 
 								.louceng:hover {
-									background-color: #5c87ff;
+									background-color: #5c8aff;
 									color: #FFFFFF;
 								}
 
 								.louceng-clicked {
 									font-size: 20px;
 									font-weight: bold;
-									background-color: #5c87ff;
+									background-color: #3e5afe;
 									color: #FFFFFF;
 								}
 							}