mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-lb #260

Merged
juzi merged 2 commits from projects/mesxc-lb into projects/mesxc-test 2024-03-22 10:04:04 +08:00
Conversation 0 Commits 2 Files Changed 2 +28 -24
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14afb6d4b1 - Show all commits

2
src/views/equipment/timing-diagram/status/chart.js
View File

@ -112,7 +112,7 @@ export default class GanttGraph {
// top: 12 + 128 * this.gridIndex, // top: 12 + 128 * this.gridIndex,
top: 12 + 104 * this.gridIndex, top: 12 + 104 * this.gridIndex,
right: 48, right: 48,
left: 88, left: 183,
height: 56 height: 56
} }
} }

50
src/views/equipment/timing-diagram/status/index.vue
View File

@ -119,7 +119,7 @@ export default {
selectOptions: [], selectOptions: [],
param: 'lineId', param: 'lineId',
onchange: true, onchange: true,
filterable: true filterable: true,
}, },
{ {
type: 'select', type: 'select',
@ -127,7 +127,7 @@ export default {
placeholder: '请选择工段', placeholder: '请选择工段',
selectOptions: [], selectOptions: [],
param: 'sectionId', param: 'sectionId',
filterable: true filterable: true,
}, },
// 时间段 // 时间段
{ {
@ -171,26 +171,26 @@ export default {
eqList: [], eqList: [],
startTime: null, startTime: null,
gantt: null, gantt: null,
// demo: [ demo: [
// [ [
// { {
// equipmentName: '下片机', equipmentName: '一大线四区2小线清洗机',
// duration: 30, duration: 30,
// relativeDuration: 0.6, relativeDuration: 0.6,
// status: 0, status: 0,
// startPos: 0, startPos: 0,
// startTime: 1691568181000, startTime: 1711073203686,
// }, },
// { {
// equipmentName: '下片机', equipmentName: '一大线四区2小线清洗机',
// duration: 20, duration: 20,
// relativeDuration: 0.4, relativeDuration: 0.4,
// status: 2, status: 2,
// startPos: 30, startPos: 30,
// startTime: 1691569981000 startTime: 1711072203686,
// }, },
// ], ],
// ], ],
}; };
}, },
computed: {}, computed: {},
@ -258,7 +258,11 @@ export default {
this.existingEquipments = Object.values(data).map( this.existingEquipments = Object.values(data).map(
(eq) => eq[0].equipmentId (eq) => eq[0].equipmentId
); );
this.graphList = this.objectToArray(data); // this.graphList = this.objectToArray(data);
this.graphList = this.demo.map(item => {
item.key = item[0].equipmentName;
return item;
});
} }
}, },