From 3851c418fe571a4605a808d2ff86000a6f29c70f Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 28 八月 2023 14:30:23 +0800 Subject: [PATCH] new file: src/assets/404_images/login-bg.png new file: src/assets/404_images/login-form-bg.png modified: src/components/experiment/checkTheReport/index.vue modified: src/views/chart/work/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/laboratory/measure/index.vue new file: src/views/login/2.vue modified: src/views/login/index.vue --- src/views/chart/work/index.vue | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/chart/work/index.vue b/src/views/chart/work/index.vue index 46e1da2..399ab21 100644 --- a/src/views/chart/work/index.vue +++ b/src/views/chart/work/index.vue @@ -90,23 +90,34 @@ }, } }, - mounted(){}, + mounted(){ + this.queryData(); + }, methods: { async queryData(){ - let date = this.formInline.date; + let date = []; + let type; + if(this.formInline.date == null || this.formInline.date == ""){ + let currentDate = new Date(); + let year = currentDate.getFullYear(); + let month = currentDate.getMonth() + 1; + let day = currentDate.getDate(); + date.push(year +"-" + month + "-01"); + date.push(year +"-" + month + "-" + day); + type = 0; + }else{ + date = this.formInline.date; + type = this.formInline.type; + } let obj = { startTime : date[0], endTime : date[1], - type : this.formInline.type + type : type } const dutyMater = await getDutyMater(obj); const dutyTimely = await getDutyTimely(obj); const executeMater = await getExecuteMater(obj); const executeTimely = await getExecuteTimely(obj); - console.log("dm",dutyMater.data); - console.log("dt",dutyTimely.data); - console.log("em",executeMater.data.length); - console.log("et",executeTimely.data); this.initLeaderStatiChart("leaderStati",dutyMater.data); this.initLeaderTimelyChart("leaderTimely",dutyTimely.data); this.initTesterStatiChart("testerStati",executeMater.data); -- Gitblit v1.9.3