style:历史记录查询-表头顺序调整

main
黄伟杰 3 weeks ago
parent 65db6254cb
commit d65646d6af

@ -71,27 +71,27 @@
> >
<el-table-column type="selection" width="55" reserve-selection /> <el-table-column type="selection" width="55" reserve-selection />
<el-table-column <el-table-column
:label="t('DataCollection.HistoryData.tableLineCodeColumn')" :label="t('DataCollection.HistoryData.tableDeviceCodeColumn')"
align="left" align="left"
prop="lineNode" prop="deviceCode"
min-width="140px" min-width="140px"
/> />
<el-table-column <el-table-column
:label="t('DataCollection.HistoryData.tableLineNameColumn')" :label="t('DataCollection.HistoryData.tableDeviceNameColumn')"
align="left" align="left"
prop="lineName" prop="deviceName"
min-width="160px" min-width="160px"
/> />
<el-table-column <el-table-column
:label="t('DataCollection.HistoryData.tableDeviceCodeColumn')" :label="t('DataCollection.HistoryData.tableLineCodeColumn')"
align="left" align="left"
prop="deviceCode" prop="lineNode"
min-width="140px" min-width="140px"
/> />
<el-table-column <el-table-column
:label="t('DataCollection.HistoryData.tableDeviceNameColumn')" :label="t('DataCollection.HistoryData.tableLineNameColumn')"
align="left" align="left"
prop="deviceName" prop="lineName"
min-width="160px" min-width="160px"
/> />
<el-table-column <el-table-column

@ -7,37 +7,37 @@
:inline="true" :inline="true"
label-width="auto" label-width="auto"
> >
<el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineCodeLabel')" prop="lineNode"> <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchDeviceCodeLabel')" prop="deviceCode">
<el-input <el-input
v-model="queryParams.lineNode" v-model="queryParams.deviceCode"
:placeholder="t('DataCollection.RealTimeMonitoring.searchLineCodePlaceholder')" :placeholder="t('DataCollection.RealTimeMonitoring.searchDeviceCodePlaceholder')"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineNameLabel')" prop="lineName"> <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchDeviceNameLabel')" prop="deviceName">
<el-input <el-input
v-model="queryParams.lineName" v-model="queryParams.deviceName"
:placeholder="t('DataCollection.RealTimeMonitoring.searchLineNamePlaceholder')" :placeholder="t('DataCollection.RealTimeMonitoring.searchDeviceNamePlaceholder')"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="t('DataCollection.RealTimeMonitoring.searchDeviceCodeLabel')" prop="deviceCode"> <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineCodeLabel')" prop="lineNode">
<el-input <el-input
v-model="queryParams.deviceCode" v-model="queryParams.lineNode"
:placeholder="t('DataCollection.RealTimeMonitoring.searchDeviceCodePlaceholder')" :placeholder="t('DataCollection.RealTimeMonitoring.searchLineCodePlaceholder')"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="t('DataCollection.RealTimeMonitoring.searchDeviceNameLabel')" prop="deviceName"> <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineNameLabel')" prop="lineName">
<el-input <el-input
v-model="queryParams.deviceName" v-model="queryParams.lineName"
:placeholder="t('DataCollection.RealTimeMonitoring.searchDeviceNamePlaceholder')" :placeholder="t('DataCollection.RealTimeMonitoring.searchLineNamePlaceholder')"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"

Loading…
Cancel
Save