界面优化
This commit is contained in:
parent
46ec5d5f75
commit
415ed586cc
|
@ -33,8 +33,8 @@
|
||||||
<el-row justify="center">
|
<el-row justify="center">
|
||||||
<el-table :data="completeTable" style="width: 100%">
|
<el-table :data="completeTable" style="width: 100%">
|
||||||
<el-table-column prop="name" :label="radio == 1 ? '年级' : '班级'" />
|
<el-table-column prop="name" :label="radio == 1 ? '年级' : '班级'" />
|
||||||
<el-table-column prop="join" label="参与人员" />
|
<el-table-column prop="join" label="测评总数" />
|
||||||
<el-table-column prop="finish" label="完成人数" />
|
<el-table-column prop="finish" label="完成测评数" />
|
||||||
<el-table-column prop="finishRate" label="完成率" />
|
<el-table-column prop="finishRate" label="完成率" />
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -246,7 +246,6 @@ async function getwarnData() {
|
||||||
|
|
||||||
// 预警因子
|
// 预警因子
|
||||||
const factorDataList = ref([])
|
const factorDataList = ref([])
|
||||||
const factorNameList = ref([])
|
|
||||||
async function getFactoryData() {
|
async function getFactoryData() {
|
||||||
const query = { batchNo, scaleId: scaleId.value }
|
const query = { batchNo, scaleId: scaleId.value }
|
||||||
let res = {}
|
let res = {}
|
||||||
|
@ -262,8 +261,6 @@ async function getFactoryData() {
|
||||||
const factoryList = res.data
|
const factoryList = res.data
|
||||||
|
|
||||||
factoryList.forEach(item => {
|
factoryList.forEach(item => {
|
||||||
factorNameList.value.push(item.factorName)
|
|
||||||
|
|
||||||
const pieData = []
|
const pieData = []
|
||||||
item.numList.forEach(numItem => {
|
item.numList.forEach(numItem => {
|
||||||
pieData.push({
|
pieData.push({
|
||||||
|
@ -291,8 +288,24 @@ onMounted(() => {
|
||||||
getScalePublishList()
|
getScalePublishList()
|
||||||
})
|
})
|
||||||
|
|
||||||
function initPieOption(name = '', data) {
|
function initPieOption(name = '', data = []) {
|
||||||
return {
|
return {
|
||||||
|
title: {
|
||||||
|
text: name,
|
||||||
|
subtext: '',
|
||||||
|
x: 'center',
|
||||||
|
y: '10',
|
||||||
|
textStyle: {
|
||||||
|
color: '#95989D',
|
||||||
|
fontSize: 20,
|
||||||
|
lineHeight: 10,
|
||||||
|
},
|
||||||
|
subtextStyle: {
|
||||||
|
color: '#95989D',
|
||||||
|
fontSize: 16,
|
||||||
|
lineHeight: 10,
|
||||||
|
},
|
||||||
|
},
|
||||||
tooltip: {
|
tooltip: {
|
||||||
trigger: 'item'
|
trigger: 'item'
|
||||||
},
|
},
|
||||||
|
@ -308,7 +321,7 @@ function initPieOption(name = '', data) {
|
||||||
data: data,
|
data: data,
|
||||||
label: {
|
label: {
|
||||||
normal: {
|
normal: {
|
||||||
formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
|
formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
|
||||||
rich: {
|
rich: {
|
||||||
c: {
|
c: {
|
||||||
lineHeight: 5
|
lineHeight: 5
|
||||||
|
|
|
@ -330,7 +330,7 @@ function handleExport(row: any) {
|
||||||
recordId: row.recordId,
|
recordId: row.recordId,
|
||||||
userId: current.value.userId,
|
userId: current.value.userId,
|
||||||
nickName: current.value.nickName
|
nickName: current.value.nickName
|
||||||
}, `${current.value.nickName}.docx`)
|
}, `${current.value.nickName}.pdf`)
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|
|
@ -332,7 +332,7 @@ function handleExport(row: any) {
|
||||||
recordId: row.recordId,
|
recordId: row.recordId,
|
||||||
userId: current.value.userId,
|
userId: current.value.userId,
|
||||||
nickName: current.value.nickName
|
nickName: current.value.nickName
|
||||||
}, `${current.value.nickName}.docx`)
|
}, `${current.value.nickName}.pdf`)
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|
|
@ -895,7 +895,7 @@ const rightPie2Option = ref({
|
||||||
roseType: 'radius',
|
roseType: 'radius',
|
||||||
label: {
|
label: {
|
||||||
normal: {
|
normal: {
|
||||||
formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
|
formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
|
||||||
rich: {
|
rich: {
|
||||||
c: {
|
c: {
|
||||||
color: 'rgb(241,246,104)',
|
color: 'rgb(241,246,104)',
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
<el-tooltip v-if="scope.row.publishType === 1" content="团体报告导出" placement="top">
|
<el-tooltip v-if="scope.row.publishType === 1" content="团体报告导出" placement="top">
|
||||||
<el-button link type="primary" icon="Download" @click="handlePublishExport(scope.row)"
|
<el-button link type="primary" icon="Download" @click="handlePublishExport(scope.row)"
|
||||||
v-hasPermi="['sscale:publish:export']">
|
v-hasPermi="['scale:publish:export']">
|
||||||
<span>团体报告导出</span>
|
<span>团体报告导出</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
@ -201,7 +201,7 @@ const handlePublishExport = (row: any) => {
|
||||||
|
|
||||||
proxy?.download('scale/publish/export', {
|
proxy?.download('scale/publish/export', {
|
||||||
batchNo, sessionName
|
batchNo, sessionName
|
||||||
}, `团队报告-${sessionName}.docx`)
|
}, `团队报告-${sessionName}.pdf`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@ const leftPieOption = ref({
|
||||||
roseType: 'radius',
|
roseType: 'radius',
|
||||||
label: {
|
label: {
|
||||||
normal: {
|
normal: {
|
||||||
formatter: ['{c|{c}人}', '{b|{b}}'].join('\n'),
|
formatter: ['{c|{c}}', '{b|{b}}'].join('\n'),
|
||||||
rich: {
|
rich: {
|
||||||
c: {
|
c: {
|
||||||
color: '#95989D',
|
color: '#95989D',
|
||||||
|
|
Loading…
Reference in New Issue