|
@@ -19,6 +19,7 @@
|
|
|
<j-vxe-table
|
|
|
:columns="columns"
|
|
|
:data-source="data"
|
|
|
+ :height="300"
|
|
|
>
|
|
|
<a slot="name" slot-scope="text">{{ text }}</a>
|
|
|
|
|
@@ -36,7 +37,7 @@
|
|
|
<j-vxe-table
|
|
|
:columns="areaColumns"
|
|
|
:data-source="areaData"
|
|
|
-
|
|
|
+ :height="300"
|
|
|
>
|
|
|
<a slot="name" slot-scope="text">{{ text }}</a>
|
|
|
|
|
@@ -137,7 +138,7 @@ export default {
|
|
|
pieResultData: [],
|
|
|
DoughnutData: [],
|
|
|
DoughnutResultData: [],
|
|
|
- color1: ['#8c42a1', '#4fa5e7'],
|
|
|
+ color1: ['#8E42FF', '#FF6B6B', '#FF9B42', '#F0D418', '#2E64FF'],
|
|
|
registerData: [],
|
|
|
|
|
|
columns: [
|
|
@@ -258,12 +259,12 @@ export default {
|
|
|
this.areaData.push({type: key.toString(), number: this.pieArea[key].toFixed(2)})
|
|
|
}
|
|
|
for (let key in this.DoughnutData) {
|
|
|
- if (key != '证书') {
|
|
|
+ if (key != '证书' && key!='待核实') {
|
|
|
this.number = this.number + this.DoughnutData[key]
|
|
|
}
|
|
|
this.registerData.push({type: key.toString(), number: this.DoughnutData[key]})
|
|
|
}
|
|
|
- this.DoughnutResultData.push({name: '有证', value: this.DoughnutData['证书']},
|
|
|
+ this.DoughnutResultData.push({name: '有证', value: this.DoughnutData['证书']},{name: '待核实', value: this.DoughnutData['待核实']},
|
|
|
{name: '无证', value: this.number})
|
|
|
|
|
|
for (let key in this.doughnutByXzData) {
|