|
@@ -206,6 +206,18 @@
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
+ <div class="commonbox-versions" v-loading="loading.versions" element-loading-background="rgba(0, 0, 0, 0.2)">
|
|
|
+ <div class="commonbox-versions-title">
|
|
|
+ <p class="versions-title-name">自訂版</p>
|
|
|
+ <p class="versions-title-num">数量:
|
|
|
+ <span>{{ versionsData.custom.num }}</span>
|
|
|
+ </p>
|
|
|
+ </div>
|
|
|
+ <div class="commonbox-versions-chart">
|
|
|
+ <CommonPie :proportionData="totalArea.pie4"></CommonPie>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="bottom-rightbox">
|
|
@@ -445,12 +457,14 @@ export default {
|
|
|
basics: { num: 0, proportion: 0 },
|
|
|
standard: { num: 0, proportion: 0 },
|
|
|
major: { num: 0, proportion: 0 },
|
|
|
+ custom: { num: 0, proportion: 0 },
|
|
|
evaluating:{num:0,proportion:0}
|
|
|
})
|
|
|
let worldversionsData = ref({
|
|
|
basics: { num: 0, proportion: 0 },
|
|
|
standard: { num: 0, proportion: 0 },
|
|
|
major: { num: 0, proportion: 0 },
|
|
|
+ custom: { num: 0, proportion: 0 }
|
|
|
})
|
|
|
//国际站模式(避免重复加载)
|
|
|
let worldState = ref(true)
|
|
@@ -1297,6 +1311,7 @@ export default {
|
|
|
pie1: {},
|
|
|
pie2: {},
|
|
|
pie3: {},
|
|
|
+ pie4: {},
|
|
|
sizePie: {
|
|
|
legend: {
|
|
|
orient: 'vertical',
|
|
@@ -1983,6 +1998,7 @@ export default {
|
|
|
pie1: {},
|
|
|
pie2: {},
|
|
|
pie3: {},
|
|
|
+ pie4: {},
|
|
|
sizePie: {
|
|
|
legend: {
|
|
|
orient: 'vertical',
|
|
@@ -2325,24 +2341,18 @@ export default {
|
|
|
await proxy.$api.getVersions(datas).then((res) => {
|
|
|
if (res.state === 200) {
|
|
|
let schoolList = res.scEdCnt
|
|
|
- let basicsData = []; let standardData = []; let majorData = [];
|
|
|
- //基础版
|
|
|
- schoolList.forEach((x) => {
|
|
|
- // x.scale === 0 && x.size < 300 ? basicsData.push(x) : ''
|
|
|
- // x.scale >= 500 && x.size >= 300 ? standardData.push(x) : x.size > 100 && (!x.service.includes('YMPCVCIM') && !x.service.includes('VLY6J6N6') && !x.service.includes('VABAJ6NV')) ? standardData.push(x) : ''
|
|
|
- // x.service.includes('YMPCVCIM') || x.service.includes('VLY6J6N6') || x.service.includes('VABAJ6NV') ? majorData.push(x) : ''
|
|
|
- x.service.includes('YPXSJ6NJ') && x.service.includes('B6V5J6NP') ? majorData.push(x) :
|
|
|
- x.service.includes('YMPCVCIM') ? standardData.push(x) :basicsData.push(x)
|
|
|
- })
|
|
|
- console.log(basicsData, standardData, majorData, 7777777)
|
|
|
- if (siteValue.value === 'china') {
|
|
|
- versionsData.value.basics.num = basicsData.length
|
|
|
- versionsData.value.basics.proportion = ((basicsData.length / schoolList.length) * 100).toFixed(1)
|
|
|
- versionsData.value.standard.num = standardData.length
|
|
|
- versionsData.value.standard.proportion = ((standardData.length / schoolList.length) * 100).toFixed(1)
|
|
|
- versionsData.value.major.num = majorData.length
|
|
|
- versionsData.value.major.proportion = ((majorData.length / schoolList.length) * 100).toFixed(1)
|
|
|
- console.log(versionsData.value.standard.proportion, standardData.length, schoolList.length, '占比')
|
|
|
+
|
|
|
+ if (siteValue.value === 'china') {
|
|
|
+ versionsData.value.basics.num = res.beCnt;
|
|
|
+ versionsData.value.basics.proportion = ((res.beCnt / schoolList.length) * 100).toFixed(1)
|
|
|
+ versionsData.value.standard.num = res.seCnt
|
|
|
+ versionsData.value.standard.proportion = ((res.seCnt / schoolList.length) * 100).toFixed(1)
|
|
|
+ versionsData.value.major.num = res.peCnt
|
|
|
+ versionsData.value.major.proportion = ((res.peCnt / schoolList.length) * 100).toFixed(1)
|
|
|
+ versionsData.value.custom.num = res.cuCnt
|
|
|
+ versionsData.value.custom.proportion = ((res.cuCnt / schoolList.length) * 100).toFixed(1)
|
|
|
+
|
|
|
+ console.log(versionsData.value.standard.proportion, res.seCnt, schoolList.length, '占比')
|
|
|
let dataBasics = {
|
|
|
title: {
|
|
|
text: '{a|' + versionsData.value.basics.proportion + '}{c|%}' + '\n' + '基础版占比',
|
|
@@ -2592,16 +2602,103 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
}
|
|
|
+ let dataCustom = {
|
|
|
+ title: {
|
|
|
+ text: '{a|' + versionsData.value.custom.proportion + '}{c|%}' + '\n' + '自訂版占比',
|
|
|
+ x: 'center',
|
|
|
+ y: 'center',
|
|
|
+ textStyle: {
|
|
|
+ rich: {
|
|
|
+ a: {
|
|
|
+ fontSize: 16,
|
|
|
+ color: '#4bf3f9',
|
|
|
+ fontWeight: 'bold',
|
|
|
+ },
|
|
|
+ c: {
|
|
|
+ fontSize: 16,
|
|
|
+ color: '#4bf3f9',
|
|
|
+ fontWeight: 'normal',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ color: '#fff',
|
|
|
+ fontSize: 14,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ series: [
|
|
|
+ //外环
|
|
|
+ {
|
|
|
+ name: '',
|
|
|
+ type: 'pie',
|
|
|
+ radius: ['70%', '50%'],
|
|
|
+ silent: true,
|
|
|
+ clockwise: true,
|
|
|
+ startAngle: 90,
|
|
|
+ z: 0,
|
|
|
+ zlevel: 0,
|
|
|
+ label: {
|
|
|
+ normal: {
|
|
|
+ position: 'center',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ data: [
|
|
|
+ {
|
|
|
+ value: versionsData.value.custom.proportion,
|
|
|
+ name: '',
|
|
|
+ itemStyle: {
|
|
|
+ normal: {
|
|
|
+ //外环发光
|
|
|
+ borderWidth: 0.5,
|
|
|
+ shadowBlur: 20,
|
|
|
+ borderColor: '#4bf3f9',
|
|
|
+ shadowColor: '#9bfeff',
|
|
|
+ color: {
|
|
|
+ // 圆环的颜色
|
|
|
+ colorStops: [
|
|
|
+ {
|
|
|
+ offset: 0,
|
|
|
+ color: '#4bf3f9', // 0% 处的颜色
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 1,
|
|
|
+ color: '#4bf3f9', // 100% 处的颜色
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 100 - 78,
|
|
|
+ name: '',
|
|
|
+ label: {
|
|
|
+ normal: {
|
|
|
+ show: false,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ itemStyle: {
|
|
|
+ normal: {
|
|
|
+ color: '#6a89cc',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ }
|
|
|
totalArea.value.pie1 = dataBasics
|
|
|
totalArea.value.pie2 = dataStandard
|
|
|
totalArea.value.pie3 = dataMajor
|
|
|
- } else if (siteValue.value === 'international') {
|
|
|
- worldversionsData.value.basics.num = basicsData.length
|
|
|
- worldversionsData.value.basics.proportion = ((basicsData.length / schoolList.length).toFixed(2)) * 100
|
|
|
- worldversionsData.value.standard.num = standardData.length
|
|
|
- worldversionsData.value.standard.proportion = parseInt(((standardData.length / schoolList.length).toFixed(2)) * 100)
|
|
|
- worldversionsData.value.major.num = majorData.length
|
|
|
- worldversionsData.value.major.proportion = ((majorData.length / schoolList.length).toFixed(2)) * 100
|
|
|
+ totalArea.value.pie4 = dataCustom
|
|
|
+ } else if (siteValue.value === 'international') {
|
|
|
+ worldversionsData.value.basics.num = res.beCnt;
|
|
|
+ worldversionsData.value.basics.proportion = ((res.beCnt / schoolList.length).toFixed(2)) * 100
|
|
|
+ worldversionsData.value.standard.num = res.seCnt
|
|
|
+ worldversionsData.value.standard.proportion = parseInt(((res.seCnt / schoolList.length).toFixed(2)) * 100)
|
|
|
+ worldversionsData.value.major.num = res.peCnt
|
|
|
+ worldversionsData.value.major.proportion = ((res.peCnt / schoolList.length).toFixed(2)) * 100
|
|
|
+ worldversionsData.value.custom.num = res.cuCnt
|
|
|
+ worldversionsData.value.custom.proportion = ((res.cuCnt / schoolList.length).toFixed(2)) * 100
|
|
|
+
|
|
|
let dataBasics = {
|
|
|
title: {
|
|
|
text: '{a|' + worldversionsData.value.basics.proportion + '}{c|%}' + '\n' + '基础版占比',
|
|
@@ -2851,9 +2948,93 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
}
|
|
|
+ let dataCustom = {
|
|
|
+ title: {
|
|
|
+ text: '{a|' + worldversionsData.value.custom.proportion + '}{c|%}' + '\n' + '基础版占比',
|
|
|
+ x: 'center',
|
|
|
+ y: 'center',
|
|
|
+ textStyle: {
|
|
|
+ rich: {
|
|
|
+ a: {
|
|
|
+ fontSize: 16,
|
|
|
+ color: '#4bf3f9',
|
|
|
+ fontWeight: 'bold',
|
|
|
+ },
|
|
|
+ c: {
|
|
|
+ fontSize: 16,
|
|
|
+ color: '#4bf3f9',
|
|
|
+ fontWeight: 'normal',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ color: '#fff',
|
|
|
+ fontSize: 14,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ series: [
|
|
|
+ //外环
|
|
|
+ {
|
|
|
+ name: '',
|
|
|
+ type: 'pie',
|
|
|
+ radius: ['70%', '50%'],
|
|
|
+ silent: true,
|
|
|
+ clockwise: true,
|
|
|
+ startAngle: 90,
|
|
|
+ z: 0,
|
|
|
+ zlevel: 0,
|
|
|
+ label: {
|
|
|
+ normal: {
|
|
|
+ position: 'center',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ data: [
|
|
|
+ {
|
|
|
+ value: worldversionsData.value.custom.proportion,
|
|
|
+ name: '',
|
|
|
+ itemStyle: {
|
|
|
+ normal: {
|
|
|
+ //外环发光
|
|
|
+ borderWidth: 0.5,
|
|
|
+ shadowBlur: 20,
|
|
|
+ borderColor: '#4bf3f9',
|
|
|
+ shadowColor: '#9bfeff',
|
|
|
+ color: {
|
|
|
+ // 圆环的颜色
|
|
|
+ colorStops: [
|
|
|
+ {
|
|
|
+ offset: 0,
|
|
|
+ color: '#4bf3f9', // 0% 处的颜色
|
|
|
+ },
|
|
|
+ {
|
|
|
+ offset: 1,
|
|
|
+ color: '#4bf3f9', // 100% 处的颜色
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: 100 - 78,
|
|
|
+ name: '',
|
|
|
+ label: {
|
|
|
+ normal: {
|
|
|
+ show: false,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ itemStyle: {
|
|
|
+ normal: {
|
|
|
+ color: '#6a89cc',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ }
|
|
|
worldtotalArea.value.pie1 = dataBasics
|
|
|
worldtotalArea.value.pie2 = dataStandard
|
|
|
worldtotalArea.value.pie3 = dataMajor
|
|
|
+ worldtotalArea.value.pie4 = dataCustom
|
|
|
}
|
|
|
loading.value.versions = false
|
|
|
}
|
|
@@ -3912,7 +4093,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.commonbox-versions {
|
|
|
- width: 32%;
|
|
|
+ width: 24%;
|
|
|
height: 100%;
|
|
|
border: 1px solid #ccc;
|
|
|
padding: 1%;
|