diff --git a/src/views/physicalHealth/dataAnalysis/DataAnalysisMain.vue b/src/views/physicalHealth/dataAnalysis/DataAnalysisMain.vue index 7bbee29..3c874f1 100644 --- a/src/views/physicalHealth/dataAnalysis/DataAnalysisMain.vue +++ b/src/views/physicalHealth/dataAnalysis/DataAnalysisMain.vue @@ -26,6 +26,7 @@ + + + + + + + + import('./cityAnalysis/City_03.vue'), City_04:()=>import('./cityAnalysis/City_04.vue'), City_05:()=>import('./cityAnalysis/City_05.vue'), + District_02:()=>import('./districtAnalysis/District_02.vue'), + District_03:()=>import('./districtAnalysis/District_03.vue'), + District_04:()=>import('./districtAnalysis/District_04.vue'), + District_05:()=>import('./districtAnalysis/District_05.vue'), + District_06:()=>import('./districtAnalysis/District_06.vue'), School_01_02:()=>import('./schoolAnalysis/School_01_02.vue'), School_03:()=>import('./schoolAnalysis/School_03.vue'), School_04:()=>import('./schoolAnalysis/School_04.vue'), @@ -389,7 +407,7 @@ .year-list-style{ margin-bottom: 0!important; padding-left: 0!important; - min-height: 600px; + /*min-height: 600px;*/ padding-right: 10px; /*padding-top: 20px;*/ .year-li-style{ diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js new file mode 100644 index 0000000..8b4eb4a --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js @@ -0,0 +1,81 @@ +const columns = [{ + title: '序号', + align: 'center', + dataIndex: 'id', + customRender: (text, record, index) => { + return index + 1 + } +},{ + title: '学校', + align: 'center', + dataIndex: 'shcool_name' +},{ + title: '所属区县', + align: 'center', + dataIndex: 'bureau_name' +},{ + title:'样本数', + key:'sampleCount', + align:'center', + children:[ + {title:'男',align:'center',key:'sample-male',dataIndex:'psn_num_boy'}, + {title:'女',align:'center',key:'sample-female',dataIndex:'psn_num_girl'}, + {title:'合计',align:'center',key:'sample-total',dataIndex:'psn_num_stu'}, + ] +},{ + title:'平均分', + key:'averageScore', + align:'center', + children:[ + {title:'男',align:'center',key:'averageScore-male',dataIndex:'scr_avg_boy'}, + {title:'女',align:'center',key:'averageScore-female',dataIndex:'scr_avg_girl'}, + {title:'学校整体',align:'center',key:'averageScore-total',dataIndex:'scr_avg_stu'}, + ] +},{ + title:'等级分布(%)', + key:'grade', + align:'center', + children:[ + { + title:'优秀', + align:'center', + key:'grade-excellent', + children:[ + {title:'男',align:'center',key:'grade-excellent-male',dataIndex:'rnk_rto_a_boy'}, + {title:'女',align:'center',key:'grade-excellent-female',dataIndex:'rnk_rto_a_girl'}, + {title:'学校整体',align:'center',key:'grade-excellent-total',dataIndex:'rnk_rto_a_stu'}, + ]}, + { + title:'良好', + align:'center', + key:'grade-good', + children:[ + {title:'男',align:'center',key:'grade-good-male',dataIndex:'rnk_rto_b_boy'}, + {title:'女',align:'center',key:'grade-good-female',dataIndex:'rnk_rto_b_girl'}, + {title:'学校整体',align:'center',key:'grade-good-total',dataIndex:'rnk_rto_b_stu'}, + ]}, + { + title:'及格', + align:'center', + key:'grade-pass', + children:[ + {title:'男',align:'center',key:'grade-pass-male',dataIndex:'rnk_rto_c_boy'}, + {title:'女',align:'center',key:'grade-pass-female',dataIndex:'rnk_rto_c_girl'}, + {title:'学校整体',align:'center',key:'grade-pass-total',dataIndex:'rnk_rto_c_stu'}, + ]}, + { + title:'不及格', + align:'center', + key:'grade-fail', + children:[ + {title:'男',align:'center',key:'grade-fail-male',dataIndex:'rnk_rto_d_boy'}, + {title:'女',align:'center',key:'grade-fail-female',dataIndex:'rnk_rto_d_girl'}, + {title:'学校整体',align:'center',key:'grade-fail-total',dataIndex:'rnk_rto_d_stu'}, + ] + }, + ] +}] + +const tableDatas = [] + +export { columns, tableDatas } diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue new file mode 100644 index 0000000..6a09a48 --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_03.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_03.vue new file mode 100644 index 0000000..d1db825 --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_03.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_04.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_04.vue new file mode 100644 index 0000000..a208a0b --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_04.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_05.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_05.vue new file mode 100644 index 0000000..6d257d1 --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_05.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_06.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_06.vue new file mode 100644 index 0000000..fe920db --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_06.vue @@ -0,0 +1,13 @@ + + + + +