From 4f8d4f5136ad2b00e9e8110150557e95b08822c4 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Tue, 15 Aug 2023 18:41:02 +0800 Subject: [PATCH] fix --- src/pages/index/zxy/index.vue | 1087 ++++++++++++++++----------- src/pages/screen/index.vue | 61 +- src/pages/station/preview/index.vue | 10 +- src/setting.js | 2 +- 4 files changed, 676 insertions(+), 484 deletions(-) diff --git a/src/pages/index/zxy/index.vue b/src/pages/index/zxy/index.vue index e30ee56..8d6d14c 100644 --- a/src/pages/index/zxy/index.vue +++ b/src/pages/index/zxy/index.vue @@ -1,241 +1,418 @@ @@ -245,111 +422,111 @@ import Setting from '@/setting' import util from '@/libs/util' import WOW from 'wow.js' export default { - name: 'index', - data() { - return { - token: util.local.get(Setting.tokenKey), - active: '' - } + name: 'index', + data () { + return { + token: util.local.get(Setting.tokenKey), + active: '' + } + }, + mounted () { + new WOW().init() + }, + methods: { + toPart (i) { + this.active = i + document.querySelector(`#part${i}`).scrollIntoView() }, - mounted() { - new WOW().init() + // 置顶 + topping () { + document.documentElement.scrollTop = 0 + document.body.scrollTop = 0 }, - methods: { - toPart(i){ - this.active = i - document.querySelector(`#part${i}`).scrollIntoView() - }, - // 置顶 - topping() { - document.documentElement.scrollTop = 0 - document.body.scrollTop = 0 - }, - // 免费试用 - toTrial() { - window.open('https://www.wjx.top/vm/wFCPCFp.aspx') - }, - // 问卷调查 - toQues() { - window.open('https://www.wjx.cn/vm/wB0RcMm.aspx') - }, - } + // 免费试用 + toTrial () { + window.open('https://www.wjx.top/vm/wFCPCFp.aspx') + }, + // 问卷调查 + toQues () { + window.open('https://www.wjx.cn/vm/wB0RcMm.aspx') + }, + } }; \ No newline at end of file diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index f185bf0..eeb0554 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -718,11 +718,11 @@ export default { }, { color1: '#e71872', - color2: 'rgba(243, 147, 189, 0.4)' + color2: 'rgba(40, 147, 189, 0.4)' }, { color1: '#f9d437', - color2: 'rgba(255, 234, 144, 0.4)' + color2: 'rgba(50, 234, 144, 0.4)' }, { color1: '#912892', @@ -730,11 +730,11 @@ export default { }, { color1: '#f21259', - color2: 'rgba(213, 22, 11, 0.4)' + color2: 'rgba(40, 176, 97, 0.4)' }, { color1: '#7343fe', - color2: 'rgba(243, 123, 2, 0.4)' + color2: 'rgba(50, 240, 140, 0.4)' }, { color1: '#ea7321', @@ -746,8 +746,24 @@ export default { }, { color1: '#672313', - color2: 'rgba(156, 163, 2, 0.4)' - } + color2: 'rgba(156, 40, 100, 0.4)' + }, + { + color1: '#0184d5', + color2: 'rgba(60, 132, 60, 0.4)' + }, + { + color1: '#00d887', + color2: 'rgba(60, 42, 244, 0.4)' + }, + { + color1: '#e71872', + color2: 'rgba(90, 147, 180, 0.4)' + }, + { + color1: '#f9d437', + color2: 'rgba(150, 20, 144, 0.4)' + }, ] // 登录前登录后调的课程接口不一样 const cousrseRes = await this.$post(this.api.listOfGoods, { @@ -758,22 +774,20 @@ export default { hotTag: 1, }) if (cousrseRes) { - const courseList = - cousrseRes.page.records + const courseList = cousrseRes.page.records const ids = courseList.map(e => e.mallId) times.map(e => { e.mallId = ids }) const courseData = {} - courseList.map(e => { - // e.productName = e.productName.substring(0, 10) - courseData[e.productName] = [] - }) this.$post(this.api.studentAssessSchievement, times).then(({ data }) => { - const times = [] + const xData = data.map(e => e.time) + const len = xData.length + courseList.map(e => { + courseData[e.productName] = new Array(len).fill(0, 0) + }) const series = [] data.map((e, i) => { - times.push(e.time) e.assesScoreRespList.map(n => { const item = courseList.find(j => j.mallId == n.mallId) if (item) { @@ -790,7 +804,7 @@ export default { series.push({ name: i, type: 'line', - smooth: true, + // smooth: true, symbol: 'circle', symbolSize: 5, lineStyle: { @@ -799,23 +813,10 @@ export default { width: 2 } }, - areaStyle: { - normal: { - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ - offset: 0, - color: colors[index].color2 - }, { - offset: 0.8, - color: colors[index].color2 - }], false), - shadowColor: 'rgba(0, 0, 0, 0.1)', - } - }, itemStyle: { normal: { color: colors[index].color1, - borderColor: 'rgba(221, 220, 107, .1)', - borderWidth: 12 + borderWidth: 8 } }, data: courseData[i] @@ -871,7 +872,7 @@ export default { color: 'rgba(255,255,255,.2)' } }, - data: times + data: xData }, yAxis: [{ type: 'value', diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 6a4fa4c..2c06cff 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -164,7 +164,7 @@
-