From 7c6a898bf0783af499a95d0cc445c0ea2a5317e0 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 10 Mar 2023 10:05:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/layout/AiDvSummary/AiDvSummary.vue | 4 +- .../AiDvSummary/components/Summary13.vue | 102 ++++++++++++++++++ components/layout/AiDvTable/AiDvTable.vue | 4 +- components/layout/AiRanking/AiRanking.vue | 19 +++- .../components/form/componentConfig.vue | 2 +- ui/packages/tools/AiEchartV2.vue | 59 ---------- 6 files changed, 125 insertions(+), 65 deletions(-) create mode 100644 components/layout/AiDvSummary/components/Summary13.vue diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index 484f7191..8bcc52a1 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -18,6 +18,7 @@ import Summary10 from './components/Summary10' import Summary11 from './components/Summary11' import Summary12 from './components/Summary12' + import Summary13 from './components/Summary13' export default { name: 'AiDvSummary', @@ -35,7 +36,8 @@ Summary9, Summary10, Summary11, - Summary12 + Summary12, + Summary13 }, props: { diff --git a/components/layout/AiDvSummary/components/Summary13.vue b/components/layout/AiDvSummary/components/Summary13.vue new file mode 100644 index 00000000..a074c1d1 --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary13.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue index be5e4778..0bf8f297 100644 --- a/components/layout/AiDvTable/AiDvTable.vue +++ b/components/layout/AiDvTable/AiDvTable.vue @@ -119,7 +119,7 @@ align-items: center; width: 100%; height: 40px; - padding: 0 20px; + padding: 0 16px; background: rgba(70, 70, 70, 0.35); span { @@ -148,7 +148,7 @@ align-items: center; width: 100%; height: 52px; - padding: 0 20px; + padding: 0 16px; box-sizing: border-box; &.stripe:nth-of-type(2n) { diff --git a/components/layout/AiRanking/AiRanking.vue b/components/layout/AiRanking/AiRanking.vue index 85965ec6..b18afb9e 100644 --- a/components/layout/AiRanking/AiRanking.vue +++ b/components/layout/AiRanking/AiRanking.vue @@ -1,6 +1,6 @@ @@ -23,10 +18,6 @@ export default { series: Object, theme: { default: '0' - }, - legend: { - type: String, - default: '0' } }, components: { @@ -124,8 +115,6 @@ export default { let oldDims = Object.keys(old?.[0] || {})?.toString(), current = Object.keys(v?.[0] || {})?.toString() this.getChartData(oldDims != current) - - console.log(data) } }, @@ -234,53 +223,5 @@ export default { height: 100%; min-height: 100px; } - - .AiEchart-legend { - width: 140px; - margin-left: 20px; - padding-top: 20px; - - div { - display: flex; - position: relative; - align-items: center; - justify-content: center; - height: 40px; - margin-bottom: 8px; - text-align: center; - color: #fff; - font-size: 14px; - border: 1px solid #717171; - box-sizing: border-box; - - &:last-child { - margin-bottom: 0; - } - - &::after { - position: absolute; - left: -1px; - top: 50%; - z-index: 11; - width: 1px; - height: 10px; - transform: translateY(-50%); - background: #0c0c0c; - content: ' '; - } - - &::before { - position: absolute; - right: - 1px; - top: 50%; - z-index: 11; - width: 1px; - height: 10px; - transform: translateY(-50%); - background: #0c0c0c; - content: ' '; - } - } - } } From c16559ea1e1204940790d0448df734ce4deedaed Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 10 Mar 2023 10:54:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/AiEchart/template/line/lineChart1.js | 11 ++++++++--- components/AiEchart/template/line/lineChart3.js | 15 ++++++++++----- components/layout/AiDvPanel/borders/border6.vue | 1 + ui/packages/tools/AiEchartV2.vue | 5 +++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/components/AiEchart/template/line/lineChart1.js b/components/AiEchart/template/line/lineChart1.js index 853bbe0a..7f223d7f 100644 --- a/components/AiEchart/template/line/lineChart1.js +++ b/components/AiEchart/template/line/lineChart1.js @@ -22,7 +22,12 @@ export default { }, daemon: (color) => ({ showSymbol: false, - lineStyle: { shadowBlur: 4, shadowOffsetY: 2 }, + smooth: true, + lineStyle: { + shadowBlur: 4, + shadowOffsetY: 2, + width: 2 + }, areaStyle: { color: { type: 'linear', @@ -31,8 +36,8 @@ export default { y: 0, y2: 1, colorStops: [ - { offset: 0, color: tools.$colorUtils.Hex2RGBA(color, 0.5) }, - { offset: 1, color: tools.$colorUtils.Hex2RGBA(color, 0.5) } + { offset: 0, color: tools.$colorUtils.Hex2RGBA(color, 0.3) }, + { offset: 1, color: tools.$colorUtils.Hex2RGBA(color, 0.1) } ] } } diff --git a/components/AiEchart/template/line/lineChart3.js b/components/AiEchart/template/line/lineChart3.js index d59080b1..60b7299b 100644 --- a/components/AiEchart/template/line/lineChart3.js +++ b/components/AiEchart/template/line/lineChart3.js @@ -1,8 +1,8 @@ export default { - legend: { - right: 0, itemGap: 16, - textStyle: {color: '#fff', padding: [0, 0, 0, 8], fontSize: 14}, - }, + // legend: { + // right: 0, itemGap: 16, + // textStyle: {color: '#fff', padding: [0, 0, 0, 8], fontSize: 14}, + // }, grid: { left: 50, right: 0 }, @@ -11,6 +11,11 @@ export default { textStyle: {color: '#fff'} }, daemon: { - lineStyle: {shadowBlur: 4, shadowOffsetY: 2}, + smooth: true, + lineStyle: { + shadowBlur: 1, + shadowOffsetY: 2, + width: 2 + } } } diff --git a/components/layout/AiDvPanel/borders/border6.vue b/components/layout/AiDvPanel/borders/border6.vue index 3b5bf21c..117bcfb9 100644 --- a/components/layout/AiDvPanel/borders/border6.vue +++ b/components/layout/AiDvPanel/borders/border6.vue @@ -27,6 +27,7 @@ export default { padding: 4px 0 0 22px; color: #fff; font-size: 22px; + font-weight: 500; background-image: url(../asset/title6.png); background-position: bottom; background-size: 100% 7px; diff --git a/ui/packages/tools/AiEchartV2.vue b/ui/packages/tools/AiEchartV2.vue index df8a4385..364720d7 100644 --- a/ui/packages/tools/AiEchartV2.vue +++ b/ui/packages/tools/AiEchartV2.vue @@ -45,7 +45,7 @@ export default { computed: { colors() { if (this.theme === '0') { - return ['#00F9FF', '#EC6666', '#FC3BFF', '#1890FF', '#95FF44', '#ea7ccc'] + return ['#00F9FF', '#1890FF', '#B13BFF', '#FC3BFF', '#95FF44', '#ea7ccc'] } return ['#D4380D', '#CF1322', '#D55800', '#FA8C16', '#FFC53D', '#FFA940', '#FFC53D', '#780000'] @@ -69,7 +69,8 @@ export default { }, axisLine: { lineStyle: { - color: this.theme === '1' ? 'rgba(239, 163, 51, 0.8)' : 'rgba(255,255,255,.5)' + color: this.theme === '1' ? 'rgba(239, 163, 51, 0.8)' : 'rgba(255,255,255,.5)', + width: 1 } } },