安环管理-安全管理-安全巡检点配置-新增排序

安环管理-安全管理-安全巡检任务-新增排序
安环管理-安全管理-安全巡检点配置-新增排序
安环管理-环保管理-环保巡检点配置-新增排序
安环管理-环保管理-环保巡检任务-新增排序
安环管理-环保管理-酸雾塔报警管理-报警点设置-新增排序
安环管理-环保管理-酸雾塔报警管理-报警记录-新增排序
安环管理-环保管理-废水处理-槽液排放记录-新增排序
安环管理-环保管理-废水处理-废水加药记录-新增排序
安环管理-环保管理-废水处理-废水化验记录-新增排序
安环管理-环保管理-废水处理-仪表参数-新增排序
安环管理-环保管理-废气处理-废气加药记录-新增排序
安环管理-环保管理-废气处理-废气运行记录-新增排序
dev-scheduling
ysn 2 months ago
parent d8d43e4134
commit 4575cd6781
  1. 32
      src/views/safetyManagement/equipmentInspectionPoint/index.vue
  2. 42
      src/views/safetyManagement/equipmentInspectionTask/index.vue
  3. 24
      src/views/safetyManagement/safetyInspectionPoint/index.vue
  4. 39
      src/views/safetyManagement/safetyInspectionTask/index.vue
  5. 33
      src/views/safetyManagement/wasteGasSet/components/alarmPoint.vue
  6. 31
      src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue
  7. 31
      src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue
  8. 41
      src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
  9. 31
      src/views/safetyManagement/wastewater/components/dischargeRec.vue
  10. 31
      src/views/safetyManagement/wastewater/components/dosingRecord.vue
  11. 23
      src/views/safetyManagement/wastewater/components/meterParameter.vue
  12. 37
      src/views/safetyManagement/wastewater/components/testRecord.vue

@ -118,7 +118,6 @@ export default {
index: false,
showOverflowTooltip: true,
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'center',
@ -129,7 +128,7 @@ export default {
{
label: '巡检点编号',
prop: 'insNum',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
@ -145,7 +144,7 @@ export default {
{
label: '巡检点位置',
prop: 'insSite',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
@ -161,12 +160,13 @@ export default {
{
label: '巡检点类型',
prop: 'insType',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
searchLabelWidth: 90,
type: 'select',
width: 110,
dicData: [
{ label: '废水巡检点', value: '1' },
{ label: '废气巡检点', value: '2' },
@ -182,12 +182,13 @@ export default {
{
label: '巡检周期(h)',
prop: 'insCycle',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: false,
searchLabelWidth: 90,
type: 'number',
width: 110,
rules: [
{
required: true,
@ -199,17 +200,18 @@ export default {
{
label: '上次检验日期',
prop: 'lastInsCycle',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: false,
display: false,
searchLabelWidth: 100,
width: 150,
},
{
label: '备注',
prop: 'memo',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: false,
@ -333,17 +335,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},

@ -75,7 +75,6 @@ export default {
showOverflowTooltip: true,
menu: false,
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
@ -86,7 +85,7 @@ export default {
{
label: '巡检点编号',
prop: 'insNum',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
searchLabelWidth: 90,
@ -94,7 +93,7 @@ export default {
{
label: '巡检点位置',
prop: 'insSite',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
searchLabelWidth: 90,
@ -102,7 +101,7 @@ export default {
{
label: '巡检点类型',
prop: 'insType',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
@ -123,7 +122,7 @@ export default {
{
label: '等待周期',
prop: 'waitCycle',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
display: false,
@ -131,7 +130,7 @@ export default {
{
label: '巡检点备注',
prop: 'insMemo',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
display: false,
@ -147,13 +146,13 @@ export default {
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
searchRange: true,
startPlaceholder: "开始时间",
endPlaceholder: "结束时间",
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
},
{
label: '发起时间',
prop: 'launchTime',
sortable: true,
sortable: 'custom',
filter: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@ -163,14 +162,14 @@ export default {
{
label: '巡检人',
prop: 'insMan',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
},
{
label: '检验时间',
prop: 'queryTestTime',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
hide: true,
@ -182,7 +181,7 @@ export default {
{
label: '检验时间',
prop: 'testTime',
sortable: true,
sortable: 'custom',
filter: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
@ -192,7 +191,7 @@ export default {
{
label: '任务状态',
prop: 'taskStatus',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
type: 'select',
@ -216,7 +215,7 @@ export default {
{
label: '备注',
prop: 'parMemo',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
},
@ -243,15 +242,12 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},

@ -126,7 +126,7 @@ export default {
{
label: '巡检点编号',
prop: 'insNum',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
@ -142,7 +142,7 @@ export default {
{
label: '巡检点位置',
prop: 'insSite',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: true,
@ -158,7 +158,7 @@ export default {
// {
// label: '',
// prop: 'insSpotType',
// sortable: true,
// sortable: 'custom',
// filter: true,
// span: 24,
// search: true,
@ -174,17 +174,18 @@ export default {
{
label: '上次检验日期',
prop: 'lastInsCycle',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: false,
display: false,
searchLabelWidth: 100,
width: 150,
},
{
label: '备注',
prop: 'memo',
sortable: true,
sortable: 'custom',
filter: true,
span: 24,
search: false,
@ -325,15 +326,10 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop ? undefined : prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},

@ -87,7 +87,7 @@ export default {
{
label: '巡检点编号',
prop: 'insNum',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
searchLabelWidth: 90,
@ -95,7 +95,7 @@ export default {
{
label: '巡检点位置',
prop: 'insSite',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
searchLabelWidth: 90,
@ -103,7 +103,7 @@ export default {
{
label: '等待周期',
prop: 'waitCycle',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
display: false,
@ -111,7 +111,7 @@ export default {
{
label: '巡检点备注',
prop: 'insMemo',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
display: false,
@ -131,24 +131,26 @@ export default {
{
label: '发起时间',
prop: 'launchTime',
sortable: true,
sortable: 'custom',
filter: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
searchRange: true,
width: 150,
},
{
label: '巡检人',
prop: 'insMan',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
width: 100,
},
{
label: '检验时间',
prop: 'queryTestTime',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
hide: true,
@ -160,22 +162,24 @@ export default {
{
label: '检验时间',
prop: 'testTime',
sortable: true,
sortable: 'custom',
filter: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
// searchRange: true,
width: 150,
},
{
label: '任务状态',
prop: 'taskStatus',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
type: 'select',
// value: "2",
searchLabelWidth: 80,
width: 100,
dicData: [
{
label: '已检',
@ -198,7 +202,7 @@ export default {
{
label: '备注',
prop: 'parMemo',
sortable: true,
sortable: 'custom',
filter: true,
search: false,
},
@ -209,15 +213,12 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},

@ -102,7 +102,7 @@ export default {
{
label: '编码',
prop: 'btCode',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -120,7 +120,7 @@ export default {
prop: 'btName',
search: true,
searchLabelWidth: 50,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -135,7 +135,7 @@ export default {
label: '药品名称',
prop: 'drugName',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -151,7 +151,7 @@ export default {
prop: 'threshold',
search: true,
searchLabelWidth: 80,
sortable: true,
sortable: 'custom',
filter: true,
type: 'number',
span: 12,
@ -167,7 +167,7 @@ export default {
label: 'PH报警点位',
prop: 'phPoint',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -182,7 +182,7 @@ export default {
label: '风机运行点位',
prop: 'fanRunPoint',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -197,7 +197,7 @@ export default {
label: '风机报警点位',
prop: 'fanPoint',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -205,7 +205,7 @@ export default {
label: '循环泵报警点位',
prop: 'pumpPoint',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -344,16 +344,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {

@ -90,7 +90,7 @@ export default {
{
label: '编码',
prop: 'btCode',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
searchLabelWidth: 50,
@ -100,7 +100,7 @@ export default {
prop: 'queryBtDate',
search: true,
searchLabelWidth: 50,
sortable: true,
sortable: 'custom',
hide: true,
filter: true,
type: 'date',
@ -113,7 +113,7 @@ export default {
{
label: '时间',
prop: 'btDate',
sortable: true,
sortable: 'custom',
filter: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
@ -125,7 +125,7 @@ export default {
prop: 'errorPoint',
search: true,
searchLabelWidth: 65,
sortable: true,
sortable: 'custom',
filter: true,
},
{
@ -133,7 +133,7 @@ export default {
prop: 'messText',
search: true,
searchLabelWidth: 80,
sortable: true,
sortable: 'custom',
filter: true,
},
{
@ -141,7 +141,7 @@ export default {
prop: 'dealStatus',
search: true,
searchLabelWidth: 50,
sortable: true,
sortable: 'custom',
filter: true,
type: 'select',
value: 1,
@ -160,7 +160,7 @@ export default {
label: '持续时间',
prop: 'consLong',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
},
],
@ -282,16 +282,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {

@ -135,7 +135,7 @@ export default {
{
label: '设施',
prop: 'device',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -152,7 +152,7 @@ export default {
label: '药品',
prop: 'drug',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 50,
@ -168,7 +168,7 @@ export default {
label: '剂量(kg)',
prop: 'dose',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 70,
@ -185,7 +185,7 @@ export default {
label: '加药时间',
prop: 'queryDosingTime',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
display: false,
editDisplay: false,
@ -208,7 +208,7 @@ export default {
{
label: '加药时间',
prop: 'dosingTime',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'datetime',
@ -228,7 +228,7 @@ export default {
search: true,
span: 12,
searchLabelWidth: 60,
sortable: true,
sortable: 'custom',
filter: true,
type: 'select',
dicData: [],
@ -248,7 +248,7 @@ export default {
label: '备注',
prop: 'memo',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -397,16 +397,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

@ -117,7 +117,7 @@ export default {
{
label: '设备编号',
prop: 'deviceNum',
sortable: true,
sortable: 'custom',
filter: true,
search: true,
width: 120,
@ -134,7 +134,7 @@ export default {
// label: "",
// prop: "startTime",
// search: false,
// sortable: true,
// sortable: 'custom',
// filter: true,
// type: "date",
// format: "YYYY-MM-DD",
@ -144,7 +144,7 @@ export default {
// {
// label: "",
// prop: "runTime",
// sortable: true,
// sortable: 'custom',
// filter: true,
// width: 120,
// },
@ -156,7 +156,7 @@ export default {
label: '开始时间',
prop: 'queryStartTime',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
display: false,
hide: true,
@ -173,7 +173,7 @@ export default {
label: '开始时间',
prop: 'startTime',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 120,
type: 'datetime',
@ -191,7 +191,7 @@ export default {
label: '结束时间',
prop: 'queryEndTime',
search: true,
sortable: true,
sortable: 'custom',
hide: true,
filter: true,
display: false,
@ -209,7 +209,7 @@ export default {
label: '结束时间',
prop: 'endTime',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 120,
type: 'datetime',
@ -227,7 +227,7 @@ export default {
label: '运行时间(H)',
prop: 'runTime',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 130,
},
@ -246,7 +246,7 @@ export default {
label: '药品名称',
prop: 'drugName',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 120,
},
@ -254,7 +254,7 @@ export default {
label: '药品投加量(kg)',
prop: 'drugNum',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 150,
},
@ -360,7 +360,7 @@ export default {
label: '维保记录',
prop: 'record',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
width: 120,
},
@ -369,7 +369,7 @@ export default {
prop: 'dutyMan',
search: true,
searchLabelWidth: 70,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'select',
@ -528,16 +528,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

@ -132,7 +132,7 @@ export default {
label: '报废槽液类型',
prop: 'wasteType',
// bind: "wasteType.wtName",
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -157,7 +157,7 @@ export default {
prop: 'bsTeamSet',
// bind: "bsTeamSet.tsName",
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'select',
@ -178,7 +178,7 @@ export default {
label: '排放量(单位:L)',
prop: 'amount',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 110,
@ -196,7 +196,7 @@ export default {
prop: 'queryDirDate',
search: true,
searchLabelWidth: 50,
sortable: true,
sortable: 'custom',
filter: true,
hide: true,
editDisplay: false,
@ -219,7 +219,7 @@ export default {
label: '日期',
prop: 'dirDate',
// search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'datetime',
@ -238,7 +238,7 @@ export default {
prop: 'handleMan',
filterable: true,
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'select',
@ -259,7 +259,7 @@ export default {
label: '备注',
prop: 'memo',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -385,16 +385,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

@ -130,7 +130,7 @@ export default {
{
label: '设施',
prop: 'device',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -147,7 +147,7 @@ export default {
label: '药品',
prop: 'drug',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 50,
@ -163,7 +163,7 @@ export default {
label: '剂量(kg)',
prop: 'dose',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 70,
@ -180,7 +180,7 @@ export default {
label: '加药时间',
prop: 'queryDosingTime',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
display: false,
editDisplay: false,
@ -203,7 +203,7 @@ export default {
{
label: '加药时间',
prop: 'dosingTime',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'datetime',
@ -222,7 +222,7 @@ export default {
prop: 'dosingMan',
search: true,
searchLabelWidth: 60,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'select',
@ -243,7 +243,7 @@ export default {
label: '备注',
prop: 'memo',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -392,16 +392,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

@ -97,7 +97,7 @@ export default {
{
label: '池体名称',
prop: 'poolName',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -107,7 +107,7 @@ export default {
label: '测量值',
prop: 'poolName',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -130,7 +130,7 @@ export default {
label: '参考值',
prop: 'consult',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -167,16 +167,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

@ -122,7 +122,7 @@ export default {
{
label: '设施',
prop: 'device',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -141,7 +141,7 @@ export default {
search: true,
searchLabelWidth: 80,
hide: true,
sortable: true,
sortable: 'custom',
filter: true,
editDisplay: false,
display: false,
@ -158,7 +158,7 @@ export default {
label: '化验时间',
prop: 'dosingTime',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
type: 'datetime',
@ -176,7 +176,7 @@ export default {
label: '化验人',
prop: 'dosingMan',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 60,
@ -198,7 +198,7 @@ export default {
label: '镍',
prop: 'itNi',
search: true,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
searchLabelWidth: 40,
@ -214,7 +214,7 @@ export default {
label: '铜',
prop: 'itCu',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -229,7 +229,7 @@ export default {
label: '六价铬',
prop: 'itCr',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -244,7 +244,7 @@ export default {
label: '氰化物',
prop: 'itCn2',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -259,7 +259,7 @@ export default {
label: 'PH',
prop: 'itPh',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
rules: [
@ -274,7 +274,7 @@ export default {
label: '备注',
prop: 'memo',
search: false,
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
},
@ -408,16 +408,13 @@ 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.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// //
this.onLoad(this.page, this.query);
},
//

Loading…
Cancel
Save