Compare commits

..

No commits in common. '71956a49371dd0365e54ccc61b51872f3a3ed091' and '70d3e0259b0c40433bd1fae47c127e955cb3e48e' have entirely different histories.

  1. 18
      src/api/safetyManagement/testRecord.js
  2. 66
      src/views/safetyManagement/wastewater/components/testRecord.vue

@ -23,15 +23,15 @@ export const add = row => {
}; };
// // 删除 // // 删除
export const remove = ids => { // export const remove = ids => {
return request({ // return request({
url: '/blade-desk/bsInsTest/remove', // url: '/blade-desk/bsSafeInspectionPoint/remove',
method: 'post', // method: 'post',
params: { // params: {
ids, // ids,
}, // },
}); // });
}; // };
// // 修改 // // 修改
export const update = row => { export const update = row => {

@ -7,7 +7,7 @@
v-model="form" v-model="form"
v-model:page="page" v-model:page="page"
ref="crud" ref="crud"
@row-del="handleDelete" @row-del="rowDel"
@row-update="rowUpdate" @row-update="rowUpdate"
@search-change="searchChange" @search-change="searchChange"
@search-reset="searchReset" @search-reset="searchReset"
@ -18,10 +18,9 @@
@on-load="onLoad" @on-load="onLoad"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" icon="el-icon-plus" @click="moldAddFn(null, true)" <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">
>新增</el-button </el-button> -->
> <el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleBatchDelete"> </el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" @click="handleImport">导入 </el-button>
@ -49,7 +48,7 @@
</div> </div>
</template> </template>
<script> <script>
import { getList , update , getUserList , remove } from '@/api/safetyManagement/testRecord.js'; import { getList , update , getUserList } from '@/api/safetyManagement/testRecord.js';
import basicImport from '@/components/basic-import/main.vue'; import basicImport from '@/components/basic-import/main.vue';
import addEditDialogTestRecord from './addEditDialogTestRecord.vue'; import addEditDialogTestRecord from './addEditDialogTestRecord.vue';
export default { export default {
@ -82,16 +81,16 @@ export default {
index: true, index: true,
selection: true, selection: true,
viewBtn: false, viewBtn: false,
delBtn: true, delBtn: false,
addBtn: false, addBtn: false,
editBtnText: '修改', editBtnText: '修改',
addBtnIcon: 'el-icon-plus', addBtnIcon: ' ',
viewBtnIcon: 'el-icon-view', viewBtnIcon: ' ',
delBtnIcon: 'el-icon-delete', delBtnIcon: ' ',
editBtnIcon: 'el-icon-edit', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 200, menuWidth: 80,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -151,12 +150,13 @@ export default {
label: '化验时间', label: '化验时间',
prop: 'dosingTime', prop: 'dosingTime',
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
type: "datetime", type: "datetime",
format: 'YYYY-MM-DD HH:mm:ss', // format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', // valueFormat: 'YYYY-MM-DD HH:mm:ss',
rules: [ rules: [
{ {
required: true, required: true,
@ -197,8 +197,8 @@ export default {
searchLabelWidth: 40, searchLabelWidth: 40,
rules: [ rules: [
{ {
required: false, required: true,
message: '请输入', message: '请输入报警阙值',
trigger: 'blur', trigger: 'blur',
}, },
], ],
@ -212,7 +212,7 @@ export default {
span: 12, span: 12,
rules: [ rules: [
{ {
required: false, required: true,
message: '请输入铜', message: '请输入铜',
trigger: 'blur', trigger: 'blur',
}, },
@ -227,7 +227,7 @@ export default {
span: 12, span: 12,
rules: [ rules: [
{ {
required: false, required: true,
message: '请输入六价铬', message: '请输入六价铬',
trigger: 'blur', trigger: 'blur',
}, },
@ -242,7 +242,7 @@ export default {
span: 12, span: 12,
rules: [ rules: [
{ {
required: false, required: true,
message: '请输入氰化物', message: '请输入氰化物',
trigger: 'blur', trigger: 'blur',
}, },
@ -257,8 +257,8 @@ export default {
span: 12, span: 12,
rules: [ rules: [
{ {
required: false, required: true,
message: '请输入PH', message: '请输入PH报警点位',
trigger: 'blur', trigger: 'blur',
}, },
], ],
@ -324,34 +324,16 @@ export default {
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true
}, },
// handleDelete() {
handleBatchDelete() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
this.$message.error('请至少选择一条数据'); this.$message.warning('请选择至少一条数据');
return; return;
} }
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {});
remove(this.selectionList.map(item => item.id).join(',')).then(res => {
this.$message.success('删除成功');
this.refreshChange();
});
});
},
handleDelete(row) {
this.$confirm('确定删除数据吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
remove(row.id).then(res => {
this.$message.success('删除成功');
this.refreshChange();
});
});
}, },
// //
selectionChange(list) { selectionChange(list) {

Loading…
Cancel
Save