Commit ecdb5282 authored by 李志鸣's avatar 李志鸣

fea(设备故障/报警记录): 功能联调

parent b7e9c338
......@@ -5,7 +5,7 @@
<span class="page-title-text">设备故障/报警记录</span>
</div>
<div class="float-right page-refresh">
<span @click="doRefreshClick()" class="pointer">
<span @click="doRefreshClick" class="pointer">
<svg-icon icon-class="refresh"></svg-icon>
<span class="ml-10">刷新</span>
</span>
......@@ -13,7 +13,7 @@
</div>
<div class="tool-pack clear-float pl-15 pr-15">
<Search
searchCode="MATERIEL_RECORD"
searchCode="MACHINE_WARNING_RECORD"
@search="doSearchClick"
@reset="doResetClick">
</Search>
......@@ -21,7 +21,20 @@
<div class="general-list-main-pack pl-15 pr-15">
<div>
<Table
:tableConfig="tableConfig">
:tableConfig="tableConfig"
@onPageSizeChange="onSizeChange"
@onCurrentPageChange="onCurrentChange">
<template slot="beginTime">
<el-table-column
label="时间"
prop="beginTime"
show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.beginTime === '' || scope.row.beginTime === null || scope.row.beginTime === undefined">暂无</span>
<span v-else>{{ formatTime(scope.row.beginTime, 'YYYY-MM-DD HH:mm:ss') }}</span>
</template>
</el-table-column>
</template>
</Table>
</div>
</div>
......@@ -29,6 +42,8 @@
</template>
<script>
import Moment from 'moment'
import Table from '@/components/Table/index.vue'
import Search from '@/components/Search'
......@@ -40,11 +55,19 @@
},
data () {
return {
// 精准搜索关键字列表
searchList: {},
// 表格配置项
tableConfig: {
height: 0,
data: [],
fieldList: [],
fieldList: [
{ label: '车间', value: 'workshopCode' },
{ label: '设备编号', value: 'equipCode' },
{ label: '设备名称', value: 'alias' },
{ label: '故障信息', value: 'warningInfo' },
{ label: '时间', value: 'beginTime', slot: 'beginTime' }
],
paginationToggle: true,
paginationConfig: {
total: 0,
......@@ -55,16 +78,78 @@
}
},
methods: {
// 时间日期格式化
formatTime (time, format) {
if (time !== null && time !== '') {
return Moment(time).format(format)
} else {
return '暂无'
}
},
// 点击刷新按钮
doRefreshClick () {},
doRefreshClick () {
this.getTableList().then(response => {
this.$message.success('刷新成功!')
})
},
// 点击搜索组件搜索按钮
doSearchClick () {},
doSearchClick (searchValue) {
this.searchList = searchValue
this.tableConfig.paginationConfig.currentPage = 1
// 获取表格数据
this.getTableLIst()
},
// 点击搜索组件重置按钮
doResetClick () {}
doResetClick (searchValue) {
this.searchList = { ...searchList, filters: [] }
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = 20
// 获取表格数据
this.getTableLIst()
},
// 获取表格数据
getTableList () {
let queryParams = {
searchCode: this.searchList.searchCode || 'MACHINE_WARNING_RECORD',
filters: this.searchList.filters || [],
pageSize: this.tableConfig.paginationConfig.pageSize,
pageNum: this.tableConfig.paginationConfig.currentPage
}
return new Promise((resolve, reject) => {
this.$fetch('run-record-controller/faultPage-post', queryParams).then(response => {
if (response.list.length === 0 && response.pageNum !== 1) {
this.tableConfig.paginationConfig.currentPage -= 1
// 获取表格数据
this.getTableList()
} else {
this.tableConfig.data = _.cloneDeep(response.list)
this.tableConfig.paginationConfig.total = _.cloneDeep(response.total)
resolve(response)
}
}).catch(error => {
reject(error)
})
})
},
// 当前分页数量发生了变化
onSizeChange (pageSize) {
this.tableConfig.paginationConfig.currentPage = 1
this.tableConfig.paginationConfig.pageSize = pageSize
// 获取表格数据
this.getTableLIst()
},
// 当前分页页数发生了变化
onCurrentChange (currentPage) {
this.tableConfig.paginationConfig.currentPage = currentPage
// 获取表格数据
this.getTableLIst()
}
},
mounted () {
setTimeout(() => {
this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 180
// 获取表格数据
this.getTableList()
}, 0)
}
}
......@@ -77,6 +162,7 @@
width: 100%;
border: 1px solid #d2d3d5;
background-color: #fff;
overflow-y: auto;
.title-pack {
height: 38px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment