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

安环管理-废水处理-去掉icon

Browse Source
dev-scheduling
ysn 5 days ago
parent 5e29d824e6
commit 980d011105
3 changed files with 71 additions and 76 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. 15
      src/views/safetyManagement/wastewater/components/dischargeRec.vue
  2. 14
      src/views/safetyManagement/wastewater/components/dosingRecord.vue
  3. 118
      src/views/safetyManagement/wastewater/components/testRecord.vue

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

@ -18,10 +18,10 @@
@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="primary" @click="moldAddFn(null, true)"
>新增</el-button >新增</el-button
> >
<el-button type="danger" icon="el-icon-delete" @click="handleBatchDelete">删 除 </el-button> <el-button type="danger" @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>
@ -95,13 +95,13 @@ export default {
viewBtn: false, viewBtn: false,
delBtn: true, delBtn: true,
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: 100,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -114,7 +114,6 @@ export default {
index: false, index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',

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

@ -19,10 +19,10 @@
:search.sync="search" :search.sync="search"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" icon="el-icon-plus" @click="moldAddFn(null, true)" <el-button type="primary" @click="moldAddFn(null, true)"
>新增</el-button >新增</el-button
> >
<el-button type="danger" icon="el-icon-delete" @click="handleBatchDelete">删 除 </el-button> <el-button type="danger" @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>
@ -93,13 +93,13 @@ export default {
viewBtn: false, viewBtn: false,
delBtn: true, delBtn: true,
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: 100,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

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

@ -7,8 +7,8 @@
v-model="form" v-model="form"
v-model:page="page" v-model:page="page"
ref="crud" ref="crud"
@row-del="handleDelete" @row-del="handleDelete"
@row-update="rowUpdate" @row-update="rowUpdate"
@search-change="searchChange" @search-change="searchChange"
@search-reset="searchReset" @search-reset="searchReset"
@selection-change="selectionChange" @selection-change="selectionChange"
@ -18,13 +18,11 @@
@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="primary" @click="moldAddFn(null, true)">新增</el-button>
>新增</el-button <el-button type="danger" @click="handleBatchDelete">删 除 </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>
</template> </template>
</avue-crud> </avue-crud>
<!-- 导入 --> <!-- 导入 -->
@ -37,32 +35,33 @@
importUrl="/blade-desk/bsInsTest/importExcel" importUrl="/blade-desk/bsInsTest/importExcel"
@closeDialog="closeImportDialog" @closeDialog="closeImportDialog"
></basic-import> ></basic-import>
<!-- 新增 --> <!-- 新增 -->
<addEditDialogTestRecord <addEditDialogTestRecord
v-if="addOpen" v-if="addOpen"
:showDialog="addOpen" :showDialog="addOpen"
@closeDialog="closeDialog" @closeDialog="closeDialog"
:moldAddMore="moldAddMore" :moldAddMore="moldAddMore"
:dosingManList="dosingManList" :dosingManList="dosingManList"
@submitData="handleSubmitData"> @submitData="handleSubmitData"
>
</addEditDialogTestRecord> </addEditDialogTestRecord>
</div> </div>
</template> </template>
<script> <script>
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';
export default { export default {
components: { components: {
basicImport, basicImport,
addEditDialogTestRecord addEditDialogTestRecord,
}, },
mounted() { mounted() {
this.fetchUserList() this.fetchUserList();
}, },
data() { data() {
return { return {
dosingManList:[], dosingManList: [],
addOpen: false, //新增弹窗 addOpen: false, //新增弹窗
moldAddMore: false, moldAddMore: false,
isShowImport: false, isShowImport: false,
@ -85,13 +84,13 @@ export default {
delBtn: true, delBtn: true,
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: 100,
dialogWidth: 1040, dialogWidth: 1040,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -104,7 +103,6 @@ export default {
index: false, index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
@ -133,20 +131,20 @@ export default {
prop: 'queryDosingTime', prop: 'queryDosingTime',
search: true, search: true,
searchLabelWidth: 80, searchLabelWidth: 80,
hide:true, hide: true,
sortable: true, sortable: true,
filter: true, filter: true,
editDisplay: false, editDisplay: false,
display: false, display: false,
span: 12, span: 12,
type: 'datetime', type: 'datetime',
searchRange: true, searchRange: true,
startPlaceholder: "开始时间", startPlaceholder: '开始时间',
endPlaceholder: "结束时间", endPlaceholder: '结束时间',
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',
}, },
{ {
label: '化验时间', label: '化验时间',
prop: 'dosingTime', prop: 'dosingTime',
@ -154,7 +152,7 @@ export default {
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: [
@ -287,42 +285,41 @@ export default {
getUserList({ getUserList({
current: 1, current: 1,
size: 10000000, size: 10000000,
roleId: '2008473492483850242' roleId: '2008473492483850242',
}).then(res => { }).then(res => {
const result = res.data.data.records const result = res.data.data.records;
this.dosingManList = result this.dosingManList = result;
console.log("化验人", result) console.log('化验人', result);
this.option.column.forEach(col => { this.option.column.forEach(col => {
if (col.prop === 'dosingMan') { if (col.prop === 'dosingMan') {
col.dicData = this.dosingManList; col.dicData = this.dosingManList;
} }
}); });
}) });
}, },
// 新增 // 新增
moldAddFn(row, flag) { moldAddFn(row, flag) {
this.addOpen = true this.addOpen = true;
this.moldAddMore = flag this.moldAddMore = flag;
},
//关闭弹窗
closeDialog() {
this.addOpen = false;
this.onLoad(this.page);
}, },
//关闭弹窗 //关闭弹窗
closeImportDialog() { closeDialog() {
this.addOpen = false;
this.onLoad(this.page);
},
//关闭弹窗
closeImportDialog() {
this.isShowImport = false; // 关闭导入弹窗 this.isShowImport = false; // 关闭导入弹窗
this.onLoad(this.page); this.onLoad(this.page);
}, },
// 处理子组件提交的数据 // 处理子组件提交的数据
handleSubmitData(data) { handleSubmitData(data) {
this.$message.success("数据提交成功！"); this.$message.success('数据提交成功！');
this.addOpen = false; this.addOpen = false;
}, },
// 点击导入按钮 // 点击导入按钮
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true;
}, },
// 批量删除 // 批量删除
handleBatchDelete() { handleBatchDelete() {
@ -359,10 +356,10 @@ export default {
}, },
// 搜索重置 // 搜索重置
searchReset() { searchReset() {
this.query = {} this.query = {};
this.onLoad(this.page) this.onLoad(this.page);
}, },
//刷新 //刷新
refreshChange() { refreshChange() {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
@ -370,9 +367,8 @@ export default {
searchChange(params, done) { searchChange(params, done) {
this.query = params; this.query = params;
this.page.currentPage = 1; this.page.currentPage = 1;
this.onLoad(this.page, params) this.onLoad(this.page, params);
done() done();
}, },
//更新 //更新
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
@ -409,7 +405,7 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
} },
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save