projects/mes-zhp #125
@ -59,14 +59,9 @@
|
|||||||
<script>
|
<script>
|
||||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||||
import { publicFormatter } from '@/utils/dict';
|
import { publicFormatter } from '@/utils/dict';
|
||||||
<<<<<<< HEAD
|
|
||||||
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
|
|
||||||
|
|
||||||
=======
|
|
||||||
import AddOrUpdate from './AddOrUpdate.vue';
|
import AddOrUpdate from './AddOrUpdate.vue';
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
|
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
|
||||||
>>>>>>> projects/mes-test
|
|
||||||
|
|
||||||
const btn = {
|
const btn = {
|
||||||
name: 'tableBtn',
|
name: 'tableBtn',
|
||||||
@ -97,13 +92,9 @@ export default {
|
|||||||
mixins: [basicPageMixin],
|
mixins: [basicPageMixin],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
<<<<<<< HEAD
|
|
||||||
searchBarKeys: ['equipmentName', 'createTime'],
|
|
||||||
=======
|
|
||||||
readOnly: false,
|
readOnly: false,
|
||||||
chosedLogId: false,
|
chosedLogId: false,
|
||||||
searchBarKeys: ['equipmentName', 'recordTime'],
|
searchBarKeys: ['equipmentName', 'recordTime'],
|
||||||
>>>>>>> projects/mes-test
|
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
// this.$auth.hasPermi('equipment:spare-parts-config:update')
|
// this.$auth.hasPermi('equipment:spare-parts-config:update')
|
||||||
// ? {
|
// ? {
|
||||||
@ -128,11 +119,6 @@ export default {
|
|||||||
{ prop: 'productionLine', label: '产线' },
|
{ prop: 'productionLine', label: '产线' },
|
||||||
{ prop: 'workshopSection', label: '工段' },
|
{ prop: 'workshopSection', label: '工段' },
|
||||||
{ prop: 'equipment', label: '设备名称' },
|
{ prop: 'equipment', label: '设备名称' },
|
||||||
<<<<<<< HEAD
|
|
||||||
{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
|
|
||||||
{ prop: 'createTime', label: '报警时间',filter: timeFilter }, // 接口缺
|
|
||||||
{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
|
|
||||||
=======
|
|
||||||
{
|
{
|
||||||
prop: 'alarmGrade',
|
prop: 'alarmGrade',
|
||||||
label: '报警级别',
|
label: '报警级别',
|
||||||
@ -140,7 +126,6 @@ export default {
|
|||||||
},
|
},
|
||||||
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
|
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
|
||||||
{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
|
{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
|
||||||
>>>>>>> projects/mes-test
|
|
||||||
{ 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 }, // TODO: 是否换成按钮, 群里问
|
||||||
|
Loading…
Reference in New Issue
Block a user