Merge branch 'projects/mes-test' into projects/mes-dy
This commit is contained in:
commit
5e4df4d849
@ -78,7 +78,6 @@ export default {
|
|||||||
return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
|
return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
|
||||||
},
|
},
|
||||||
del(payload) {
|
del(payload) {
|
||||||
debugger;
|
|
||||||
return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
|
return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
readOnly: false,
|
readOnly: false,
|
||||||
chosedLogId: false,
|
chosedLogId: false,
|
||||||
searchBarKeys: ['equipmentName', 'recordTime'],
|
searchBarKeys: ['equipmentName', 'createTime'],
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
// this.$auth.hasPermi('equipment:spare-parts-config:update')
|
// this.$auth.hasPermi('equipment:spare-parts-config:update')
|
||||||
// ? {
|
// ? {
|
||||||
@ -124,11 +124,11 @@ export default {
|
|||||||
label: '报警级别',
|
label: '报警级别',
|
||||||
filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
|
filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
|
||||||
},
|
},
|
||||||
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
|
{ prop: 'createTime', label: '报警时间', filter: timeFilter },
|
||||||
{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
|
{ prop: 'alarmCode', label: '设备报警码' },
|
||||||
{ prop: 'alarmContent', label: '报警内容' },
|
{ prop: 'alarmContent', label: '报警内容' },
|
||||||
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
|
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
|
||||||
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮, 群里问
|
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
|
||||||
// { prop: 'remark', label: '备注' },
|
// { prop: 'remark', label: '备注' },
|
||||||
],
|
],
|
||||||
searchBarFormConfig: [
|
searchBarFormConfig: [
|
||||||
@ -145,8 +145,8 @@ export default {
|
|||||||
dateType: 'daterange', // datetimerange
|
dateType: 'daterange', // datetimerange
|
||||||
// format: 'yyyy-MM-dd HH:mm:ss',
|
// format: 'yyyy-MM-dd HH:mm:ss',
|
||||||
format: 'yyyy-MM-dd',
|
format: 'yyyy-MM-dd',
|
||||||
valueFormat: 'timestamp',
|
// valueFormat: 'timestamp',
|
||||||
// valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
valueFormat: 'yyyy-MM-dd HH:mm:ss',
|
||||||
rangeSeparator: '-',
|
rangeSeparator: '-',
|
||||||
startPlaceholder: '开始日期',
|
startPlaceholder: '开始日期',
|
||||||
endPlaceholder: '结束日期',
|
endPlaceholder: '结束日期',
|
||||||
|
Loading…
Reference in New Issue
Block a user