diff --git a/package.json b/package.json index fb9615d..a3a0f67 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", "less-loader": "^7.3.0", + "mockjs": "^1.1.0", "node-sass": "^5.0.0", "vue-template-compiler": "^2.6.11" }, diff --git a/src/views/physicalHealth/App.vue b/src/views/physicalHealth/App.vue index 04e27a0..80939d3 100644 --- a/src/views/physicalHealth/App.vue +++ b/src/views/physicalHealth/App.vue @@ -20,7 +20,7 @@ export default { mounted(){ let html = document.getElementsByTagName('html')[0]; html.style.overflow = 'auto'; - html.style.width = '1920px'; + html.style.width = '100%'; // html.style.minWidth = '1920px'; html.style.height = '100%'; html.style.minHeight = '400px'; diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisApi.js b/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisApi.js new file mode 100644 index 0000000..45ffbf6 --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisApi.js @@ -0,0 +1,16 @@ +import interfaceConfig from '../../../../global-llibs/axios-config' + +/** + * 【3.3.21】【县域分析 02】1.学校整体对比(表格、图表) + * @param params + * @param callback + */ +function getSchoolTotalNumAvgRankList(params, callback) { + interfaceConfig.callInterface([{ + url: "intellioa/getSchoolTotalNumAvgRankList", + method: "get", + params: params, + isTestLogin: false + }], callback) +} + diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisMockApi.js b/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisMockApi.js new file mode 100644 index 0000000..c0dd5aa --- /dev/null +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/DistrictAnalysisMockApi.js @@ -0,0 +1,42 @@ +let Mock = require('mockjs') + +/** + * 【3.3.21】【县域分析 02】1.学校整体对比(表格、图表) + * @param params + * @param callback + */ +function getSchoolTotalNumAvgRankList(params, callback) { + return Mock.mock({ + 'list|20': [{ + "id|+1": 0, + "report_year": "20202021", + "school_id": "400195", + "school_name": "@city(true)", + "bureau_id": "300529", + "bureau_name": "吉林省长春市南关区", + "data_type": 4, + "psn_num_boy|1000-5000": 0, + "psn_num_girl|1000-5000": 0, + "psn_num_stu|3000-10000": 0, + "scr_avg_boy|1-100.2": 0, + "scr_avg_girl|1-100.2": 0, + "scr_avg_stu|1-100.2": 0, + "rnk_rto_a_boy|1-100.2": 0, + "rnk_rto_a_girl|1-100.2": 0, + "rnk_rto_a_stu|1-100.2": 0, + "rnk_rto_b_boy|1-100.2": 0, + "rnk_rto_b_girl|1-100.2": 0, + "rnk_rto_b_stu|1-100.2": 0, + "rnk_rto_c_boy|1-100.2": 0, + "rnk_rto_c_girl|1-100.2": 0, + "rnk_rto_c_stu|1-100.2": 0, + "rnk_rto_d_boy|1-100.2": 0, + "rnk_rto_d_girl|1-100.2": 0, + "rnk_rto_d_stu|1-100.2": 0, + }] + }).list +} + +export default { + getSchoolTotalNumAvgRankList +} diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js index 8b4eb4a..cc6a3a0 100644 --- a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.js @@ -8,7 +8,7 @@ const columns = [{ },{ title: '学校', align: 'center', - dataIndex: 'shcool_name' + dataIndex: 'school_name' },{ title: '所属区县', align: 'center', @@ -76,6 +76,4 @@ const columns = [{ ] }] -const tableDatas = [] - -export { columns, tableDatas } +export { columns } diff --git a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue index 6a09a48..e9ac48c 100644 --- a/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue +++ b/src/views/physicalHealth/dataAnalysis/districtAnalysis/District_02.vue @@ -25,7 +25,8 @@