update - add返修率报表、设备报警记录

master
yinq 8 months ago
parent ab61368a36
commit 6ae21f0798

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询设备报警记录列表
export function listDeviceAlarmRecord(query) {
return request({
url: '/report/deviceAlarmRecord/list',
method: 'get',
params: query
})
}
// 查询设备报警记录详细
export function getDeviceAlarmRecord(objId) {
return request({
url: '/report/deviceAlarmRecord/' + objId,
method: 'get'
})
}
// 新增设备报警记录
export function addDeviceAlarmRecord(data) {
return request({
url: '/report/deviceAlarmRecord',
method: 'post',
data: data
})
}
// 修改设备报警记录
export function updateDeviceAlarmRecord(data) {
return request({
url: '/report/deviceAlarmRecord',
method: 'put',
data: data
})
}
// 删除设备报警记录
export function delDeviceAlarmRecord(objId) {
return request({
url: '/report/deviceAlarmRecord/' + objId,
method: 'delete'
})
}

@ -134,3 +134,12 @@ export function boxTraceabilityDetailReport(query) {
params: query
})
}
// 质量返修率报表
export function repairRateReportList(query) {
return request({
url: '/report/qualityReport/repairRateReportList',
method: 'get',
params: query
})
}

@ -0,0 +1,416 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="设备编号" prop="deviceCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.deviceCode"-->
<!-- placeholder="请输入设备编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="设备名称" prop="deviceCode">
<el-select v-model="form.deviceCode" placeholder="请选择设备名称" clearable filterable>
<el-option
v-for="item in deviceLedgerList"
:key="item.deviceCode"
:label="item.productLinedDevice"
:value="item.deviceCode"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="设备名称" prop="deviceName">-->
<!-- <el-input-->
<!-- v-model="queryParams.deviceName"-->
<!-- placeholder="请输入设备名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="设备类型" prop="deviceType">-->
<!-- <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.device_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="报警时间">
<el-date-picker
v-model="daterangeAlarmTime"
style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['report:deviceAlarmRecord:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['report:deviceAlarmRecord:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['report:deviceAlarmRecord:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['report:deviceAlarmRecord:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceAlarmRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[1].visible"/>
<el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[2].visible"/>
<el-table-column label="设备类型" align="center" prop="deviceType" v-if="columns[3].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.device_type" :value="scope.row.deviceType"/>
</template>
</el-table-column>
<el-table-column label="报警信息" align="center" prop="alarmInfo" v-if="columns[4].visible"/>
<el-table-column label="报警时间" align="center" prop="alarmTime" width="180" v-if="columns[5].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.alarmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
<el-table-column label="标识" align="center" prop="isFlag" v-if="columns[7].visible"/>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="批次标识" align="center" prop="batchId" v-if="columns[10].visible"/>
<el-table-column label="参数编号" align="center" prop="paramCode" v-if="columns[11].visible"/>
<el-table-column label="参数值" align="center" prop="paramValue" v-if="columns[12].visible"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['report:deviceAlarmRecord:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['report:deviceAlarmRecord:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改设备报警记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备编号" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备编号"/>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="请选择设备类型">
<el-option
v-for="dict in dict.type.device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="报警信息" prop="alarmInfo">
<el-input v-model="form.alarmInfo" placeholder="请输入报警信息"/>
</el-form-item>
<el-form-item label="报警时间" prop="alarmTime">
<el-date-picker clearable
v-model="form.alarmTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择报警时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
<el-form-item label="标识" prop="isFlag">
<el-input v-model="form.isFlag" placeholder="请输入标识"/>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人"/>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="批次标识" prop="batchId">
<el-input v-model="form.batchId" placeholder="请输入批次标识"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listDeviceAlarmRecord,
getDeviceAlarmRecord,
delDeviceAlarmRecord,
addDeviceAlarmRecord,
updateDeviceAlarmRecord
} from '@/api/report/deviceAlarmRecord'
import { getDeviceLedgerList } from '@//api/base/deviceLedger'
import { parseTime } from '@//utils/ruoyi'
export default {
name: 'DeviceAlarmRecord',
dicts: ['device_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
deviceAlarmRecordList: [],
//
title: '',
//
open: false,
//
daterangeAlarmTime: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: null,
deviceName: null,
deviceType: null,
alarmInfo: null,
alarmTime: null,
isFlag: null,
createdBy: null,
createdTime: null,
batchId: null
},
//
form: {},
//
rules: {},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `设备编号`, visible: true },
{ key: 2, label: `设备名称`, visible: true },
{ key: 3, label: `设备类型`, visible: true },
{ key: 4, label: `报警信息`, visible: true },
{ key: 5, label: `报警时间`, visible: true },
{ key: 6, label: `备注`, visible: false },
{ key: 7, label: `标识`, visible: false },
{ key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: false },
{ key: 10, label: `批次标识`, visible: false },
{ key: 11, label: `参数编号`, visible: false },
{ key: 12, label: `参数值`, visible: false },
],
//
deviceLedgerList: [],
}
},
created() {
getDeviceLedgerList().then(response => {
this.deviceLedgerList = response.data
})
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeAlarmTime[0] = nowDate + ' 00:00:00'
this.daterangeAlarmTime[1] = nowDate + ' 23:59:59'
this.getList()
},
methods: {
/** 查询设备报警记录列表 */
getList() {
this.loading = true
this.queryParams.params = {}
if (null != this.daterangeAlarmTime && '' != this.daterangeAlarmTime) {
this.queryParams.params['beginAlarmTime'] = this.daterangeAlarmTime[0]
this.queryParams.params['endAlarmTime'] = this.daterangeAlarmTime[1]
}
listDeviceAlarmRecord(this.queryParams).then(response => {
this.deviceAlarmRecordList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
deviceCode: null,
deviceName: null,
deviceType: null,
alarmInfo: null,
alarmTime: null,
remark: null,
isFlag: null,
createdBy: null,
createdTime: null,
batchId: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeAlarmTime = []
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加设备报警记录'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getDeviceAlarmRecord(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改设备报警记录'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateDeviceAlarmRecord(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addDeviceAlarmRecord(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除设备报警记录编号为"' + objIds + '"的数据项?').then(function() {
return delDeviceAlarmRecord(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('report/deviceAlarmRecord/export', {
...this.queryParams
}, `deviceAlarmRecord_${new Date().getTime()}.xlsx`)
}
}
}
</script>

@ -0,0 +1,246 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产线" prop="PRODUCT_LINE_CODE">
<el-select v-model="queryParams.PRODUCT_LINE_CODE" placeholder="请选择产线">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="质检工位">
<el-select v-model="queryParams.STATION_CODE" placeholder="请选择质检工位" multiple clearable>
<el-option
v-for="item in findStationList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="起止日期">
<el-date-picker
v-model="daterangeBeginTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="info"
plain
size="mini"
>异常数{{ totalSum }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="日期" align="center" prop="INSPECTOR_TIME" v-if="columns[1].visible"/>
<el-table-column label="异常数" align="center" prop="QUALITY_SUM" v-if="columns[2].visible"/>
<el-table-column label="下线数" align="center" prop="OFF_LINE_NUM" v-if="columns[3].visible"/>
<el-table-column label="返修率" align="center" prop="REPAIR_RATE" v-if="columns[4].visible"/>
</el-table>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
</div>
</template>
<script>
import {
repairRateReportList
} from '@/api/report/reportAPI'
import { findProductLineList } from '@//api/base/productLine'
import { parseTime } from '@//utils/ruoyi'
export default {
name: 'RepairRateReport',
dicts: ['is_flag'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
totalSum: 0,
//
reportList: [],
//
qualityDefectstList: [],
//
title: '',
//
open: false,
//
daterangeBeginTime: [],
//
queryParams: {
// pageNum: 1,
// pageSize: 10,
beginBeginTime: null,
endBeginTime: null,
STATION_CODE: [],
stationCodeList: null,
PRODUCT_LINE_CODE: 'CX_02',
ORDER_CODE: null,
MATERIAL_CODE: null,
MATERIAL_NAME: null,
BEGIN_DATE: null
},
//
form: {},
//
rules: {},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `日期`, visible: true },
{ key: 2, label: `异常数`, visible: true },
{ key: 3, label: `下线数`, visible: true },
{ key: 4, label: `返修率`, visible: true }
],
// 线
productLineList: [],
//
findStationList: []
}
},
created() {
findProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data
findProductLineList({ parentId: this.queryParams.PRODUCT_LINE_CODE, stationType: 2 }).then(response => {
this.findStationList = response.data
})
})
const weekDate = parseTime(new Date(Date.now() - 6 * 24 * 60 * 60 * 1000), '{y}-{m}-{d}')
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeBeginTime[0] = weekDate
this.daterangeBeginTime[1] = nowDate
this.getList()
},
watch: {
'queryParams.PRODUCT_LINE_CODE': function(newVal, oldVal) {
//
findProductLineList({ parentId: this.queryParams.PRODUCT_LINE_CODE, stationType: 2 }).then(response => {
this.findStationList = response.data
})
},
},
methods: {
/** 查询工单信息列表 */
getList() {
this.loading = true
if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
this.queryParams.endBeginTime = this.daterangeBeginTime[1]
} else {
this.queryParams.beginBeginTime = null
this.queryParams.endBeginTime = null
}
if (this.queryParams.STATION_CODE.length > 0) {
this.queryParams.stationCodeList = this.queryParams.STATION_CODE.join(',')
}
repairRateReportList(this.queryParams).then(response => {
this.reportList = response.data
this.totalSum = 0;
this.reportList.forEach(e => {
this.totalSum += e.QUALITY_SUM
})
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.daterangeBeginTime = []
this.form = {
WORK_CENTER_CODE: null,
PRODUCT_LINE_NAME: null,
ORDER_CODE: null,
STATION_CODE: [],
stationCodeList: null,
MATERIAL_CODE: null,
MATERIAL_NAME: null,
BEGIN_DATE: null
}
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
// this.queryParams.pageNum = 1;
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 导出按钮操作 */
handleExport() {
this.download('/report/qualityReport/repairRateReportList/export', {
...this.queryParams
}, `质量返修率报表_${new Date().getTime()}.xlsx`)
},
}
}
</script>
Loading…
Cancel
Save