mt-fe-group/yudao-init
9
0
Fork 0
Código Incidencias Pull Requests Lanzamientos Wiki Actividad

1 #53

Fusionado
juzi fusionados 1 commits de projects/mescc/zjl en projects/mescc/develop 2024-06-20 16:52:26 +08:00
Conversación 0 Commits 1 Archivos modificados 12 +36 -10
Se han modificado 12 ficheros con 36 adiciones y 10 borrados
Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos
Mostrando solo los cambios del commit e512ad5858 - Mostrar todos los commits

3
src/views/report/chipOEEBM/index.vue
Ver fichero

@@ -187,16 +187,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/chipOutputBM/index.vue
Ver fichero

@@ -182,16 +182,19 @@ export default {
{ {
prop: "lastone", prop: "lastone",
label: msg.lastone.reportTime, label: msg.lastone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "currentone", prop: "currentone",
label: msg.currentone.reportTime, label: msg.currentone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "targetone", prop: "targetone",
label: msg.targetone.reportTime, label: msg.targetone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/chipPerCapitaBM/index.vue
Ver fichero

@@ -181,16 +181,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/chipYieldBM/index.vue
Ver fichero

@@ -187,16 +187,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

12
src/views/report/completionStatusIntrBM/index.vue
Ver fichero

@@ -74,11 +74,6 @@ export default {
data: [], data: [],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: {
show: true,
position: "top",
color: "#2789FF",
},
}, },
{ {
name: "2", name: "2",
@@ -104,11 +99,6 @@ export default {
data: [], data: [],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
label: {
show: true,
position: "top",
color: "#2789FF",
},
}, },
{ {
name: "2", name: "2",
@@ -186,11 +176,13 @@ export default {
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/conversionEfficiencyBM/index.vue
Ver fichero

@@ -187,16 +187,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/ftoOutputBM/index.vue
Ver fichero

@@ -182,16 +182,19 @@ export default {
{ {
prop: "lastone", prop: "lastone",
label: msg.lastone.reportTime, label: msg.lastone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "currentone", prop: "currentone",
label: msg.currentone.reportTime, label: msg.currentone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "targetone", prop: "targetone",
label: msg.targetone.reportTime, label: msg.targetone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/packageOEEBM/index.vue
Ver fichero

@@ -187,16 +187,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/scOutputBM/index.vue
Ver fichero

@@ -182,16 +182,19 @@ export default {
{ {
prop: "lastone", prop: "lastone",
label: msg.lastone.reportTime, label: msg.lastone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "currentone", prop: "currentone",
label: msg.currentone.reportTime, label: msg.currentone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "targetone", prop: "targetone",
label: msg.targetone.reportTime, label: msg.targetone.reportTime,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/scPerCapitaBM/index.vue
Ver fichero

@@ -181,16 +181,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

3
src/views/report/scYieldBM/index.vue
Ver fichero

@@ -187,16 +187,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];

4
src/views/report/turnoverRateBM/index.vue
Ver fichero

@@ -207,16 +207,19 @@ export default {
{ {
prop: "yoy", prop: "yoy",
label: msg.yoyColumn, label: msg.yoyColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "queryValue", prop: "queryValue",
label: msg.queryColumn, label: msg.queryColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
{ {
prop: "target", prop: "target",
label: msg.targetColumn, label: msg.targetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];
@@ -224,6 +227,7 @@ export default {
{ {
prop: "yearTarget", prop: "yearTarget",
label: msg.yearTargetColumn, label: msg.yearTargetColumn,
filter: (val) => (val || val === 0 ? val : "-"),
minWidth: 150, minWidth: 150,
}, },
]; ];