diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js index b17b6ea187cdb7dd3d786cbe701cb235c78c4b58..21b03e3f6f7cdc0e2584b5d5a33c8e3825f5e51b 100644 --- a/src/resources/assets/js/util.js +++ b/src/resources/assets/js/util.js @@ -1244,7 +1244,7 @@ const methods = { return result; }, isValidTimeString(timeStr) { //校验时间字符串 - if(!timeStr) { + if(!timeStr || typeof timeStr !== 'string') { return false; } const parts = timeStr.split(':'); diff --git a/src/views/pages/dashboard/widget/charts/original/bar-widget.vue b/src/views/pages/dashboard/widget/charts/original/bar-widget.vue index e3fc36d48f9f1d122ed3452c774c00b8f6d941ce..8ab23bc98721a99f79d5666b71ab4ce090fcf818 100644 --- a/src/views/pages/dashboard/widget/charts/original/bar-widget.vue +++ b/src/views/pages/dashboard/widget/charts/original/bar-widget.vue @@ -90,6 +90,8 @@ export default { finalData() { const data = []; if (this.data && this.data.length > 0) { + //时间排序 + this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField)); //数据合并汇聚 this.data.forEach(d => { const dd = data.find(dd => dd.yField == d.yField); diff --git a/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue b/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue index 934cb5165841b11a10a206ab11caf8d5cbd89384..cfbdf1e2c37c3b903312cd3836d36ad443a39691 100644 --- a/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue +++ b/src/views/pages/dashboard/widget/charts/original/stackedbar-widget.vue @@ -72,6 +72,8 @@ export default { finalData() { let data = []; if (this.data && this.data.length > 0) { + //时间排序 + this.data = this.data.sort((a, b) => this.changeString(b.yField) - this.changeString(a.yField)); //数据合并汇聚 this.data.forEach(d => { const dd = data.find(dd => dd.yField == d.yField && dd.seriesField == d.seriesField); diff --git a/src/views/pages/dashboard/widget/charts/widget-base.js b/src/views/pages/dashboard/widget/charts/widget-base.js index 0854bc0d995cdecf5142b936fc119ef061323f1c..1dccbd4064c17c6efbafd726670f7d3ba846ce8a 100644 --- a/src/views/pages/dashboard/widget/charts/widget-base.js +++ b/src/views/pages/dashboard/widget/charts/widget-base.js @@ -99,8 +99,10 @@ export const WidgetBase = { const pad = num => num.toString().padStart(2, '0'); const [h1, m1, s1 = '00'] = a.split(':').map(pad); return `${h1}${m1}${s1}`; - } - return a.charCodeAt(0); + } else if (typeof a === 'string') { + return a.charCodeAt(0); + } + return a; } return a; } diff --git a/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue b/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue index 1c5c1f4b8bff5d429798fcaef784b6fa2b9f05f6..f1973633c646808126959516eb880da9594994fd 100644 --- a/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue +++ b/src/views/pages/dashboard/widget/configs/original/groupedcolumn-widget-config.vue @@ -50,7 +50,7 @@