diff --git a/WebRoot/view/tb/zbdc/cols/colsData.js b/WebRoot/view/tb/zbdc/cols/colsData.js index 0cd5b013..8a087d71 100644 --- a/WebRoot/view/tb/zbdc/cols/colsData.js +++ b/WebRoot/view/tb/zbdc/cols/colsData.js @@ -89,6 +89,16 @@ xx_laoji_Cols = [ { title: '其他', field: 'xx_ldjy_qt_sum', align: 'center', width: "90" }, ] ]; +//小学创客 +xx_chuangke_Cols = [ + [ + { title: '小学创客', align: 'center', colspan: 2 } + ], + [ + { title: '间数', field: 'xx_ck_js_sum', align: 'center', width: "90" }, + { title: '面积(㎡)', field: 'xx_ck_mj_sum', align: 'center', width: "90" } + ] +]; //小学图书馆 xx_tushuguan_Cols = [ [ @@ -267,6 +277,16 @@ cz_laoji_Cols = [ { title: '其他', field: 'cz_ldjy_qt_sum', align: 'center', width: "90" } ] ]; +//初中创客 +cz_chuangke_Cols = [ + [ + { title: '初中创客', align: 'center', colspan: 2 } + ], + [ + { title: '间数', field: 'cz_ck_js_sum', align: 'center', width: "90" }, + { title: '面积(㎡)', field: 'cz_ck_mj_sum', align: 'center', width: "90" } + ] +]; //初中图书馆 cz_tushuguan_Cols = [ [ @@ -437,6 +457,16 @@ gz_meishu_Cols = [ { title: '配备率', field: 'gz_mspbl', align: 'center', width: "90" } ] ]; +//高中创客 +gz_chuangke_Cols = [ + [ + { title: '高中创客', align: 'center', colspan: 2 } + ], + [ + { title: '间数', field: 'gz_ck_js_sum', align: 'center', width: "90" }, + { title: '面积(㎡)', field: 'gz_ck_mj_sum', align: 'center', width: "90" } + ] +]; //高中图书馆 gz_tushuguan_Cols = [ [ @@ -634,6 +664,16 @@ sum_laoji_Cols = [ { title: '其他', field: 'summary_ldjy_qt_sum', align: 'center', width: "90" } ] ]; +//汇总创客 +sum_chuangke_Cols = [ + [ + { title: '汇总创客', align: 'center', colspan: 2 } + ], + [ + { title: '间数', field: 'summary_ck_js_sum', align: 'center', width: "90" }, + { title: '面积(㎡)', field: 'summary_ck_mj_sum', align: 'center', width: "90" } + ] +]; //汇总图书馆 sum_tushuguan_Cols = [ [ diff --git a/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html b/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html index 8baf9053..3758dd31 100644 --- a/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html +++ b/WebRoot/view/tb/zbdc/sjcx_cgzbcx.html @@ -115,7 +115,8 @@ - @@ -197,14 +198,14 @@ switch ($("#xxlxId").val()) { case '211': customCols = [ - common_Cols.concat(xx_kexue_Cols[0], xx_yinyue_Cols[0], xx_tiyu_Cols[0], xx_meishu_Cols[0], xx_laoji_Cols[0], xx_tushuguan_Cols[0], xx_xinli_Cols[0], xx_weisheng_Cols[0], xx_huyandeng_Cols[0]), - xx_kexue_Cols[1].concat(xx_yinyue_Cols[1], xx_tiyu_Cols[1], xx_meishu_Cols[1], xx_laoji_Cols[1], xx_tushuguan_Cols[1], xx_xinli_Cols[1], xx_weisheng_Cols[1], xx_huyandeng_Cols[1]) + common_Cols.concat(xx_kexue_Cols[0], xx_yinyue_Cols[0], xx_tiyu_Cols[0], xx_meishu_Cols[0], xx_laoji_Cols[0], xx_chuangke_Colsp[0], xx_tushuguan_Cols[0], xx_xinli_Cols[0], xx_weisheng_Cols[0], xx_huyandeng_Cols[0]), + xx_kexue_Cols[1].concat(xx_yinyue_Cols[1], xx_tiyu_Cols[1], xx_meishu_Cols[1], xx_laoji_Cols[1], xx_chuangke_Colsp[0], xx_tushuguan_Cols[1], xx_xinli_Cols[1], xx_weisheng_Cols[1], xx_huyandeng_Cols[1]) ]; break; case '311': customCols = [ - common_Cols.concat(cz_wuli_Cols[0], cz_huaxue_Cols[0], cz_shengwu_Cols[0], cz_yinyue_Cols[0], cz_tiyu_Cols[0], cz_meishu_Cols[0], cz_laoji_Cols[0], cz_tushuguan_Cols[0], cz_xinli_Cols[0], cz_weisheng_Cols[0], cz_qita_Cols[0], cz_huyandeng_Cols[0]), - cz_wuli_Cols[1].concat(cz_huaxue_Cols[1], cz_shengwu_Cols[1], cz_yinyue_Cols[1], cz_tiyu_Cols[1], cz_meishu_Cols[1], cz_laoji_Cols[1], cz_tushuguan_Cols[1], cz_xinli_Cols[1], cz_weisheng_Cols[1], cz_qita_Cols[1], cz_huyandeng_Cols[1]) + common_Cols.concat(cz_wuli_Cols[0], cz_huaxue_Cols[0], cz_shengwu_Cols[0], cz_yinyue_Cols[0], cz_tiyu_Cols[0], cz_meishu_Cols[0], cz_laoji_Cols[0], cz_chuangke_Cols[0], cz_tushuguan_Cols[0], cz_xinli_Cols[0], cz_weisheng_Cols[0], cz_qita_Cols[0], cz_huyandeng_Cols[0]), + cz_wuli_Cols[1].concat(cz_huaxue_Cols[1], cz_shengwu_Cols[1], cz_yinyue_Cols[1], cz_tiyu_Cols[1], cz_meishu_Cols[1], cz_laoji_Cols[1], cz_chuangke_Cols[0], cz_tushuguan_Cols[1], cz_xinli_Cols[1], cz_weisheng_Cols[1], cz_qita_Cols[1], cz_huyandeng_Cols[1]) ]; break; case '312': @@ -213,18 +214,18 @@ checkboxVal.push($(this).val()); }); - var allArr = ["xx_kexue_Cols", "xx_yinyue_Cols", "cz_yinyue_Cols", "sum_yinyue_Cols", "xx_tiyu_Cols", "cz_tiyu_Cols", "sum_tiyu_Cols", "xx_meishu_Cols", "cz_meishu_Cols", "sum_meishu_Cols", "cz_wuli_Cols", "sum_wuli_Cols", "cz_huaxue_Cols", "sum_huaxue_Cols", "cz_shengwu_Cols", "sum_shengwu_Cols", "xx_laoji_Cols", "cz_laoji_Cols", "sum_laoji_Cols", "xx_tushuguan_Cols", "cz_tushuguan_Cols", "sum_tushuguan_Cols", "xx_xinli_Cols", "cz_xinli_Cols", "sum_xinli_Cols", "xx_weisheng_Cols", "cz_weisheng_Cols", "sum_weisheng_Cols", "cz_qita_Cols", "sum_qita_Cols", "xx_huyandeng_Cols", "cz_huyandeng_Cols", "sum_huyandeng_Cols"]; + var allArr = ["xx_kexue_Cols", "xx_yinyue_Cols", "cz_yinyue_Cols", "sum_yinyue_Cols", "xx_tiyu_Cols", "cz_tiyu_Cols", "sum_tiyu_Cols", "xx_meishu_Cols", "cz_meishu_Cols", "sum_meishu_Cols", "cz_wuli_Cols", "sum_wuli_Cols", "cz_huaxue_Cols", "sum_huaxue_Cols", "cz_shengwu_Cols", "sum_shengwu_Cols", "xx_laoji_Cols", "cz_laoji_Cols", "sum_laoji_Cols", "xx_chuangke_Cols", "cz_chuangke_Cols", "sum_chuangke_Cols", "xx_tushuguan_Cols", "cz_tushuguan_Cols", "sum_tushuguan_Cols", "xx_xinli_Cols", "cz_xinli_Cols", "sum_xinli_Cols", "xx_weisheng_Cols", "cz_weisheng_Cols", "sum_weisheng_Cols", "cz_qita_Cols", "sum_qita_Cols", "xx_huyandeng_Cols", "cz_huyandeng_Cols", "sum_huyandeng_Cols"]; if (!checkboxVal.includes("1")) { - var xxArr = ["xx_kexue_Cols", "xx_yinyue_Cols", "xx_tiyu_Cols", "xx_meishu_Cols", "xx_laoji_Cols", "xx_tushuguan_Cols", "xx_xinli_Cols", "xx_weisheng_Cols", "xx_huyandeng_Cols"]; + var xxArr = ["xx_kexue_Cols", "xx_yinyue_Cols", "xx_tiyu_Cols", "xx_meishu_Cols", "xx_laoji_Cols", "xx_chuangke_Cols", "xx_tushuguan_Cols", "xx_xinli_Cols", "xx_weisheng_Cols", "xx_huyandeng_Cols"]; allArr = allArr.filter(item => !xxArr.includes(item)); } if (!checkboxVal.includes("2")) { - var czArr = ["cz_wuli_Cols", "cz_huaxue_Cols", "cz_shengwu_Cols", "cz_yinyue_Cols", "cz_tiyu_Cols", "cz_meishu_Cols", "cz_laoji_Cols", "cz_tushuguan_Cols", "cz_xinli_Cols", "cz_weisheng_Cols", "cz_qita_Cols", "cz_huyandeng_Cols"]; + var czArr = ["cz_wuli_Cols", "cz_huaxue_Cols", "cz_shengwu_Cols", "cz_yinyue_Cols", "cz_tiyu_Cols", "cz_meishu_Cols", "cz_laoji_Cols", "cz_chuangke_Cols", "cz_tushuguan_Cols", "cz_xinli_Cols", "cz_weisheng_Cols", "cz_qita_Cols", "cz_huyandeng_Cols"]; allArr = allArr.filter(item => !czArr.includes(item)); } if (!checkboxVal.includes("3")) { - var sumArr = ["sum_yinyue_Cols", "sum_tiyu_Cols", "sum_meishu_Cols", "sum_wuli_Cols", "sum_huaxue_Cols", "sum_shengwu_Cols", "sum_laoji_Cols", "sum_tushuguan_Cols", "sum_xinli_Cols", "sum_weisheng_Cols", "sum_qita_Cols", "sum_huyandeng_Cols"]; + var sumArr = ["sum_yinyue_Cols", "sum_tiyu_Cols", "sum_meishu_Cols", "sum_wuli_Cols", "sum_huaxue_Cols", "sum_shengwu_Cols", "sum_laoji_Cols", "sum_chuangke_Cols", "sum_tushuguan_Cols", "sum_xinli_Cols", "sum_weisheng_Cols", "sum_qita_Cols", "sum_huyandeng_Cols"]; allArr = allArr.filter(item => !sumArr.includes(item)); } @@ -249,19 +250,19 @@ 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", "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"]; + 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_chuangke_Cols", "gz_chuangke_Cols", "sum_chuangke_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")) { - var czArr = ["cz_wuli_Cols", "cz_huaxue_Cols", "cz_shengwu_Cols", "cz_yinyue_Cols", "cz_tiyu_Cols", "cz_meishu_Cols", "cz_laoji_Cols", "cz_tushuguan_Cols", "cz_xinli_Cols", "cz_weisheng_Cols", "cz_qita_Cols", "cz_huyandeng_Cols"]; + var czArr = ["cz_wuli_Cols", "cz_huaxue_Cols", "cz_shengwu_Cols", "cz_yinyue_Cols", "cz_tiyu_Cols", "cz_meishu_Cols", "cz_laoji_Cols", "cz_chuangke_Cols", "cz_tushuguan_Cols", "cz_xinli_Cols", "cz_weisheng_Cols", "cz_qita_Cols", "cz_huyandeng_Cols"]; allArr = allArr.filter(item => !czArr.includes(item)); } if (!checkboxVal.includes("5")) { - 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"]; + var gzArr = ["gz_wuli_Cols", "gz_huaxue_Cols", "gz_shengwu_Cols", "gz_yinyue_Cols", "gz_tiyu_Cols", "gz_meishu_Cols", "gz_chuangke_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")) { - var sumArr = ["sum_yinyue_Cols", "sum_tiyu_Cols", "sum_meishu_Cols", "sum_wuli_Cols", "sum_huaxue_Cols", "sum_shengwu_Cols", "sum_laoji_Cols", "sum_tushuguan_Cols", "sum_xinli_Cols", "sum_weisheng_Cols", "sum_qita_Cols", "sum_huyandeng_Cols"]; + var sumArr = ["sum_yinyue_Cols", "sum_tiyu_Cols", "sum_meishu_Cols", "sum_wuli_Cols", "sum_huaxue_Cols", "sum_shengwu_Cols", "sum_laoji_Cols", "sum_chuangke_Cols", "sum_tushuguan_Cols", "sum_xinli_Cols", "sum_weisheng_Cols", "sum_qita_Cols", "sum_huyandeng_Cols"]; allArr = allArr.filter(item => !sumArr.includes(item)); } @@ -281,13 +282,11 @@ break; case '342': customCols = [ - common_Cols.concat(gz_wuli_Cols[0], gz_huaxue_Cols[0], cz_shengwu_Cols[0], gz_yinyue_Cols[0], gz_tiyu_Cols[0], gz_meishu_Cols[0], gz_tushuguan_Cols[0], gz_xinli_Cols[0], gz_weisheng_Cols[0], gz_tongyongjishu_Cols[0], gz_qita_Cols[0], gz_huyandeng_Cols[0]), - gz_wuli_Cols[1].concat(gz_huaxue_Cols[1], cz_shengwu_Cols[1], gz_yinyue_Cols[1], gz_tiyu_Cols[1], gz_meishu_Cols[1], gz_tushuguan_Cols[1], gz_xinli_Cols[1], gz_weisheng_Cols[1], gz_tongyongjishu_Cols[1], gz_qita_Cols[1], gz_huyandeng_Cols[1]) + common_Cols.concat(gz_wuli_Cols[0], gz_huaxue_Cols[0], cz_shengwu_Cols[0], gz_yinyue_Cols[0], gz_tiyu_Cols[0], gz_meishu_Cols[0], gz_chuangke_Cols[0], gz_tushuguan_Cols[0], gz_xinli_Cols[0], gz_weisheng_Cols[0], gz_tongyongjishu_Cols[0], gz_qita_Cols[0], gz_huyandeng_Cols[0]), + gz_wuli_Cols[1].concat(gz_huaxue_Cols[1], cz_shengwu_Cols[1], gz_yinyue_Cols[1], gz_tiyu_Cols[1], gz_meishu_Cols[1], gz_chuangke_Cols[1], gz_tushuguan_Cols[1], gz_xinli_Cols[1], gz_weisheng_Cols[1], gz_tongyongjishu_Cols[1], gz_qita_Cols[1], gz_huyandeng_Cols[1]) ]; break; - } - - console.log(customCols) + } table.render({