diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue index 4abff1a1..28f9ff5d 100644 --- a/src/views/bigScreen/index_6dept.vue +++ b/src/views/bigScreen/index_6dept.vue @@ -239,7 +239,6 @@ export default { this.containerHeight2 = document.getElementById("scrollContainer2").clientHeight; this.table2Visible = true; - const ondDayTime = 86400000; let date = new Date(); let year = date.getFullYear(); @@ -247,9 +246,10 @@ export default { let day = date.getDate(); let days = new Date(year, month, 0).getDate(); this.days = days; + month = month < 10 ? "0" + month : month; + day = day < 10 ? "0" + day : day; let start_date = year + "-" + month + "-01"; - let lastDay = new Date(year, month, 0).getDate(); - let end_date = year + "-" + month + "-" + lastDay; + let end_date = year + "-" + month + "-" + days; this.start_date = start_date; this.end_date = end_date; this.today = year + "-" + month + "-" + day; @@ -383,12 +383,13 @@ export default { start_date: this.weekFirst, end_date: this.weekLast, dept_name: "6车间", - select_cols_material: ", material.model AS 型号", - group_bys_material: ", material.model", - order_bys_material: "", - select_cols_mgroup: ", mgroup.name AS 工段", - group_bys_mgroup: ", mgroup.name", is_count_utask: -1, + group_bys_mgroup: ", mgroup.name", + order_bys_mgroup: ", 工段", + group_bys_material: ", material.model", + order_bys_material: ", 型号", + select_cols_mgroup: ", mgroup.name AS 工段", + select_cols_material: ", material.model AS 型号" }, }; //生产车间按日统计 @@ -446,15 +447,15 @@ export default { legendArr2 = []; let obj = { query: { - start_date: "2023-01-01", - end_date: "2023-12-31", - dept_name: "10车间", + start_date: this.start_date, + end_date: this.end_date, + dept_name: "6车间", }, }; let obj2 = { query: { - start_date: "2023-01-01", - end_date: "2023-12-31", + start_date: this.start_date, + end_date: this.end_date, mio_type: "sale_out", material_id: "", }, @@ -466,9 +467,7 @@ export default { xAxisData[i] = text; } //生产车间按日统计 - that.$API.bi.dataset.exec - .req("productStatistic", obj) - .then((res1) => { + that.$API.bi.dataset.exec.req("productStatistic", obj).then((res1) => { console.log("生产车间按日统计:", res1); if (res1.data2.ds0) { let list1 = res1.data2.ds0; @@ -498,8 +497,6 @@ export default { }); } } - console.log("00000000000000000000000"); - console.log("seriesData:", seriesData); let chart1Option = deepCopy(this.basicOption); chart1Option.legend.data = legendArr; chart1Option.xAxis.data = xAxisData; diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index 2fa120d2..5f658b8b 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -751,6 +751,9 @@ export default { group_bys_material: "", order_bys_material: "", select_cols_material: "", + group_bys_material_name: "", + order_bys_material_name: "", + select_cols_material_name: "" }, }; that.$API.bi.dataset.exec.req("lineDay", obj).then((res) => { @@ -800,6 +803,9 @@ export default { group_bys_material: "", order_bys_material: "", select_cols_material: "", + group_bys_material_name: "", + order_bys_material_name: "", + select_cols_material_name: "" }, }; that.$API.bi.dataset.exec.req("lineDay", obj).then((res) => {