From 975ea3c28b1661b3b6eabee5277cc98d853736d3 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <1247017146@qq.com> Date: 星期二, 03 六月 2025 11:12:40 +0800 Subject: [PATCH] 合并 --- CodeManagement/BigScreenVue/src/views/indexs/right-center.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue b/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue index 65c3385..5c8c25c 100644 --- a/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue +++ b/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue @@ -13,7 +13,7 @@ <script> import { currentGET } from "api/modules"; -import { ProductionStock } from "@/api/http.js"; +import { Getoutput } from "@/api/http.js"; import * as echarts from 'echarts'; let style = { fontSize: 24, @@ -226,18 +226,60 @@ // this.$Message.warning(res.msg); // } // }); - var rep = await ProductionStock(); + var rep1=await Getoutput(); + var rep=rep1.filter(it=>it.roadway.includes("CW")) + console.log(rep) +// 鑾峰彇浠婂ぉ闆剁偣鐨勬椂闂存埑 +const now = Date.now(); // 褰撳墠鏃堕棿鎴筹紙姣锛� +const todayStart = new Date(now); +todayStart.setHours(0, 0, 0, 0); // 璁剧疆涓烘湰鍦版椂闂寸殑 00:00:00 +const todayStartTimestamp = todayStart.getTime(); +// 鍑忓幓褰撳ぉ宸茶繃鍘荤殑姣鏁� +const timestamp = todayStartTimestamp; +const date = new Date(timestamp); + +// 琛ラ浂鍑芥暟 +const padZero = (num) => num.toString().padStart(2, '0'); + +// 鏍煎紡鍖栨棩鏈� +const formattedDate = `${date.getFullYear()}-${ + padZero(date.getMonth() + 1)}-${ + padZero(date.getDate())} ${ + padZero(date.getHours())}:${ + padZero(date.getMinutes())}:${ + padZero(date.getSeconds())}`; + + +// 鏈湴鏃跺尯褰撴湀绗竴澶╃殑 00:00:00 +const firstDayOfMonth = new Date( + new Date().getFullYear(), + new Date().getMonth(), // 鏈堜唤浠� 0 寮�濮嬶紙0=1鏈堬級 + 1 // 鏃ユ湡璁句负 1 鍙� +); +const date1 = new Date(firstDayOfMonth.getTime()); + +// 琛ラ浂鍑芥暟 +const padZero1 = (num) => num.toString().padStart(2, '0'); + +// 鏍煎紡鍖栨棩鏈� +const formattedDate1 = `${date.getFullYear()}-${ + padZero1(date1.getMonth() + 1)}-${ + padZero1(date1.getDate())} ${ + padZero1(date1.getHours())}:${ + padZero1(date1.getMinutes())}:${ + padZero1(date1.getSeconds())}`; + var data1 = [{ - text: '鎴愬搧搴撳瓨(PCS)', - value: rep.cpCount, + text: '鏃ヤ骇閲�', + value:rep.filter(it => it.createDate>formattedDate ).length, color: '#5dd054' }, { - text: '鐮斿彂搴撳瓨(PCS)', - value: rep.yfCount, + text: '鏈堜骇閲�', + value: rep.filter(it => it.createDate>formattedDate1).length, color: '#097ff9' }, { - text: '灏炬暟搴撳瓨(PCS)', - value: rep.wsCount, + text: '骞翠骇閲�', + value:rep.length, color: '#ff6804' }]; -- Gitblit v1.9.3