suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安环管理-环保管理-废水处理-槽液排放记录-新增排序/权限

Browse Source 
安环管理-环保管理-废水处理-废水加药记录-新增排序/权限
安环管理-环保管理-废水处理-废水化验记录-新增排序/权限
安环管理-环保管理-废水处理-仪表参数-新增排序
dev-scheduling
ysn 1 month ago
parent 77af963131
commit 201b699dfa
4 changed files with 162 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      src/views/safetyManagement/wastewater/components/dischargeRec.vue
  2. 42
      src/views/safetyManagement/wastewater/components/dosingRecord.vue
  3. 92
      src/views/safetyManagement/wastewater/components/meterParameter.vue
  4. 39
      src/views/safetyManagement/wastewater/components/testRecord.vue

41
src/views/safetyManagement/wastewater/components/dischargeRec.vue
Unescape View File

@ -16,15 +16,21 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="moldAddFn(null, true)" <el-button type="primary" v-if="permission.wastewater1_add" @click="moldAddFn(null, true)">
>新增</el-button 新增
> </el-button>
<el-button type="danger" @click="handleBatchDelete">删 除 </el-button> <el-button type="danger" v-if="permission.wastewater1_del" @click="handleBatchDelete">
删 除
</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" v-if="permission.wastewater1_import" @click="handleImport">
导入
</el-button>
</template> </template>
</avue-crud> </avue-crud>
<!-- 新增 --> <!-- 新增 -->
@ -62,6 +68,7 @@ import {
import basicImport from '@/components/basic-import/main.vue'; import basicImport from '@/components/basic-import/main.vue';
import addEditDialogDischargeRec from './addEditDialogDischargeRec.vue'; import addEditDialogDischargeRec from './addEditDialogDischargeRec.vue';
import { getTeam } from '@/api/tankSolutionSystem/info'; import { getTeam } from '@/api/tankSolutionSystem/info';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
@ -264,8 +271,18 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
query: {},
}; };
}, },
computed: {
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.wastewater1_edit, false),
delBtn: this.validData(this.permission.wastewater1_del, false),
};
},
},
mounted() { mounted() {
this.getTeamList(); this.getTeamList();
this.getTypeList(); this.getTypeList();
@ -366,6 +383,20 @@ export default {
this.query = {}; this.query = {};
this.onLoad(this.page); this.onLoad(this.page);
}, },
// 排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
this.query.isAsc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false;
}
// 重新加载数据
this.onLoad(this.page, this.query);
},
// 加载页面数据 // 加载页面数据
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;

42
src/views/safetyManagement/wastewater/components/dosingRecord.vue
Unescape View File

@ -17,15 +17,21 @@
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
:search.sync="search" :search.sync="search"
@sort-change="sortChange"
:permission="permissionList"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="moldAddFn(null, true)" <el-button type="primary" v-if="permission.wastewater2_add" @click="moldAddFn(null, true)">
>新增</el-button 新增
> </el-button>
<el-button type="danger" @click="handleBatchDelete">删 除 </el-button> <el-button type="danger" v-if="permission.wastewater2_del" @click="handleBatchDelete">
删 除
</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" v-if="permission.wastewater2_import" @click="handleImport">
导入
</el-button>
</template> </template>
</avue-crud> </avue-crud>
<!-- 新增弹窗 --> <!-- 新增弹窗 -->
@ -60,6 +66,7 @@ import {
} from '@/api/safetyManagement/dosingRecord.js'; } from '@/api/safetyManagement/dosingRecord.js';
import basicImport from '@/components/basic-import/main.vue'; import basicImport from '@/components/basic-import/main.vue';
import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue'; import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
@ -74,7 +81,7 @@ export default {
selectionList: [], selectionList: [],
dosingManList: [], dosingManList: [],
search: { search: {
dorType:'2', dorType: '2',
}, },
option: { option: {
addBtn: false, addBtn: false,
@ -250,6 +257,15 @@ export default {
}, },
}; };
}, },
computed: {
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.wastewater2_edit, false),
delBtn: this.validData(this.permission.wastewater2_del, false),
};
},
},
mounted() { mounted() {
this.fetchDosingManList(); this.fetchDosingManList();
}, },
@ -374,6 +390,20 @@ export default {
this.onLoad(this.page, params); this.onLoad(this.page, params);
done(); done();
}, },
// 排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
this.query.isAsc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false;
}
// 重新加载数据
this.onLoad(this.page, this.query);
},
// 加载页面数据 // 加载页面数据
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;

92
src/views/safetyManagement/wastewater/components/meterParameter.vue
Unescape View File

@ -15,6 +15,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
> >
<template #menu-left> <template #menu-left>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除 <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
@ -146,7 +147,7 @@ export default {
methods: { methods: {
// 点击导入按钮 // 点击导入按钮
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true;
}, },
handleDelete() { handleDelete() {
@ -164,18 +165,33 @@ export default {
selectionChange(list) { selectionChange(list) {
this.selectionList = list; this.selectionList = list;
}, },
// 排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
this.query.isAsc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false;
}
// 重新加载数据
this.onLoad(this.page, this.query);
},
// 加载页面数据 // 加载页面数据
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
getList({ getList({
deviceId:"9651128" deviceId: '9651128',
}).then(res => { })
.then(res => {
// const data = res.data.data; // const data = res.data.data;
// this.page.total = data.total; // this.page.total = data.total;
// this.data = data.records; // this.data = data.records;
// this.loading = false; // this.loading = false;
const obj = {}; const obj = {};
res.data.data.forEach((item) => { res.data.data.forEach(item => {
obj[item.identifierName] = item.defaultValue; obj[item.identifierName] = item.defaultValue;
}); });
this.objData = obj; this.objData = obj;
@ -185,221 +201,221 @@ export default {
gageValue: obj['PH102'], gageValue: obj['PH102'],
lowerLimit: obj['PH102L'], lowerLimit: obj['PH102L'],
superiorLimit: obj['PH102H'], // 上限 superiorLimit: obj['PH102H'], // 上限
consultValue: '10——11' consultValue: '10——11',
}, },
{ {
name: 'PH-104 pH调整池II(混)', name: 'PH-104 pH调整池II(混)',
gageValue: obj['PH104'], gageValue: obj['PH104'],
lowerLimit: obj['PH104L'], lowerLimit: obj['PH104L'],
superiorLimit: obj['PH104H'], // 上限 superiorLimit: obj['PH104H'], // 上限
consultValue: '7.0——8.0' consultValue: '7.0——8.0',
}, },
{ {
name: 'PH-203 pH调整池I(铬)', name: 'PH-203 pH调整池I(铬)',
gageValue: obj['PH203'], gageValue: obj['PH203'],
lowerLimit: obj['PH203L'], lowerLimit: obj['PH203L'],
superiorLimit: obj['PH203H'], // 上限 superiorLimit: obj['PH203H'], // 上限
consultValue: '2.0——3.0' consultValue: '2.0——3.0',
}, },
{ {
name: 'PH-205 pH调整池II(铬)', name: 'PH-205 pH调整池II(铬)',
gageValue: obj['PH205'], gageValue: obj['PH205'],
lowerLimit: obj['PH205L'], lowerLimit: obj['PH205L'],
superiorLimit: obj['PH205H'], // 上限 superiorLimit: obj['PH205H'], // 上限
consultValue: '8.0——9.0' consultValue: '8.0——9.0',
}, },
{ {
name: 'PH-402 pH调整池(电镍)', name: 'PH-402 pH调整池(电镍)',
gageValue: obj['PH402'], gageValue: obj['PH402'],
lowerLimit: obj['PH402L'], lowerLimit: obj['PH402L'],
superiorLimit: obj['PH402H'], // 上限 superiorLimit: obj['PH402H'], // 上限
consultValue: '9.0——10' consultValue: '9.0——10',
}, },
{ {
name: 'PH-502 pH调整池I(氰)', name: 'PH-502 pH调整池I(氰)',
gageValue: obj['PH502'], gageValue: obj['PH502'],
lowerLimit: obj['PH502L'], lowerLimit: obj['PH502L'],
superiorLimit: obj['PH502H'], // 上限 superiorLimit: obj['PH502H'], // 上限
consultValue: '10——11' consultValue: '10——11',
}, },
{ {
name: 'PH-504 pH调整池II(氰)', name: 'PH-504 pH调整池II(氰)',
gageValue: obj['PH504'], gageValue: obj['PH504'],
lowerLimit: obj['PH504L'], lowerLimit: obj['PH504L'],
superiorLimit: obj['PH504H'], // 上限 superiorLimit: obj['PH504H'], // 上限
consultValue: '7.0——8.0' consultValue: '7.0——8.0',
}, },
{ {
name: 'PH-506 pH调整池III(氰)', name: 'PH-506 pH调整池III(氰)',
gageValue: obj['PH506'], gageValue: obj['PH506'],
lowerLimit: obj['PH506L'], lowerLimit: obj['PH506L'],
superiorLimit: obj['PH506H'], // 上限 superiorLimit: obj['PH506H'], // 上限
consultValue: '8.0——9.0' consultValue: '8.0——9.0',
}, },
{ {
name: 'PH-511 中间水池(综)', name: 'PH-511 中间水池(综)',
gageValue: obj['PH511'], gageValue: obj['PH511'],
lowerLimit: obj['PH511L'], lowerLimit: obj['PH511L'],
superiorLimit: obj['PH511H'], // 上限 superiorLimit: obj['PH511H'], // 上限
consultValue: '7.0——8.0' consultValue: '7.0——8.0',
}, },
{ {
name: 'PH-601 化学镍调节池', name: 'PH-601 化学镍调节池',
gageValue: obj['PH601'], gageValue: obj['PH601'],
lowerLimit: obj['PH601L'], lowerLimit: obj['PH601L'],
superiorLimit: obj['PH601H'], // 上限 superiorLimit: obj['PH601H'], // 上限
consultValue: '2.0——3.0' consultValue: '2.0——3.0',
}, },
{ {
name: 'PH-607 pH调整池(化镍)', name: 'PH-607 pH调整池(化镍)',
gageValue: obj['PH607'], gageValue: obj['PH607'],
lowerLimit: obj['PH607L'], lowerLimit: obj['PH607L'],
superiorLimit: obj['PH607H'], // 上限 superiorLimit: obj['PH607H'], // 上限
consultValue: '9.0——10' consultValue: '9.0——10',
}, },
{ {
name: 'PH-701 前处理调节池', name: 'PH-701 前处理调节池',
gageValue: obj['PH701'], gageValue: obj['PH701'],
lowerLimit: obj['PH701L'], lowerLimit: obj['PH701L'],
superiorLimit: obj['PH701H'], // 上限 superiorLimit: obj['PH701H'], // 上限
consultValue: '2.0——3.0' consultValue: '2.0——3.0',
}, },
{ {
name: 'PH-706 pH调整池(前)', name: 'PH-706 pH调整池(前)',
gageValue: obj['PH706'], gageValue: obj['PH706'],
lowerLimit: obj['PH706L'], lowerLimit: obj['PH706L'],
superiorLimit: obj['PH706H'], // 上限 superiorLimit: obj['PH706H'], // 上限
consultValue: '8.0——9.0' consultValue: '8.0——9.0',
}, },
{ {
name: 'PH-710 中间水池(前)', name: 'PH-710 中间水池(前)',
gageValue: obj['PH710'], gageValue: obj['PH710'],
lowerLimit: obj['PH710L'], lowerLimit: obj['PH710L'],
superiorLimit: obj['PH710H'], // 上限 superiorLimit: obj['PH710H'], // 上限
consultValue: '7.0——8.0' consultValue: '7.0——8.0',
}, },
{ {
name: 'ORP-103 一级破氰池(混)', name: 'ORP-103 一级破氰池(混)',
gageValue: obj['ORP103'], gageValue: obj['ORP103'],
lowerLimit: obj['ORP103L'], lowerLimit: obj['ORP103L'],
superiorLimit: obj['ORP103H'], // 上限 superiorLimit: obj['ORP103H'], // 上限
consultValue: '350——400' consultValue: '350——400',
}, },
{ {
name: 'ORP-105 二级破氰池(混)', name: 'ORP-105 二级破氰池(混)',
gageValue: obj['ORP105'], gageValue: obj['ORP105'],
lowerLimit: obj['ORP105L'], lowerLimit: obj['ORP105L'],
superiorLimit: obj['ORP105H'], // 上限 superiorLimit: obj['ORP105H'], // 上限
consultValue: '600——650' consultValue: '600——650',
}, },
{ {
name: 'ORP-204 还原池(铬)', name: 'ORP-204 还原池(铬)',
gageValue: obj['ORP204'], gageValue: obj['ORP204'],
lowerLimit: obj['ORP204L'], lowerLimit: obj['ORP204L'],
superiorLimit: obj['ORP204H'], // 上限 superiorLimit: obj['ORP204H'], // 上限
consultValue: '600——650' consultValue: '600——650',
}, },
{ {
name: 'ORP-503 一级破氰池(氰)', name: 'ORP-503 一级破氰池(氰)',
gageValue: obj['ORP503'], gageValue: obj['ORP503'],
lowerLimit: obj['ORP503L'], lowerLimit: obj['ORP503L'],
superiorLimit: obj['ORP503H'], // 上限 superiorLimit: obj['ORP503H'], // 上限
consultValue: '350——400' consultValue: '350——400',
}, },
{ {
name: 'ORP-505 二级破氰池(氰)', name: 'ORP-505 二级破氰池(氰)',
gageValue: obj['ORP505'], gageValue: obj['ORP505'],
lowerLimit: obj['ORP505L'], lowerLimit: obj['ORP505L'],
superiorLimit: obj['ORP505H'], // 上限 superiorLimit: obj['ORP505H'], // 上限
consultValue: '600——650' consultValue: '600——650',
}, },
{ {
name: 'ORP-604 Feton池(化镍)', name: 'ORP-604 Feton池(化镍)',
gageValue: obj['ORP604'], gageValue: obj['ORP604'],
lowerLimit: obj['ORP604L'], lowerLimit: obj['ORP604L'],
superiorLimit: obj['ORP604H'], // 上限 superiorLimit: obj['ORP604H'], // 上限
consultValue: '600——650' consultValue: '600——650',
}, },
{ {
name: 'ORP-703 Feton池(前)', name: 'ORP-703 Feton池(前)',
gageValue: obj['ORP703'], gageValue: obj['ORP703'],
lowerLimit: obj['ORP703L'], lowerLimit: obj['ORP703L'],
superiorLimit: obj['ORP703H'], // 上限 superiorLimit: obj['ORP703H'], // 上限
consultValue: '600——650' consultValue: '600——650',
}, },
{ {
name: 'DL-101 混排废水流量计', name: 'DL-101 混排废水流量计',
gageValue: obj['DL101'], gageValue: obj['DL101'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-201 含铬废水流量计', name: 'DL-201 含铬废水流量计',
gageValue: obj['DL201'], gageValue: obj['DL201'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-202 酸性废水流量计', name: 'DL-202 酸性废水流量计',
gageValue: obj['DL202'], gageValue: obj['DL202'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-301 焦铜废水流量计', name: 'DL-301 焦铜废水流量计',
gageValue: obj['DL301'], gageValue: obj['DL301'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-401 电镀镍废水流量计', name: 'DL-401 电镀镍废水流量计',
gageValue: obj['DL401'], gageValue: obj['DL401'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-501 含氰废水流量计', name: 'DL-501 含氰废水流量计',
gageValue: obj['DL501'], gageValue: obj['DL501'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-601 化镍废水流量计', name: 'DL-601 化镍废水流量计',
gageValue: obj['DL601'], gageValue: obj['DL601'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-701 前处理废水流量计', name: 'DL-701 前处理废水流量计',
gageValue: obj['DL701'], gageValue: obj['DL701'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-710 中继提升泵流量计', name: 'DL-710 中继提升泵流量计',
gageValue: obj['DL710'], gageValue: obj['DL710'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
}, },
{ {
name: 'DL-600 化镍废液流量计', name: 'DL-600 化镍废液流量计',
gageValue: obj['DL600'], gageValue: obj['DL600'],
lowerLimit: '', lowerLimit: '',
superiorLimit: '', // 上限 superiorLimit: '', // 上限
consultValue: '' consultValue: '',
} },
]; ];
this.data = this.pageData this.data = this.pageData;
this.loading = false this.loading = false;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;

39
src/views/safetyManagement/wastewater/components/testRecord.vue
Unescape View File

@ -16,13 +16,21 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button> <el-button type="primary" v-if="permission.wastewater3_add" @click="moldAddFn(null, true)"
<el-button type="danger" @click="handleBatchDelete">删 除 </el-button> >新增</el-button
>
<el-button type="danger" v-if="permission.wastewater3_del" @click="handleBatchDelete"
>删 除
</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" v-if="permission.wastewater3_import" @click="handleImport"
>导入
</el-button>
</template> </template>
</avue-crud> </avue-crud>
<!-- 导入 --> <!-- 导入 -->
@ -51,6 +59,7 @@
import { getList, update, getUserList, remove } from '@/api/safetyManagement/testRecord.js'; import { getList, update, getUserList, remove } 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';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
basicImport, basicImport,
@ -277,8 +286,18 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
query: {},
}; };
}, },
computed: {
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.wastewater3_edit, false),
delBtn: this.validData(this.permission.wastewater3_del, false),
};
},
},
methods: { methods: {
// 化验人 // 化验人
fetchUserList() { fetchUserList() {
@ -387,6 +406,20 @@ export default {
} }
); );
}, },
// 排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
this.query.isAsc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false;
}
// 重新加载数据
this.onLoad(this.page, this.query);
},
// 加载页面数据 // 加载页面数据
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;

Write Preview
Loading…
Cancel
Save