diff --git a/ayanova/src/components/dash-work-order-completed-on-time-pct-bar.vue b/ayanova/src/components/dash-work-order-completed-on-time-pct-bar.vue index 5cc61abb..bc4ee4bf 100644 --- a/ayanova/src/components/dash-work-order-completed-on-time-pct-bar.vue +++ b/ayanova/src/components/dash-work-order-completed-on-time-pct-bar.vue @@ -74,27 +74,6 @@ > - - - - - - { + // if (z.z) { + // notOnTime.data.push({ x: z.x, y: z.y }); + // } else { + // onTime.data.push({ x: z.x, y: z.y }); + // } + // }); + + // return { datasets: [onTime, notOnTime] }; + let onTime = { + backgroundColor: this.settings.color, + data: [] }; + + this.obj.forEach(z => { + if (z.z == false) { + onTime.data.push({ x: z.x, y: z.y }); + } + }); + + return { datasets: [onTime] }; } }, async created() { @@ -212,8 +218,6 @@ export default { this.settings.color = this.localSettings.color; this.settings.wotags = this.localSettings.wotags; this.settings.wotagsany = this.localSettings.wotagsany; - this.settings.woitemtags = this.localSettings.woitemtags; - this.settings.woitemtagsany = this.localSettings.woitemtagsany; this.$emit("dash-change"); //trigger save to server this.context = false; @@ -224,14 +228,12 @@ export default { try { this.errorMessage = null; const res = await window.$gz.api.post("kpi", { - KPIName: "WorkOrderCreatedCount", + KPIName: "WorkOrderCompletedOnTimePct", criteria: { timeSpan: this.settings.timeSpan, interval: this.settings.interval, wotags: this.settings.wotags, - wotagsany: this.settings.wotagsany, - woitemtags: this.settings.woitemtags, - woitemtagsany: this.settings.woitemtagsany + wotagsany: this.settings.wotagsany }, clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp() }); @@ -311,7 +313,6 @@ async function fetchTranslatedText() { "TimeSpan", "Interval", "WorkOrder", - "WorkOrderItem", "GridFilterDialogAndRadioText", "GridFilterDialogOrRadioText" ]); diff --git a/ayanova/src/views/home-dashboard.vue b/ayanova/src/views/home-dashboard.vue index c24f3c3a..8a428478 100644 --- a/ayanova/src/views/home-dashboard.vue +++ b/ayanova/src/views/home-dashboard.vue @@ -96,6 +96,7 @@ import GzDashWorkorderOverduePersonalList from "../components/dash-workorder-ove import GzDashWorkorderOverdueAllList from "../components/dash-workorder-overdue-all-list.vue"; import GzDashWorkOrderCreatedCountLine from "../components/dash-work-order-created-count-line.vue"; import GzDashWorkOrderCreatedCountBar from "../components/dash-work-order-created-count-bar.vue"; +import GzDashPctWorkOrderCompletedOnTimeBar from "../components/dash-work-order-completed-on-time-pct-bar.vue"; export default { components: { GzDashLaborHoursPersonalLine, @@ -110,7 +111,8 @@ export default { GzDashWorkorderOverduePersonalList, GzDashWorkorderOverdueAllList, GzDashWorkOrderCreatedCountLine, - GzDashWorkOrderCreatedCountBar + GzDashWorkOrderCreatedCountBar, + GzDashPctWorkOrderCompletedOnTimeBar }, data() { return {