From 43d1446432c5e16a866f2942aac9d5a7aa36dcb9 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Thu, 13 Jan 2022 17:10:36 +0800 Subject: [PATCH] zx --- src/components/v-echars/index.vue | 3 +- .../brandRearWingComparison/index.vue | 170 +++++++++++++----- .../brandRearWingComparison/opt.js | 24 ++- .../comparisonOfForumPostingTrends/index.vue | 96 +++++++++- .../comparisonOfForumPostingTrends/opt.js | 24 ++- .../informationTrend/index.vue | 103 +++++++++-- .../BrandComparison/informationTrend/opt.js | 28 ++- .../forumCommunicationTrend/index.vue | 92 +++++++++- .../forumCommunicationTrend/opt.js | 18 +- .../rearWingPropagationSituation/index.vue | 91 +++++++++- .../rearWingPropagationSituation/opt.js | 18 +- .../BrandInsight/weiboVolumeTrend/index.vue | 91 +++++++++- .../BrandInsight/weiboVolumeTrend/opt.js | 18 +- src/views/Index/tailInsight/index.vue | 1 - .../brandRearWingComparison/index.vue | 83 ++++++++- .../brandRearWingComparison/opt.js | 24 ++- .../comparisonOfForumPostingTrends/index.vue | 83 ++++++++- .../comparisonOfForumPostingTrends/opt.js | 24 ++- .../informationTrend/index.vue | 83 ++++++++- .../ModelComparison/informationTrend/opt.js | 24 ++- src/views/ModelInsight/ml-tts/index.vue | 106 ++++++++++- src/views/ModelInsight/ml-tts/opt.js | 34 +++- .../mlForumCommunicationTrend/index.vue | 91 +++++++++- .../mlForumCommunicationTrend/opt.js | 21 ++- .../mlRearWingPropagationSituation/index.vue | 91 +++++++++- .../mlRearWingPropagationSituation/opt.js | 21 ++- .../ModelInsight/mlWeiboVolumeTrend/index.vue | 89 ++++++++- .../ModelInsight/mlWeiboVolumeTrend/opt.js | 21 ++- 28 files changed, 1442 insertions(+), 130 deletions(-) diff --git a/src/components/v-echars/index.vue b/src/components/v-echars/index.vue index 3556880..dd0f8b7 100644 --- a/src/components/v-echars/index.vue +++ b/src/components/v-echars/index.vue @@ -56,11 +56,12 @@ export default { this.$emit("getData", o); } if(params.componentType === 'markPoint') { + params.event.event.stopPropagation(); - console.log(params) let o = { key: params.data.name, index: params.data.xAxis, + seriesIndex: params.seriesIndex } this.$emit("clickMark", o); } diff --git a/src/views/BrandComparison/brandRearWingComparison/index.vue b/src/views/BrandComparison/brandRearWingComparison/index.vue index 7acd406..388720b 100644 --- a/src/views/BrandComparison/brandRearWingComparison/index.vue +++ b/src/views/BrandComparison/brandRearWingComparison/index.vue @@ -7,30 +7,68 @@ * @FilePath: /data-show/src/views/BrandComparison/brandRearWingComparison/index.vue --> diff --git a/src/views/BrandComparison/brandRearWingComparison/opt.js b/src/views/BrandComparison/brandRearWingComparison/opt.js index 6e79f69..0bbcf55 100644 --- a/src/views/BrandComparison/brandRearWingComparison/opt.js +++ b/src/views/BrandComparison/brandRearWingComparison/opt.js @@ -8,7 +8,7 @@ */ import { bigNumberTransform } from "@/utils/gol/dataTool" -function createData(ds = []) { +function createData(ds = [], markData = []) { let testData = {} ds.forEach(item => { item.forEach(val => { @@ -23,7 +23,10 @@ function createData(ds = []) { emphasis: { focus: 'series' }, - data: [val.value] + data: [val.value], + markPoint: { + data: [], + } } } else { testData[val.key].data.push(val.value) @@ -34,11 +37,24 @@ function createData(ds = []) { for(let key in testData) { arr.push(testData[key]) } + for(let i = 0;i< arr.length; i++) { + markData[i].forEach(ele => { + arr[i].markPoint.data.push( + { + name: 'Max', + xAxis: ele.timeIndex, yAxis: ele.yVal, + symbol: 'pin', + symbolSize: 16, + symbolOffset: [0, '-70%'], + } + ) + }) + } return arr } -export default function createOpt(dx = [], ds = []) { - let data = createData(ds); +export default function createOpt(dx = [], ds = [], markData = []) { + let data = createData(ds,markData); return { grid: { left: 10, diff --git a/src/views/BrandComparison/comparisonOfForumPostingTrends/index.vue b/src/views/BrandComparison/comparisonOfForumPostingTrends/index.vue index 9e598a3..9aa32a6 100644 --- a/src/views/BrandComparison/comparisonOfForumPostingTrends/index.vue +++ b/src/views/BrandComparison/comparisonOfForumPostingTrends/index.vue @@ -14,24 +14,58 @@ :eStyle="{ 'border-style': 'none' }" />
- + +
+
+ + 关闭 + +
+ {{ doStr(item.title, 28) }} +
@@ -75,4 +142,16 @@ export default { height: calc(100% - 48px); } } +.vshow{ + position: absolute; + width: 300px; + background: rgb(3, 18, 36); + border: 4px solid #0f2a4d; + .vshow-item { + padding: 11px; + width: 100%; + font-size: 15px; + color: rgb(54, 189, 239); + } +} diff --git a/src/views/BrandComparison/informationTrend/opt.js b/src/views/BrandComparison/informationTrend/opt.js index 896db12..a7c16dc 100644 --- a/src/views/BrandComparison/informationTrend/opt.js +++ b/src/views/BrandComparison/informationTrend/opt.js @@ -7,7 +7,7 @@ * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js */ import { bigNumberTransform } from "@/utils/gol/dataTool" -function createData(ds = []) { +function createData(ds = [], markData = []) { let testData = {} ds.forEach(item => { item.forEach(val => { @@ -22,8 +22,11 @@ function createData(ds = []) { emphasis: { focus: 'series' }, - data: [val.value] - } + data: [val.value], + markPoint: { + data: [], + } + }; } else { testData[val.key].data.push(val.value) } @@ -33,10 +36,23 @@ function createData(ds = []) { for(let key in testData) { arr.push(testData[key]) } - return arr + for(let i = 0;i< arr.length; i++) { + markData[i].forEach(ele => { + arr[i].markPoint.data.push( + { + name: 'Max', + xAxis: ele.timeIndex, yAxis: ele.yVal, + symbol: 'pin', + symbolSize: 16, + symbolOffset: [0, '-70%'], + } + ) + }) + } + return arr } -export default function createOpt(dx = [], ds = []) { - let data = createData(ds); +export default function createOpt(dx = [], ds = [], markData = []) { + let data = createData(ds, markData); return { grid: { left: 10, diff --git a/src/views/BrandInsight/forumCommunicationTrend/index.vue b/src/views/BrandInsight/forumCommunicationTrend/index.vue index 6863dea..08a0c2d 100644 --- a/src/views/BrandInsight/forumCommunicationTrend/index.vue +++ b/src/views/BrandInsight/forumCommunicationTrend/index.vue @@ -10,25 +10,51 @@
- +
+
+ + 关闭 + + +
@@ -79,4 +146,16 @@ export default { height: calc(100% - 48px); } } +.vshow{ + position: absolute; + width: 300px; + background: rgb(3, 18, 36); + border: 4px solid #0f2a4d; + .vshow-item { + padding: 11px; + width: 100%; + font-size: 15px; + color: rgb(54, 189, 239); + } +} diff --git a/src/views/ModelComparison/brandRearWingComparison/opt.js b/src/views/ModelComparison/brandRearWingComparison/opt.js index aacaf62..a3bf314 100644 --- a/src/views/ModelComparison/brandRearWingComparison/opt.js +++ b/src/views/ModelComparison/brandRearWingComparison/opt.js @@ -7,7 +7,7 @@ * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js */ import { bigNumberTransform } from "@/utils/gol/dataTool" -function createData(ds = []) { +function createData(ds = [], markData = []) { let testData = {} ds.forEach(item => { item.forEach(val => { @@ -22,7 +22,10 @@ function createData(ds = []) { emphasis: { focus: 'series' }, - data: [val.value] + data: [val.value], + markPoint: { + data: [], + } } } else { testData[val.key].data.push(val.value) @@ -33,10 +36,23 @@ function createData(ds = []) { for(let key in testData) { arr.push(testData[key]) } + for(let i = 0;i< arr.length; i++) { + markData[i].forEach(ele => { + arr[i].markPoint.data.push( + { + name: 'Max', + xAxis: ele.timeIndex, yAxis: ele.yVal, + symbol: 'pin', + symbolSize: 16, + symbolOffset: [0, '-70%'], + } + ) + }) + } return arr } -export default function createOpt(dx = [], ds = []) { - let data = createData(ds); +export default function createOpt(dx = [], ds = [], markData = []) { + let data = createData(ds,markData); return { grid: { left: 10, diff --git a/src/views/ModelComparison/comparisonOfForumPostingTrends/index.vue b/src/views/ModelComparison/comparisonOfForumPostingTrends/index.vue index 249bd70..0c84f7f 100644 --- a/src/views/ModelComparison/comparisonOfForumPostingTrends/index.vue +++ b/src/views/ModelComparison/comparisonOfForumPostingTrends/index.vue @@ -10,18 +10,46 @@
- + +
+
+ + 关闭 + +
@@ -76,4 +143,16 @@ export default { height: calc(100% - 48px); } } +.vshow{ + position: absolute; + width: 300px; + background: rgb(3, 18, 36); + border: 4px solid #0f2a4d; + .vshow-item { + padding: 11px; + width: 100%; + font-size: 15px; + color: rgb(54, 189, 239); + } +} diff --git a/src/views/ModelComparison/comparisonOfForumPostingTrends/opt.js b/src/views/ModelComparison/comparisonOfForumPostingTrends/opt.js index c57c0f6..a8f46e0 100644 --- a/src/views/ModelComparison/comparisonOfForumPostingTrends/opt.js +++ b/src/views/ModelComparison/comparisonOfForumPostingTrends/opt.js @@ -7,7 +7,7 @@ * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js */ import { bigNumberTransform } from "@/utils/gol/dataTool" -function createData(ds = []) { +function createData(ds = [], markData = []) { let testData = {} ds.forEach(item => { item.forEach(val => { @@ -22,7 +22,10 @@ function createData(ds = []) { emphasis: { focus: 'series' }, - data: [val.value] + data: [val.value], + markPoint: { + data: [], + } } } else { testData[val.key].data.push(val.value) @@ -33,10 +36,23 @@ function createData(ds = []) { for(let key in testData) { arr.push(testData[key]) } + for(let i = 0;i< arr.length; i++) { + markData[i].forEach(ele => { + arr[i].markPoint.data.push( + { + name: 'Max', + xAxis: ele.timeIndex, yAxis: ele.yVal, + symbol: 'pin', + symbolSize: 16, + symbolOffset: [0, '-70%'], + } + ) + }) + } return arr } -export default function createOpt(dx = [], ds = []) { - let data = createData(ds); +export default function createOpt(dx = [], ds = [], markData = []) { + let data = createData(ds, markData); return { grid: { left: 10, diff --git a/src/views/ModelComparison/informationTrend/index.vue b/src/views/ModelComparison/informationTrend/index.vue index e0973a5..3cf6fa1 100644 --- a/src/views/ModelComparison/informationTrend/index.vue +++ b/src/views/ModelComparison/informationTrend/index.vue @@ -10,18 +10,46 @@
- + +
+
+ + 关闭 + +
@@ -80,4 +147,16 @@ export default { height: calc(100% - 48px); } } +.vshow{ + position: absolute; + width: 300px; + background: rgb(3, 18, 36); + border: 4px solid #0f2a4d; + .vshow-item { + padding: 11px; + width: 100%; + font-size: 15px; + color: rgb(54, 189, 239); + } +} diff --git a/src/views/ModelComparison/informationTrend/opt.js b/src/views/ModelComparison/informationTrend/opt.js index d1b5994..f9ab773 100644 --- a/src/views/ModelComparison/informationTrend/opt.js +++ b/src/views/ModelComparison/informationTrend/opt.js @@ -7,7 +7,7 @@ * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js */ import { bigNumberTransform } from "@/utils/gol/dataTool" -function createData(ds = []) { +function createData(ds = [], markData = []) { let testData = {} ds.forEach(item => { item.forEach(val => { @@ -22,7 +22,10 @@ function createData(ds = []) { emphasis: { focus: 'series' }, - data: [val.value] + data: [val.value], + markPoint: { + data: [], + } } } else { testData[val.key].data.push(val.value) @@ -33,10 +36,23 @@ function createData(ds = []) { for(let key in testData) { arr.push(testData[key]) } + for(let i = 0;i< arr.length; i++) { + markData[i].forEach(ele => { + arr[i].markPoint.data.push( + { + name: 'Max', + xAxis: ele.timeIndex, yAxis: ele.yVal, + symbol: 'pin', + symbolSize: 16, + symbolOffset: [0, '-70%'], + } + ) + }) + } return arr } -export default function createOpt(dx = [], ds = []) { - let data = createData(ds); +export default function createOpt(dx = [], ds = [], markData = []) { + let data = createData(ds, markData); return { grid: { left: 10, diff --git a/src/views/ModelInsight/ml-tts/index.vue b/src/views/ModelInsight/ml-tts/index.vue index a8df48b..6067332 100644 --- a/src/views/ModelInsight/ml-tts/index.vue +++ b/src/views/ModelInsight/ml-tts/index.vue @@ -15,7 +15,18 @@
- + +
+
+
+
+
+ + 关闭 + +
@@ -24,6 +35,7 @@