#260 projects/mesxc-lb

Обединени
juzi обедини 2 ревизии от projects/mesxc-lb във projects/mesxc-test преди 6 месеца
  1. +1
    -1
      src/views/equipment/timing-diagram/status/chart.js
  2. +27
    -23
      src/views/equipment/timing-diagram/status/index.vue

+ 1
- 1
src/views/equipment/timing-diagram/status/chart.js Целия файл

@@ -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
} }
} }


+ 27
- 23
src/views/equipment/timing-diagram/status/index.vue Целия файл

@@ -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: [
// [
// {
// equipmentName: '下片机',
// duration: 30,
// relativeDuration: 0.6,
// status: 0,
// startPos: 0,
// startTime: 1691568181000,
// },
// {
// equipmentName: '下片机',
// duration: 20,
// relativeDuration: 0.4,
// status: 2,
// startPos: 30,
// startTime: 1691569981000
// },
// ],
// ],
demo: [
[
{
equipmentName: '一大线四区2小线清洗机',
duration: 30,
relativeDuration: 0.6,
status: 0,
startPos: 0,
startTime: 1711073203686,
},
{
equipmentName: '一大线四区2小线清洗机',
duration: 20,
relativeDuration: 0.4,
status: 2,
startPos: 30,
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;
});
} }
}, },




Зареждане…
Отказ
Запис