diff --git a/src/api/business/alarmLogs.js b/src/api/business/alarmLogs.js new file mode 100644 index 0000000..67c5472 --- /dev/null +++ b/src/api/business/alarmLogs.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询报警记录列表 +export function listAlarmLogs(query) { + return request({ + url: '/business/alarmLogs/list', + method: 'get', + params: query + }) +} + +// 查询报警记录详细 +export function getAlarmLogs(alarmId) { + return request({ + url: '/business/alarmLogs/' + alarmId, + method: 'get' + }) +} + +// 新增报警记录 +export function addAlarmLogs(data) { + return request({ + url: '/business/alarmLogs', + method: 'post', + data + }) +} + +// 修改报警记录 +export function updateAlarmLogs(data) { + return request({ + url: '/business/alarmLogs', + method: 'put', + data + }) +} + +// 删除报警记录 +export function delAlarmLogs(alarmId) { + return request({ + url: '/business/alarmLogs/' + alarmId, + method: 'delete' + }) +} diff --git a/src/api/business/fault_code_info.js b/src/api/business/fault_code_info.js index a95632a..52d8add 100644 --- a/src/api/business/fault_code_info.js +++ b/src/api/business/fault_code_info.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import FaultCodes from "@/views/business/faultCodes/index.vue"; // 查询故障码列表 export function listFaultCodes(query) { @@ -57,6 +58,15 @@ export function changeFaultCodesStatus(faultId, status){ }) } +// 修改故障码报警状态 +export function batchChangeAlarm(faultCodesList){ + return request({ + url: '/business/faultCodes/batchChangeAlarm', + method: 'put', + data: faultCodesList + }) +} + // 删除故障码 export function delFaultCodes(faultId) { return request({ diff --git a/src/views/business/alarmLogs/index.vue b/src/views/business/alarmLogs/index.vue new file mode 100644 index 0000000..f85fbd7 --- /dev/null +++ b/src/views/business/alarmLogs/index.vue @@ -0,0 +1,326 @@ + + + diff --git a/src/views/business/dict/index.vue b/src/views/business/dict/index.vue index e836352..b6d1cc4 100644 --- a/src/views/business/dict/index.vue +++ b/src/views/business/dict/index.vue @@ -75,11 +75,6 @@ @@ -94,7 +89,6 @@ - + diff --git a/src/views/business/faultCodes/index.vue b/src/views/business/faultCodes/index.vue index 3830312..b0c94da 100644 --- a/src/views/business/faultCodes/index.vue +++ b/src/views/business/faultCodes/index.vue @@ -37,16 +37,11 @@ - + @@ -75,7 +70,7 @@ diff --git a/src/views/business/faultLogs/index.vue b/src/views/business/faultLogs/index.vue index 00cea1d..5a683b1 100644 --- a/src/views/business/faultLogs/index.vue +++ b/src/views/business/faultLogs/index.vue @@ -17,20 +17,22 @@ @keyup.enter.native="handleQuery" /> - - - + + + + + 搜索 重置 @@ -38,80 +40,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + + + + - - . - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -160,7 +96,7 @@ import { listFaultLogs, addFaultLogs, getFaultLogs, editFaultLogs, delFaultLogs } from '@/api/business/faultLogs' export default { name: "FaultLogs", - dicts: ['vehicle_alarm_status','vehicle_dispose_status'], + dicts: ['vehicle_alarm_status','fault_level','vehicle_dispose_status'], data() { //这里存放数据 return { @@ -188,28 +124,15 @@ export default { pageSize: 10, carVin: null, faultCode: null, - faultName: '', startAlarmTime: null, endAlarmTime: null, + alarmFlag: '' }, // 表单参数 form: {}, // 表单校验 rules: { }, - // 列信息 - columns:[ - { key: 0, label: `车辆VIN`, visible: true }, - { 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: true }, - { key: 7, label: `处理时间`, visible: true }, - { key: 8, label: `处理人`, visible: true }, - { key: 9, label: `处理状态`, visible: true }, - ] } }, methods: { @@ -233,18 +156,11 @@ export default { logId: null, carVin: null, faultCode: null, - faultName: null, - alarmFalg: null, + alarmFlag: null, startAlarmTime: null, endAlarmTime: null, recentlyAlarmTime: null, - disposeTime: null, - disposeBy: null, disposeStatus: null, - createBy: null, - createTime: null, - updateBy: null, - updateTime: null, remark: null }; this.resetForm("form") @@ -259,63 +175,6 @@ export default { this.resetForm("queryForm") this.handleQuery() }, - // 筛选节点 - filterNode(value, data) { - if (!value) return true; - return data.label.indexOf(value) !== -1; - }, - // /**多选框选中数据*/ - // handleSelectionChange(selection){ - // this.ids = selection.map(item => item.logId) - // this.single = selection.length !== 1 - // this.multiple = !selection.length - // }, - // /**新增故障日志记录*/ - // handleAdd(){ - // this.reset() - // this.open = true; - // this.title = "添加故障日志" - // }, - // /**修改按钮操作*/ - // handleUpdate(row){ - // this.reset() - // const logId = row.logId || this.ids - // getFaultLogs(logId).then(res => { - // this.form = res.data - // this.open = true - // this.title = "修改故障日志" - // }) - // }, - // /**提交按钮*/ - // submitForm(){ - // this.$refs["form"].validate(valid => { - // if (valid){ - // if (null != this.form.logId){ - // editFaultLogs(this.form).then(res => { - // this.$message.success('修改成功') - // this.open = false - // this.getList() - // }) - // }else { - // addFaultLogs(this.form).then(res => { - // this.$message.success('新增成功') - // this.open = false - // this.getList() - // }) - // } - // } - // }) - // }, - // /**删除按钮操作*/ - // handleDelete(row){ - // const logIds = row.logId || this.ids - // this.$modal.confirm('是否确认删除故障记录编号为"' + logIds + '"的数据项?').then(function (){ - // return delFaultLogs(logIds) - // }).then(() => { - // this.getList() - // this.$message.success('删除成功') - // }).catch(() => {}) - // } }, //声明周期 - 创建完成（可以访问当前this实例）, created() {