Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

dev-scheduling
zhangdi 2 months ago
commit 33a288c984
  1. 19
      src/views/personnelEfficiencyManagement/performanceManagement/dataReporting.vue
  2. 15
      src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue
  3. 48
      src/views/personnelEfficiencyManagement/performanceManagement/templateMaintenance.vue
  4. 169
      src/views/safetyManagement/equipmentInspectionPoint/index.vue
  5. 15
      src/views/safetyManagement/equipmentInspectionTask/index.vue
  6. 82
      src/views/safetyManagement/safetyInspectionPoint/index.vue
  7. 15
      src/views/safetyManagement/safetyInspectionTask/index.vue
  8. 194
      src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
  9. 15
      src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue

@ -17,6 +17,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left>
<el-button
@ -205,6 +206,7 @@ export default {
currentPage: 1,
total: 0,
},
query: {},
option: {
height: 'auto',
align: 'center',
@ -285,7 +287,7 @@ export default {
{ label: '审批通过', value: 4, type: 'success' }, // 绿 -
{ label: '审批不通过', value: 5, type: 'danger' }, // - /
{ label: '已超期', value: 6, type: 'danger' }, // - /
{label:"任务失败",value:7,type:"danger"}
{ label: '任务失败', value: 7, type: 'danger' },
],
},
{
@ -529,6 +531,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();
},
onLoad() {
this.loading = true;
const params = {
@ -536,6 +552,7 @@ export default {
currentPage: this.page.currentPage,
...this.query,
};
console.log(params);
pageBsEfficiencyTask(params)
.then(res => {
if (res.data.code === 200) {

@ -15,6 +15,7 @@
@refresh-change="refreshChange"
@on-load="onLoad"
@cell-click="cellClick"
@sort-change="sortChange"
>
</avue-crud>
<prefDetail
@ -287,6 +288,20 @@ export default {
this.onLoad(this.page, this.query);
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();
},
//
async onLoad() {
this.loading = true;

@ -17,16 +17,40 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd" v-if="permission.performanceAllocation_add">新增绩效</el-button>
<el-button type="primary" @click="handleAdd" v-if="permission.performanceAllocation_add">
新增绩效
</el-button>
<!-- <el-button type="danger" @click="batchDelete">删除</el-button> -->
<!-- <el-button type="primary" @click="maintenanceContents">绩效内容维护</el-button> -->
</template>
<template #menu="scope">
<el-button type="primary" text v-if="permission.performanceAllocation_edit" @click="editRow(scope.row)">修改</el-button>
<el-button type="primary" text v-if="permission.performanceAllocation_delete" @click="deleteRow(scope.row)">删除</el-button>
<el-button type="primary" text v-if="permission.performanceAllocation_issue" @click="taskAssignment(scope.row)">下发</el-button>
<el-button
type="primary"
text
v-if="permission.performanceAllocation_edit"
@click="editRow(scope.row)"
>
修改
</el-button>
<el-button
type="primary"
text
v-if="permission.performanceAllocation_delete"
@click="deleteRow(scope.row)"
>
删除
</el-button>
<el-button
type="primary"
text
v-if="permission.performanceAllocation_issue"
@click="taskAssignment(scope.row)"
>
下发
</el-button>
</template>
</avue-crud>
<batchAddPerf
@ -249,7 +273,7 @@ export default {
};
},
computed: {
...mapGetters([ 'permission']),
...mapGetters(['permission']),
},
mounted() {},
methods: {
@ -376,6 +400,20 @@ export default {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
//
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();
},
onLoad() {
this.loading = true;
pageBsEfficiencyTemp({

@ -8,7 +8,7 @@
v-model:page="page"
ref="crud"
@row-del="rowDel"
@row-save="rowSave"
@row-save="rowSave"
@row-update="rowUpdate"
@search-change="searchChange"
@search-reset="searchReset"
@ -17,43 +17,64 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd">新增 </el-button>
<el-button type="danger" @click="handleDelete"
>删除
<el-button type="primary" v-if="permission.equipmentInspectionPoint_add" @click="handleAdd">
新增
</el-button>
<el-button
type="danger"
v-if="permission.equipmentInspectionPoint_del"
@click="handleDelete"
>
删除
</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport"
<el-button
type="primary"
v-if="permission.equipmentInspectionPoint_import"
@click="handleImport"
>导入
</el-button>
</template>
</avue-crud>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
<!-- 导入 -->
<basic-import
v-if="isShowImport"
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsEpciuInspectionPoint/downloadExcelTemplate"
templateName="环保巡检点配置表模板.xls"
importUrl="/blade-desk/bsEpciuInspectionPoint/importExcel"
@closeDialog="closeImportDialog"></basic-import>
<!-- 新增弹窗 -->
<addInspectDailog v-if="showDialog" :showDialog="showDialog" :moldAddMore="moldAddMore" @closeDialog="closeDialog"
:title="title"></addInspectDailog>
@closeDialog="closeImportDialog"
></basic-import>
<!-- 新增弹窗 -->
<addInspectDailog
v-if="showDialog"
:showDialog="showDialog"
:moldAddMore="moldAddMore"
@closeDialog="closeDialog"
:title="title"
></addInspectDailog>
</basic-container>
</template>
<script>
import basicImport from '@/components/basic-import/main.vue';
import { getList, add, remove, update } from '@/api/safetyManagement/equipmentInspectionPoint';
import addInspectDailog from './addInspectDailog.vue'
import addInspectDailog from './addInspectDailog.vue';
import { mapGetters } from 'vuex';
export default {
components: {
basicImport,
addInspectDailog
addInspectDailog,
},
data() {
return {
isShowImport:false,
isShowImport: false,
page: {
pageSize: 10,
currentPage: 1,
@ -62,7 +83,7 @@ export default {
selectionList: [],
data: [],
option: {
height: "auto",
height: 'auto',
calcHeight: 32,
tip: false,
simplePage: true,
@ -78,11 +99,11 @@ export default {
delBtn: false,
addBtn: false,
editBtn: true,
editBtnText: "修改",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
labelWidth: 120,
menuWidth: 80,
dialogWidth: 600,
@ -96,18 +117,18 @@ export default {
columnSort: true,
index: false,
showOverflowTooltip: true,
searchLabelPosition: "left",
searchLabelPosition: "left",
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "center",
menuAlign: 'center',
gridBtn: false,
searchMenuPosition: "right",
align: "center",
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: "巡检点编号",
prop: "insNum",
label: '巡检点编号',
prop: 'insNum',
sortable: true,
filter: true,
span: 24,
@ -116,14 +137,14 @@ export default {
rules: [
{
required: true,
message: "请输入巡检点编号",
trigger: "blur",
message: '请输入巡检点编号',
trigger: 'blur',
},
],
},
{
label: "巡检点位置",
prop: "insSite",
label: '巡检点位置',
prop: 'insSite',
sortable: true,
filter: true,
span: 24,
@ -132,14 +153,14 @@ export default {
rules: [
{
required: true,
message: "请输入巡检点位置",
trigger: "blur",
message: '请输入巡检点位置',
trigger: 'blur',
},
],
},
{
label: "巡检点类型",
prop: "insType",
label: '巡检点类型',
prop: 'insType',
sortable: true,
filter: true,
span: 24,
@ -153,14 +174,14 @@ export default {
rules: [
{
required: true,
message: "请输入巡检点位置",
trigger: "blur",
message: '请输入巡检点位置',
trigger: 'blur',
},
],
},
{
label: "巡检周期(h)",
prop: "insCycle",
{
label: '巡检周期(h)',
prop: 'insCycle',
sortable: true,
filter: true,
span: 24,
@ -170,14 +191,14 @@ export default {
rules: [
{
required: true,
message: "请输入巡检周期(h)",
trigger: "blur",
message: '请输入巡检周期(h)',
trigger: 'blur',
},
],
},
{
label: "上次检验日期",
prop: "lastInsCycle",
label: '上次检验日期',
prop: 'lastInsCycle',
sortable: true,
filter: true,
span: 24,
@ -186,20 +207,20 @@ export default {
searchLabelWidth: 100,
},
{
label: "备注",
prop: "memo",
label: '备注',
prop: 'memo',
sortable: true,
filter: true,
span: 24,
search: false,
type: "textarea",
type: 'textarea',
searchLabelWidth: 90,
rows: 3,
rules: [
{
required: false,
message: "请输入备注",
trigger: "blur",
message: '请输入备注',
trigger: 'blur',
},
],
},
@ -208,6 +229,7 @@ export default {
title: '新增',
showDialog: false,
moldAddMore: false,
query: {},
};
},
computed: {
@ -218,11 +240,18 @@ export default {
});
return ids.join(',');
},
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.equipmentInspectionPoint_edit, false),
delBtn: this.validData(this.permission.equipmentInspectionPoint_del, false),
};
},
},
methods: {
//
handleImport() {
this.isShowImport = true
this.isShowImport = true;
},
//
closeImportDialog() {
@ -276,7 +305,6 @@ export default {
},
//
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
@ -298,24 +326,35 @@ export default {
},
//
searchReset() {
this.query = {}
this.onLoad(this.page)
this.query = {};
this.onLoad(this.page);
},
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
},
//
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 = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
(res) => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
}
);
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
});
},
//
refreshChange() {
@ -325,17 +364,15 @@ export default {
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params)
done()
this.onLoad(this.page, params);
done();
},
//
closeDialog(isRefresh=false) {
closeDialog(isRefresh = false) {
this.showDialog = false;
if (isRefresh) {
this.onLoad(this.page);
}
},
//
handleAdd() {

@ -16,6 +16,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left> </template>
<template #menu-right> </template>
@ -240,6 +241,20 @@ export default {
this.query = { taskStatus: '1' };
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 = {}) {
this.loading = true;

@ -16,14 +16,26 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd">新增 </el-button>
<el-button type="danger" @click="handleDelete">删除 </el-button>
<el-button type="primary" v-if="permission.safetyInspectionPoint_add" @click="handleAdd">
新增
</el-button>
<el-button type="danger" v-if="permission.safetyInspectionPoint_del" @click="handleDelete">
删除
</el-button>
</template>
<template #menu-right>
<!-- <el-button type="primary" @click="handlePrint">打印 </el-button> -->
<el-button type="primary" @click="handleImport">导入 </el-button>
<el-button
type="primary"
v-if="permission.safetyInspectionPoint_import"
@click="handleImport"
>
导入
</el-button>
</template>
</avue-crud>
<!-- 导入 -->
@ -37,25 +49,25 @@
@closeDialog="closeImportDialog"
></basic-import>
<!-- 新增弹窗 -->
<addInspectDailog
<addInspectDailog
v-if="showDialog"
:showDialog="showDialog"
:moldAddMore="moldAddMore"
@closeDialog="closeDialog"
:title="title"
></addInspectDailog>
></addInspectDailog>
</basic-container>
</template>
<script>
import basicImport from '@/components/basic-import/main.vue';
import { getList, add, remove, update } from '@/api/safetyManagement/safetyInspectionPoint.js';
import addInspectDailog from './addInspectDailog.vue'
import addInspectDailog from './addInspectDailog.vue';
import { mapGetters } from 'vuex';
export default {
components: {
basicImport,
addInspectDailog
addInspectDailog,
},
data() {
return {
@ -202,22 +214,29 @@ export default {
});
return ids.join(',');
},
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.safetyInspectionPoint_edit, false),
delBtn: this.validData(this.permission.safetyInspectionPoint_del, false),
};
},
},
methods: {
//
handleImport() {
this.isShowImport = true
this.isShowImport = true;
},
//
rowSave(row, done, loading) {
add(row).then(
res => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
rowSave(row, done, loading) {
add(row).then(
res => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
window.console.log(error);
@ -275,7 +294,7 @@ export default {
});
},
//
rowUpdate(row, index, done, loading) {
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
@ -297,15 +316,29 @@ export default {
},
//
searchReset() {
this.query = {}
this.onLoad(this.page)
this.query = {};
this.onLoad(this.page);
},
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
},
//
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;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
.then(res => {
@ -326,9 +359,8 @@ export default {
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params)
done()
this.onLoad(this.page, params);
done();
},
//
closeDialog() {

@ -16,6 +16,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left> </template>
<template #menu-right> </template>
@ -206,6 +207,20 @@ export default {
};
},
methods: {
//
sortChange({ prop, order }) {
if (!prop) {s
//
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 = {}) {
this.loading = true;

@ -1,34 +1,36 @@
<template>
<div>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@row-save="rowSave"
@row-update="rowUpdate"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<el-button type="danger" @click="handleDelete"
>
</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport"
>导入
</el-button>
</template>
</avue-crud>
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@row-save="rowSave"
@row-update="rowUpdate"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
>
<template #menu-left>
<el-button type="danger" v-if="permission.acidMistTower1_del" @click="handleDelete"
>
</el-button>
</template>
<template #menu-right>
<el-button type="primary" v-if="permission.acidMistTower1_import" @click="handleImport">
导入
</el-button>
</template>
</avue-crud>
<!-- 导入 -->
<basic-import
v-if="isShowImport"
@ -43,8 +45,8 @@
</template>
<script>
import basicImport from '@/components/basic-import/main.vue';
import { getList, add, remove, update } from '@/api/safetyManagement/acidMistToweralarmPoint.js'
import { getList, add, remove, update } from '@/api/safetyManagement/acidMistToweralarmPoint.js';
import { mapGetters } from 'vuex';
export default {
components: {
basicImport,
@ -55,7 +57,7 @@ export default {
loading: false,
selectionList: [],
option: {
height: "auto",
height: 'auto',
calcHeight: 32,
tip: false,
simplePage: true,
@ -69,12 +71,12 @@ export default {
selection: true,
viewBtn: false,
delBtn: false,
editBtnText: "修改",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
viewBtnText: "详情",
editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 80,
dialogWidth: 1040,
@ -88,18 +90,18 @@ export default {
columnSort: true,
index: false,
showOverflowTooltip: true,
searchLabelPosition: "left",
searchLabelPosition: "left",
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "center",
menuAlign: 'center',
gridBtn: false,
searchMenuPosition: "right",
align: "center",
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: "编码",
prop: "btCode",
label: '编码',
prop: 'btCode',
sortable: true,
filter: true,
span: 12,
@ -108,14 +110,14 @@ export default {
rules: [
{
required: true,
message: "请输入编码",
trigger: "blur",
message: '请输入编码',
trigger: 'blur',
},
],
},
{
label: "名称",
prop: "btName",
label: '名称',
prop: 'btName',
search: true,
searchLabelWidth: 50,
sortable: true,
@ -124,14 +126,14 @@ export default {
rules: [
{
required: true,
message: "请输入名称",
trigger: "blur",
message: '请输入名称',
trigger: 'blur',
},
],
},
{
label: "药品名称",
prop: "drugName",
label: '药品名称',
prop: 'drugName',
search: false,
sortable: true,
filter: true,
@ -139,31 +141,31 @@ export default {
rules: [
{
required: true,
message: "请输入药品名称",
trigger: "blur",
message: '请输入药品名称',
trigger: 'blur',
},
],
},
{
label: "报警阙值",
prop: "threshold",
label: '报警阙值',
prop: 'threshold',
search: true,
searchLabelWidth: 80,
sortable: true,
filter: true,
type: "number",
type: 'number',
span: 12,
rules: [
{
required: true,
message: "请输入报警阙值",
trigger: "blur",
message: '请输入报警阙值',
trigger: 'blur',
},
],
},
{
label: "PH报警点位",
prop: "phPoint",
label: 'PH报警点位',
prop: 'phPoint',
search: false,
sortable: true,
filter: true,
@ -171,14 +173,14 @@ export default {
rules: [
{
required: true,
message: "请输入PH报警点位",
trigger: "blur",
message: '请输入PH报警点位',
trigger: 'blur',
},
],
},
{
label: "风机运行点位",
prop: "fanRunPoint",
label: '风机运行点位',
prop: 'fanRunPoint',
search: false,
sortable: true,
filter: true,
@ -186,22 +188,22 @@ export default {
rules: [
{
required: true,
message: "请输入风机运行点位",
trigger: "blur",
message: '请输入风机运行点位',
trigger: 'blur',
},
],
},
{
label: "风机报警点位",
prop: "fanPoint",
label: '风机报警点位',
prop: 'fanPoint',
search: false,
sortable: true,
filter: true,
span: 12,
},
{
label: "循环泵报警点位",
prop: "pumpPoint",
label: '循环泵报警点位',
prop: 'pumpPoint',
search: false,
sortable: true,
filter: true,
@ -215,9 +217,11 @@ export default {
currentPage: 1,
total: 0,
},
query: {},
};
},
computed: {
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@ -225,6 +229,13 @@ export default {
});
return ids.join(',');
},
permissionList() {
return {
addBtn: this.validData(this.permission.acidMistTower1_add, false),
editBtn: this.validData(this.permission.acidMistTower1_edit, false),
// delBtn: this.validData(this.permission.acidMistTower1_del, false),
};
},
},
//
closeImportDialog() {
@ -234,7 +245,7 @@ export default {
methods: {
//
handleImport() {
this.isShowImport = true
this.isShowImport = true;
},
//
handleDelete() {
@ -265,19 +276,20 @@ export default {
},
//
rowSave(row, done, loading) {
add(row).then(res => {
this.onLoad(this.page)
this.$message({
type: 'success',
messge:'操作成功!'
})
done();
},
add(row).then(
res => {
this.onLoad(this.page);
this.$message({
type: 'success',
messge: '操作成功!',
});
done();
},
error => {
window.console.log(error)
loading()
}
)
window.console.log(error);
loading();
}
);
},
//
rowDel(row) {
@ -330,6 +342,20 @@ export default {
this.onLoad(this.page, params);
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 = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query))

@ -17,6 +17,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left> </template>
<template #menu-right> </template>
@ -279,6 +280,20 @@ export default {
this.selectionList = [];
this.$refs.table.clearSelection();
},
//
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 = {}) {
const requestParams = Object.assign({}, params, this.query);
//

Loading…
Cancel
Save