fix conflicts

This commit is contained in:
lb 2023-11-28 16:14:24 +08:00
parent 99f771a445
commit a5c17d2276
2 changed files with 43 additions and 54 deletions

View File

@ -162,6 +162,7 @@ export default {
buildProps(nameData) {
return new Promise((resolve, reject) => {
try {
const dateArr = Array.from(
new Set(
nameData
@ -200,12 +201,15 @@ export default {
});
resolve();
} catch (err) {
reject(err);
}
});
},
async buildTableData(data) {
/** 处理 工段 分组 */
const sectionList = data.map(item => {})
const sectionList = data.map((item) => {});
},
setRowSpan(arr) {

View File

@ -59,14 +59,9 @@
<script>
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import { publicFormatter } from '@/utils/dict';
<<<<<<< HEAD
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
=======
import AddOrUpdate from './AddOrUpdate.vue';
import moment from 'moment';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
>>>>>>> projects/mes-test
const btn = {
name: 'tableBtn',
@ -97,13 +92,9 @@ export default {
mixins: [basicPageMixin],
data() {
return {
<<<<<<< HEAD
searchBarKeys: ['equipmentName', 'createTime'],
=======
readOnly: false,
chosedLogId: false,
searchBarKeys: ['equipmentName', 'recordTime'],
>>>>>>> projects/mes-test
tableBtn: [
// this.$auth.hasPermi('equipment:spare-parts-config:update')
// ? {
@ -128,11 +119,6 @@ export default {
{ prop: 'productionLine', label: '产线' },
{ prop: 'workshopSection', 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',
label: '报警级别',
@ -140,7 +126,6 @@ export default {
},
{ prop: 'createTime', label: '报警时间', filter: timeFilter }, //
{ prop: 'alarmCode', label: '设备报警码' }, //
>>>>>>> projects/mes-test
{ prop: 'alarmContent', label: '报警内容' },
{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO:
@ -221,7 +206,7 @@ export default {
pageSize: 10,
lineId: null,
equipmentId: null,
recordTime: []
recordTime: [],
},
basePath: '/base/equipment-alarm-log',
list: [],