diff --git a/escheduler-ui/src/js/conf/home/index.js b/escheduler-ui/src/js/conf/home/index.js index 1ba4b3a808..6099fb58af 100644 --- a/escheduler-ui/src/js/conf/home/index.js +++ b/escheduler-ui/src/js/conf/home/index.js @@ -25,6 +25,7 @@ import store from './store' import i18n from '@/module/i18n' import { sync } from 'vuex-router-sync' import Chart from '~/@analysys/ana-charts' +import '@/module/filter/formatDate' import themeData from '@/module/echarts/themeData.json' import Permissions from '@/module/permissions' import '~/@analysys/ans-ui/lib/ans-ui.min.css' diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue index 7436d9da64..b32aeeb6bc 100644 --- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue @@ -90,7 +90,6 @@ + + diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js index 003ce4969f..c672769d13 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js @@ -1,121 +1,123 @@ -export default { - series: [ - { - type: 'gauge', - center: ['50%', '45%'], // 仪表位置 - radius: '80%', // 仪表大小 - startAngle: 200, // 开始角度 - endAngle: -20, // 结束角度 - axisLine: { - show: false, - lineStyle: { // 属性lineStyle控制线条样式 - color: [ - [ 0.5, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line - offset: 1, - color: '#E75F25' // 50% 处的颜色 - }, { - offset: 0.8, - color: '#D9452C' // 40% 处的颜色 - }], false) ], // 100% 处的颜色 - [ 0.7, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line - offset: 1, - color: '#FFC539' // 70% 处的颜色 - }, { - offset: 0.8, - color: '#FE951E' // 66% 处的颜色 - }, { - offset: 0, - color: '#E75F25' // 50% 处的颜色 - }], false) ], - [ 0.9, new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ // eslint-disable-line - offset: 1, - color: '#C7DD6B' // 90% 处的颜色 - }, { - offset: 0.8, - color: '#FEEC49' // 86% 处的颜色 - }, { - offset: 0, - color: '#FFC539' // 70% 处的颜色 - }], false) ], - [1, new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { // eslint-disable-line - offset: 0.2, - color: '#1CAD52' // 92% 处的颜色 - }, { - offset: 0, - color: '#C7DD6B' // 90% 处的颜色 - }], false) ] - ], - width: 10 - } - }, - splitLine: { - show: false - }, - axisTick: { - show: false - }, - axisLabel: { - show: false - }, - pointer: { // 指针样式 - length: '45%' - }, - detail: { - show: false - } - }, - { - type: 'gauge', - center: ['50%', '45%'], // 默认全局居中 - radius: '70%', - startAngle: 200, - endAngle: -20, - axisLine: { - show: true, - lineStyle: { // 属性lineStyle控制线条样式 - color: [ // 表盘颜色 - [ 0.5, '#DA462C' ], // 0-50%处的颜色 - [ 0.7, '#FF9618' ], // 51%-70%处的颜色 - [ 0.9, '#FFED44' ], // 70%-90%处的颜色 - [ 1, '#20AE51' ]// 90%-100%处的颜色 - ], - width: 30// 表盘宽度 - } - }, - splitLine: { // 分割线样式(及10、20等长线样式) - length: 30, - lineStyle: { // 属性lineStyle控制线条样式 - width: 2 - } - }, - axisTick: { // 刻度线样式(及短线样式) - length: 20 - }, - axisLabel: { // 文字样式(及“10”、“20”等文字样式) - color: 'black', - distance: 5 // 文字离表盘的距离 - }, - detail: { - formatter: '{score|{value}%}', - offsetCenter: [0, '50%'], - backgroundColor: '#2D8BF0', - height: 30, - rich: { - score: { - color: 'white', - fontFamily: '微软雅黑', - fontSize: 32 +export default function (value) { + return { + series: [ + { + type: 'gauge', + center: ['50%', '45%'], // 仪表位置 + radius: '80%', // 仪表大小 + startAngle: 200, // 开始角度 + endAngle: -20, // 结束角度 + axisLine: { + show: false, + lineStyle: { // 属性lineStyle控制线条样式 + color: [ + [ 0.5, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line + offset: 1, + color: '#E75F25' // 50% 处的颜色 + }, { + offset: 0.8, + color: '#D9452C' // 40% 处的颜色 + }], false) ], // 100% 处的颜色 + [ 0.7, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{ // eslint-disable-line + offset: 1, + color: '#FFC539' // 70% 处的颜色 + }, { + offset: 0.8, + color: '#FE951E' // 66% 处的颜色 + }, { + offset: 0, + color: '#E75F25' // 50% 处的颜色 + }], false) ], + [ 0.9, new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ // eslint-disable-line + offset: 1, + color: '#C7DD6B' // 90% 处的颜色 + }, { + offset: 0.8, + color: '#FEEC49' // 86% 处的颜色 + }, { + offset: 0, + color: '#FFC539' // 70% 处的颜色 + }], false) ], + [1, new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { // eslint-disable-line + offset: 0.2, + color: '#1CAD52' // 92% 处的颜色 + }, { + offset: 0, + color: '#C7DD6B' // 90% 处的颜色 + }], false) ] + ], + width: 10 } + }, + splitLine: { + show: false + }, + axisTick: { + show: false + }, + axisLabel: { + show: false + }, + pointer: { // 指针样式 + length: '45%' + }, + detail: { + show: false } }, - data: [{ - value: 70, - label: { - textStyle: { - fontSize: 12 + { + type: 'gauge', + center: ['50%', '45%'], // 默认全局居中 + radius: '70%', + startAngle: 200, + endAngle: -20, + axisLine: { + show: true, + lineStyle: { // 属性lineStyle控制线条样式 + color: [ // 表盘颜色 + [ 0.5, '#DA462C' ], // 0-50%处的颜色 + [ 0.7, '#FF9618' ], // 51%-70%处的颜色 + [ 0.9, '#FFED44' ], // 70%-90%处的颜色 + [ 1, '#20AE51' ]// 90%-100%处的颜色 + ], + width: 30// 表盘宽度 } - } - }] - } - ] + }, + splitLine: { // 分割线样式(及10、20等长线样式) + length: 30, + lineStyle: { // 属性lineStyle控制线条样式 + width: 2 + } + }, + axisTick: { // 刻度线样式(及短线样式) + length: 20 + }, + axisLabel: { // 文字样式(及“10”、“20”等文字样式) + color: 'black', + distance: 5 // 文字离表盘的距离 + }, + detail: { + formatter: '{score|{value}%}', + offsetCenter: [0, '50%'], + backgroundColor: '#2D8BF0', + height: 30, + rich: { + score: { + color: 'white', + fontFamily: '微软雅黑', + fontSize: 32 + } + } + }, + data: [{ + value: value || 0, + label: { + textStyle: { + fontSize: 12 + } + } + }] + } + ] + } } diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/list.vue deleted file mode 100644 index 55649f1eec..0000000000 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/list.vue +++ /dev/null @@ -1,81 +0,0 @@ - - diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue new file mode 100644 index 0000000000..c8fb2648bc --- /dev/null +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue index e00e47e025..dd1881e9b6 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue @@ -13,7 +13,7 @@ diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue index 76fcf4b775..6ca5a1acfa 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue @@ -67,8 +67,6 @@