lims-ruoyi-before.git

			@@ -17,7 +17,8 @@
			</div>
			</div>
			<div>
			<el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
			<el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData"
			height="calc(60vh - 16em)"
			:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
			highlight-current-row @current-change="currentChange">
			<!-- 表格列 -->
			@@ -65,10 +66,12 @@
			<div>
			<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
			<el-form-item label="设备编号" prop="deviceNumber">
			<el-input v-model="searchForm.deviceNumber" clearable size="small"></el-input>
			<el-input v-model="searchForm.deviceNumber" clearable size="small"
			@keyup.enter.native="getYearTableDetailData(currentRow)"></el-input>
			</el-form-item>
			<el-form-item label="设备名称" prop="deviceName">
			<el-input v-model="searchForm.deviceName" clearable size="small"></el-input>
			<el-input v-model="searchForm.deviceName" clearable size="small"
			@keyup.enter.native="getYearTableDetailData(currentRow)"></el-input>
			</el-form-item>
			<el-form-item>
			<el-button type="primary" size="mini" @click="getYearTableDetailData(currentRow)">查询</el-button>
			@@ -83,7 +86,7 @@
			<div>
			<el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
			:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
			height="calc(60vh - 20em)" style="width: 100% ;">
			:height="'calc(100vh - 34em)'" style="width: 100% ;">
			<!-- 表格列 -->
			<el-table-column align="center" header-align="center" label="序号" prop="prop" type="index"
			width="70"></el-table-column>