提交 965c9e1c 编写于 作者: zhentian.jia's avatar zhentian.jia

文案和提示修改

上级 45b684cd
...@@ -549,6 +549,10 @@ export function examTimes(xAxisData, seriesData) { ...@@ -549,6 +549,10 @@ export function examTimes(xAxisData, seriesData) {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
type: "shadow" // 默认为直线,可选为:'line' | 'shadow' type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
},
formatter:function(data){
let value = data[0].name + '完成人数:' + data[0].value+"名"
return value;
} }
}, },
color: ['#449284'], color: ['#449284'],
...@@ -582,12 +586,14 @@ export function examTimes(xAxisData, seriesData) { ...@@ -582,12 +586,14 @@ export function examTimes(xAxisData, seriesData) {
], ],
yAxis: [ yAxis: [
{ {
minInterval: 1,
splitLine: {
show: true
},
type: "value", type: "value",
name: "人数 (名)", name: "人数 (名)",
minInterval: 1,
min: 0,
splitNumber: 5,
axisLabel: {
formatter: '{value} '
},
axisLine: { //隐藏轴线 axisLine: { //隐藏轴线
show: false show: false
}, },
...@@ -625,6 +631,10 @@ export function examScore(xAxisData, seriesData) { ...@@ -625,6 +631,10 @@ export function examScore(xAxisData, seriesData) {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
type: "shadow" // 默认为直线,可选为:'line' | 'shadow' type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
},
formatter:function(data){
let value = data[0].name + '人数:' + data[0].value+"名"
return value;
} }
}, },
color: ['#CAA861'], color: ['#CAA861'],
...@@ -658,12 +668,11 @@ export function examScore(xAxisData, seriesData) { ...@@ -658,12 +668,11 @@ export function examScore(xAxisData, seriesData) {
], ],
yAxis: [ yAxis: [
{ {
minInterval: 1,
splitLine: {
show: true
},
type: "value", type: "value",
name: "人数 (名)", name: "人数 (名)",
minInterval: 1,
min: 0,
splitNumber: 5,
axisLine: { //隐藏轴线 axisLine: { //隐藏轴线
show: false show: false
}, },
......
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<span>{{ scope.row.certGrade | certGradeValue}}</span> <span>{{ scope.row.certGrade | certGradeValue}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="finishDate" label="获证日期" align="center"></el-table-column> <el-table-column prop="finishDate" label="完成项目日期" align="center"></el-table-column>
<el-table-column prop="score" label="成绩" align="center"></el-table-column> <el-table-column prop="score" label="成绩" align="center"></el-table-column>
<el-table-column prop="learnTime" min-width="150" label="学习时长" align="center"> <el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
<div class="spacing"></div> <div class="spacing"></div>
<div class="chart-title">完成项目考试次数情况</div> <div class="chart-title">完成项目考试次数情况</div>
<div v-if="showExamTimes === true" > <div v-if="showExamTimes === true" class="overflow-chart">
<div class="chart" id="examTimes" ref="examTimes"></div> <div class="chart" id="examTimes" ref="examTimes"></div>
</div> </div>
<div v-if="showExamTimes === false" class="empty-img"> <div v-if="showExamTimes === false" class="empty-img">
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-radio-button label="10">10分</el-radio-button> <el-radio-button label="10">10分</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div v-if="showExamScore === true"> <div v-if="showExamScore === true" class="overflow-chart">
<div class="chart" id="examScore" ref="examScore"></div> <div class="chart" id="examScore" ref="examScore"></div>
</div> </div>
<div v-if="showExamScore === false" class="empty-img"> <div v-if="showExamScore === false" class="empty-img">
......
...@@ -882,6 +882,9 @@ export default { ...@@ -882,6 +882,9 @@ export default {
color: #fff; color: #fff;
} }
} }
.overflow-chart {
overflow-x: scroll;
}
.component-content { .component-content {
// position: relative; // position: relative;
// background: #fff; // background: #fff;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册