diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue index 8c0212e..a677c9a 100644 --- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue +++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue @@ -1,7 +1,7 @@ @@ -80,12 +80,14 @@ export default { // console.log(item.color, color); res += "
" + - `${params[i].seriesType === "line" - ? '' - : `` - }` + - `${params[i].seriesName}` + - `${params[i].value ? params[i].value + '%' : 0 + '%'}`; + `${params[i].seriesType === "line" + ? ` + + ${params[i].seriesName}` + : ` + ${params[i].seriesName}` + }` + + `${params[i].value ? params[i].value + '%' : 0 + '%'}`; } const htmlContent = `
diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue index 69bd295..88e2671 100644 --- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue +++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue @@ -1,7 +1,7 @@ @@ -81,11 +81,13 @@ export default { res += "
" + `${params[i].seriesType === "line" - ? '' - : `` + ? ` + + ${params[i].seriesName}` + : ` + ${params[i].seriesName}` }` + - `${params[i].seriesName}` + - `${params[i].value ? params[i].value + '%' : 0 + '%'}`; + `${params[i].value ? params[i].value + '%' : 0 + '%'}`; } const htmlContent = `
diff --git a/src/views/copilot/yield/options/double-ring-chart-options.js b/src/views/copilot/yield/options/double-ring-chart-options.js index c6023c2..6a9e8d3 100644 --- a/src/views/copilot/yield/options/double-ring-chart-options.js +++ b/src/views/copilot/yield/options/double-ring-chart-options.js @@ -23,7 +23,7 @@ export default ({ // borderColor: '#001829', }, title: { - text: '99.99%', + text: titleValue, left: "48.5%", top: "middle", itemGap: 12, @@ -132,7 +132,7 @@ export default ({ }, data: [ { - value: 99.99, + value: previousSum, name: preName, selected: false, tooltip: { diff --git a/src/views/dashboard/charts/RightChartBase.vue b/src/views/dashboard/charts/RightChartBase.vue index 633aaf9..850bdb2 100644 --- a/src/views/dashboard/charts/RightChartBase.vue +++ b/src/views/dashboard/charts/RightChartBase.vue @@ -1,7 +1,7 @@ @@ -81,11 +81,13 @@ export default { res += "
" + `${params[i].seriesType === "line" - ? '' - : `` + ? ` + + ${params[i].seriesName}` + : ` + ${params[i].seriesName}` }` + - `${params[i].seriesName}` + - `${params[i].value ? params[i].value : 0 }`; + `${params[i].value ? params[i].value : 0 }`; } const htmlContent = `
diff --git a/src/views/dashboard/components/Container.vue b/src/views/dashboard/components/Container.vue index bfcc977..74e8aec 100644 --- a/src/views/dashboard/components/Container.vue +++ b/src/views/dashboard/components/Container.vue @@ -82,6 +82,7 @@ export default {