diff --git a/WebRoot/view/tb/zbdc/cols/colsData.js b/WebRoot/view/tb/zbdc/cols/colsData.js index 417d3768..aac74d4d 100644 --- a/WebRoot/view/tb/zbdc/cols/colsData.js +++ b/WebRoot/view/tb/zbdc/cols/colsData.js @@ -8,7 +8,7 @@ common_Cols = [ //小学科学 xx_kexue_Cols = [ [ - { title: '小学科学', align: 'center', colspan: 9 } + { title: '小学科学', align: 'center', colspan: 10 } ], [ { title: '实验室(室数)', field: 'xx_kxsysshshu', align: 'center', width: "105" }, @@ -20,13 +20,14 @@ xx_kexue_Cols = [ { title: '准备室面积(㎡)', field: 'xx_kxzbrsmj', align: 'center', width: "115" }, { title: '仪器已配品种(个)', field: 'xx_kxyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'xx_kxypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'xx_kxypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'xx_kxpbl', align: 'center', width: "90" } ] ]; //小学音乐 xx_yinyue_Cols = [ [ - { title: '小学音乐', align: 'center', colspan: 5 } + { title: '小学音乐', align: 'center', colspan: 6 } ], [ { title: '教室(室数)', field: 'xx_yqjtrshshu', align: 'center', width: "90" }, @@ -34,26 +35,29 @@ xx_yinyue_Cols = [ { title: '器材库(间数)', field: 'xx_yqqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'xx_yyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'xx_yyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'xx_yyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'xx_yypbl', align: 'center', width: "90" } + ] ]; //小学体育 xx_tiyu_Cols = [ [ - { title: '小学体育', align: 'center', colspan: 4 } + { title: '小学体育', align: 'center', colspan: 5 } ], [ { title: '体育馆(数)', field: 'xx_tygyshshu', align: 'center', width: "90" }, { title: '器材库(间数)', field: 'xx_tyqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'xx_tyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'xx_tyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'xx_tyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'xx_typbl', align: 'center', width: "90" } ] ]; //小学美术 xx_meishu_Cols = [ [ - { title: '小学美术', align: 'center', colspan: 7 } + { title: '小学美术', align: 'center', colspan: 8 } ], [ { title: '美术教室(室数)', field: 'xx_msjtrshshu', align: 'center', width: "115" }, @@ -63,7 +67,8 @@ xx_meishu_Cols = [ { title: '书法教室面积(㎡)', field: 'xx_msfsjtrmj', align: 'center', width: "125" }, { title: '器材已配品种(个)', field: 'xx_msyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'xx_msypjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'xx_msypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'xx_mspbl', align: 'center', width: "90" } ] ]; //小学劳动教育 @@ -137,7 +142,7 @@ xx_huyandeng_Cols = [ //初中物理 cz_wuli_Cols = [ [ - { title: '初中物理', align: 'center', colspan: 11 } + { title: '初中物理', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'cz_wllshshshu', align: 'center', width: "105" }, @@ -151,13 +156,14 @@ cz_wuli_Cols = [ { title: '探究实验室面积(㎡)', field: 'cz_wltgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'cz_wlyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'cz_wlypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'cz_wlypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_wlpbl', align: 'center', width: "90" } ] ]; //初中化学 cz_huaxue_Cols = [ [ - { title: '初中化学', align: 'center', colspan: 11 } + { title: '初中化学', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'cz_hxlshshshu', align: 'center', width: "105" }, @@ -171,13 +177,14 @@ cz_huaxue_Cols = [ { title: '探究实验室面积(㎡)', field: 'cz_hxtgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'cz_hxyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'cz_hxypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'cz_hxypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_hxpbl', align: 'center', width: "90" } ] ]; //初中生物 cz_shengwu_Cols = [ [ - { title: '初中生物', align: 'center', colspan: 11 } + { title: '初中生物', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'cz_swlshshshu', align: 'center', width: "105" }, @@ -191,13 +198,14 @@ cz_shengwu_Cols = [ { title: '探究实验室面积(㎡)', field: 'cz_swtgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'cz_swyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'cz_swypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'cz_swypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_swpbl', align: 'center', width: "90" } ] ]; //初中音乐 cz_yinyue_Cols = [ [ - { title: '初中音乐', align: 'center', colspan: 5 } + { title: '初中音乐', align: 'center', colspan: 6 } ], [ { title: '教室(室数)', field: 'cz_yqjtrshshu', align: 'center', width: "90" }, @@ -205,26 +213,28 @@ cz_yinyue_Cols = [ { title: '器材库(间数)', field: 'cz_yqqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'cz_yyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'cz_yyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'cz_yyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_yypbl', align: 'center', width: "90" } ] ]; //初中体育 cz_tiyu_Cols = [ [ - { title: '初中体育', align: 'center', colspan: 4 } + { title: '初中体育', align: 'center', colspan: 5 } ], [ { title: '体育馆(数)', field: 'cz_tygyshshu', align: 'center', width: "90" }, { title: '器材库(间数)', field: 'cz_tyqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'cz_tyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'cz_tyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'cz_tyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_typbl', align: 'center', width: "90" } ] ]; //初中美术 cz_meishu_Cols = [ [ - { title: '初中美术', align: 'center', colspan: 7 } + { title: '初中美术', align: 'center', colspan: 8 } ], [ { title: '美术教室(室数)', field: 'cz_msjtrshshu', align: 'center', width: "115" }, @@ -234,7 +244,8 @@ cz_meishu_Cols = [ { title: '书法教室面积(㎡)', field: 'cz_msfsjtrmj', align: 'center', width: "125" }, { title: '器材已配品种(个)', field: 'cz_msyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'cz_msyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'cz_msypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'cz_mspbl', align: 'center', width: "90" } ] ]; //初中劳动教育 @@ -320,7 +331,7 @@ cz_huyandeng_Cols = [ //高中物理 gz_wuli_Cols = [ [ - { title: '高中物理', align: 'center', colspan: 11 } + { title: '高中物理', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'gz_wllshshshu', align: 'center', width: "105" }, @@ -334,13 +345,14 @@ gz_wuli_Cols = [ { title: '探究实验室面积(㎡)', field: 'gz_wltgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'gz_wlyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'gz_wlypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'gz_wlypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_wlpbl', align: 'center', width: "90" } ] ]; //高中化学 gz_huaxue_Cols = [ [ - { title: '高中化学', align: 'center', colspan: 11 } + { title: '高中化学', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'gz_hxlshshshu', align: 'center', width: "105" }, @@ -354,13 +366,14 @@ gz_huaxue_Cols = [ { title: '探究实验室面积(㎡)', field: 'gz_hxtgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'gz_hxyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'gz_hxypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'gz_hxypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_hxpbl', align: 'center', width: "90" } ] ]; //高中生物 gz_shengwu_Cols = [ [ - { title: '高中生物', align: 'center', colspan: 11 } + { title: '高中生物', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'gz_swlshshshu', align: 'center', width: "105" }, @@ -374,13 +387,14 @@ gz_shengwu_Cols = [ { title: '探究实验室面积(㎡)', field: 'gz_swtgsmjmj', align: 'center', width: "135" }, { title: '仪器已配品种(个)', field: 'gz_swyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'gz_swypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'gz_swypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_swpbl', align: 'center', width: "90" } ] ]; //高中音乐 gz_yinyue_Cols = [ [ - { title: '高中音乐', align: 'center', colspan: 5 } + { title: '高中音乐', align: 'center', colspan: 6 } ], [ { title: '教室(室数)', field: 'gz_yqjtrshshu', align: 'center', width: "90" }, @@ -388,26 +402,28 @@ gz_yinyue_Cols = [ { title: '器材库(间数)', field: 'gz_yqqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'gz_yyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'gz_yyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'gz_yyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_yypbl', align: 'center', width: "90" } ] ]; //高中体育 gz_tiyu_Cols = [ [ - { title: '高中体育', align: 'center', colspan: 4 } + { title: '高中体育', align: 'center', colspan: 5 } ], [ { title: '体育馆(数)', field: 'gz_tygyshshu', align: 'center', width: "90" }, { title: '器材库(间数)', field: 'gz_tyqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'gz_tyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'gz_tyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'gz_tyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_typbl', align: 'center', width: "90" } ] ]; //高中美术 gz_meishu_Cols = [ [ - { title: '高中美术', align: 'center', colspan: 7 } + { title: '高中美术', align: 'center', colspan: 8 } ], [ { title: '美术教室(室数)', field: 'gz_msjtrshshu', align: 'center', width: "115" }, @@ -417,7 +433,8 @@ gz_meishu_Cols = [ { title: '书法教室面积(㎡)', field: 'gz_msfsjtrmj', align: 'center', width: "125" }, { title: '器材已配品种(个)', field: 'gz_msyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'gz_msyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'gz_msypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'gz_mspbl', align: 'center', width: "90" } ] ]; //高中图书馆 @@ -496,7 +513,7 @@ gz_huyandeng_Cols = [ //汇总音乐 sum_yinyue_Cols = [ [ - { title: '音乐(汇总)', align: 'center', colspan: 5 } + { title: '音乐(汇总)', align: 'center', colspan: 6 } ], [ { title: '教室(室数)', field: 'summary_yqjtrshshu', align: 'center', width: "90" }, @@ -504,26 +521,28 @@ sum_yinyue_Cols = [ { title: '器材库(间数)', field: 'summary_yqqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'summary_yyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'summary_yyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'summary_yyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_yypbl', align: 'center', width: "90" } ] ]; //汇总体育 sum_tiyu_Cols = [ [ - { title: '体育(汇总)', align: 'center', colspan: 4 } + { title: '体育(汇总)', align: 'center', colspan: 5 } ], [ { title: '体育馆(数)', field: 'summary_tygyshshu', align: 'center', width: "90" }, { title: '器材库(间数)', field: 'summary_tyqjkkjshu', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'summary_tyyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'summary_tyyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'summary_tyypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_typbl', align: 'center', width: "90" } ] ]; //汇总美术 sum_meishu_Cols = [ [ - { title: '美术(汇总)', align: 'center', colspan: 7 } + { title: '美术(汇总)', align: 'center', colspan: 8 } ], [ { title: '美术教室(室数)', field: 'summary_msjtrshshu', align: 'center', width: "90" }, @@ -533,13 +552,14 @@ sum_meishu_Cols = [ { title: '书法教室面积(㎡)', field: 'summary_msfsjtrmj', align: 'center', width: "100" }, { title: '器材已配品种(个)', field: 'summary_msyppz', align: 'center', width: "125" }, - { title: '器材已配件数(件)', field: 'summary_msyqjs', align: 'center', width: "125" } + { title: '器材已配件数(件)', field: 'summary_msypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_mspbl', align: 'center', width: "90" } ] ]; //汇总物理 sum_wuli_Cols = [ [ - { title: '物理(汇总)', align: 'center', colspan: 11 } + { title: '物理(汇总)', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'summary_wllshshshu', align: 'center', width: "115" }, @@ -553,13 +573,14 @@ sum_wuli_Cols = [ { title: '探究实验室面积(㎡)', field: 'summary_wltgsmjmj', align: 'center', width: "125" }, { title: '仪器已配品种(个)', field: 'summary_wlyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'summary_wlypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'summary_wlypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_wlpbl', align: 'center', width: "90" } ] ]; //汇总化学 sum_huaxue_Cols = [ [ - { title: '化学(汇总)', align: 'center', colspan: 11 } + { title: '化学(汇总)', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'summary_hxlshshshu', align: 'center', width: "115" }, @@ -573,13 +594,14 @@ sum_huaxue_Cols = [ { title: '探究实验室面积(㎡)', field: 'summary_hxtgsmjmj', align: 'center', width: "125" }, { title: '仪器已配品种(个)', field: 'summary_hxyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'summary_hxypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'summary_hxypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_hxpbl', align: 'center', width: "90" } ] ]; //汇总生物 sum_shengwu_Cols = [ [ - { title: '生物(汇总)', align: 'center', colspan: 11 } + { title: '生物(汇总)', align: 'center', colspan: 12 } ], [ { title: '实验室(室数)', field: 'summary_swlshshshu', align: 'center', width: "115" }, @@ -593,7 +615,8 @@ sum_shengwu_Cols = [ { title: '探究实验室面积(㎡)', field: 'summary_swtgsmjmj', align: 'center', width: "125" }, { title: '仪器已配品种(个)', field: 'summary_swyppz', align: 'center', width: "125" }, - { title: '仪器已配件数(件)', field: 'summary_swypjs', align: 'center', width: "125" } + { title: '仪器已配件数(件)', field: 'summary_swypjs', align: 'center', width: "125" }, + { title: '配备率', field: 'summary_swpbl', align: 'center', width: "90" } ] ]; //汇总劳动教育 diff --git a/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html b/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html index 427e6fc8..fa9f7f66 100644 --- a/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html +++ b/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html @@ -230,7 +230,7 @@ lv1Arr.push(...window[name][0]); lv2Arr.push(...window[name][1]); } - }); + }); customCols = [ lv1Arr, @@ -244,7 +244,7 @@ checkboxVal.push($(this).val()); }); - var allArr = ["cz_wuli_Cols", "gz_wuli_Cols", "sum_wuli_Cols", "cz_huaxue_Cols", "gz_huaxue_Cols", "sum_huaxue_Cols", "cz_shengwu_Cols", "cz_shengwu_Cols", "sum_shengwu_Cols", "cz_yinyue_Cols", "gz_yinyue_Cols", "sum_yinyue_Cols", "cz_tiyu_Cols", "gz_tiyu_Cols", "sum_tiyu_Cols", "cz_meishu_Cols", "gz_meishu_Cols", "sum_meishu_Cols", "cz_laoji_Cols", "sum_laoji_Cols", "cz_tushuguan_Cols", "gz_tushuguan_Cols", "sum_tushuguan_Cols", "cz_xinli_Cols", "gz_xinli_Cols", "sum_xinli_Cols", "cz_weisheng_Cols", "gz_weisheng_Cols", "sum_weisheng_Cols", "cz_qita_Cols", "gz_qita_Cols", "sum_qita_Cols", "cz_huyandeng_Cols", "gz_huyandeng_Cols", "sum_huyandeng_Cols", "gz_tongyongjishu_Cols"]; + var allArr = ["cz_wuli_Cols", "gz_wuli_Cols", "sum_wuli_Cols", "cz_huaxue_Cols", "gz_huaxue_Cols", "sum_huaxue_Cols", "cz_shengwu_Cols", "gz_shengwu_Cols", "sum_shengwu_Cols", "cz_yinyue_Cols", "gz_yinyue_Cols", "sum_yinyue_Cols", "cz_tiyu_Cols", "gz_tiyu_Cols", "sum_tiyu_Cols", "cz_meishu_Cols", "gz_meishu_Cols", "sum_meishu_Cols", "cz_laoji_Cols", "sum_laoji_Cols", "cz_tushuguan_Cols", "gz_tushuguan_Cols", "sum_tushuguan_Cols", "cz_xinli_Cols", "gz_xinli_Cols", "sum_xinli_Cols", "cz_weisheng_Cols", "gz_weisheng_Cols", "sum_weisheng_Cols", "cz_qita_Cols", "gz_qita_Cols", "sum_qita_Cols", "cz_huyandeng_Cols", "gz_huyandeng_Cols", "sum_huyandeng_Cols", "gz_tongyongjishu_Cols"]; if (!checkboxVal.includes("4")) { @@ -252,7 +252,7 @@ allArr = allArr.filter(item => !czArr.includes(item)); } if (!checkboxVal.includes("5")) { - var gzArr = ["gz_wuli_Cols", "gz_huaxue_Cols", "cz_shengwu_Cols", "gz_yinyue_Cols", "gz_tiyu_Cols", "gz_meishu_Cols", "gz_tushuguan_Cols", "gz_xinli_Cols", "gz_weisheng_Cols", "gz_tongyongjishu_Cols", "gz_qita_Cols", "gz_huyandeng_Cols"]; + var gzArr = ["gz_wuli_Cols", "gz_huaxue_Cols", "gz_shengwu_Cols", "gz_yinyue_Cols", "gz_tiyu_Cols", "gz_meishu_Cols", "gz_tushuguan_Cols", "gz_xinli_Cols", "gz_weisheng_Cols", "gz_qita_Cols", "gz_huyandeng_Cols", "gz_tongyongjishu_Cols"]; allArr = allArr.filter(item => !gzArr.includes(item)); } if (!checkboxVal.includes("6")) { @@ -267,7 +267,7 @@ lv1Arr.push(...window[name][0]); lv2Arr.push(...window[name][1]); } - }); + }); customCols = [ lv1Arr, @@ -282,6 +282,8 @@ break; } + console.log(customCols) + table.render({ elem: '#myTable',