Merge pull request '1' (#53) from projects/mescc/zjl into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending

Reviewed-on: #53
This commit is contained in:
朱菊兰 2024-06-20 16:52:26 +08:00
commit 6c145579cb
12 changed files with 36 additions and 10 deletions

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];

View File

@ -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,
}, },
]; ];