From 5c8aaba66c16b1a143fdec27e29ad36eaefd1e3a Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期二, 31 十二月 2024 14:33:25 +0800 Subject: [PATCH] 无源器件检验开发 --- src/components/view/b4-inspection-item-statistics.vue | 93 ++++++++++++++++++++++++++-------------------- 1 files changed, 52 insertions(+), 41 deletions(-) diff --git a/src/components/view/b4-inspection-item-statistics.vue b/src/components/view/b4-inspection-item-statistics.vue index f7e513f..5654875 100644 --- a/src/components/view/b4-inspection-item-statistics.vue +++ b/src/components/view/b4-inspection-item-statistics.vue @@ -10,61 +10,67 @@ <el-date-picker v-model="time.week" type="week" - format="yyyy-MM-dd" + format="yyyy 绗� WW 鍛�" placeholder="閫夋嫨鍛�" size="small" v-if="type=='鍛�'" @change="m=>changeTime(type,m)"> </el-date-picker> <el-date-picker v-model="time.month" type="month" - placeholder="閫夋嫨鏈�" format="yyyy-MM-dd" size="small" v-if="type=='鏈�'" @change="m=>changeTime(type,m)"> + placeholder="閫夋嫨鏈�" size="small" v-if="type=='鏈�'" @change="m=>changeTime(type,m)"> </el-date-picker> <el-date-picker v-model="time.year" type="year" - placeholder="閫夋嫨骞�" format="yyyy-MM-dd" size="small" v-if="type=='骞�'" @change="m=>changeTime(type,m)"> + placeholder="閫夋嫨骞�" size="small" v-if="type=='骞�'" @change="m=>changeTime(type,m)"> </el-date-picker> </div> <el-row :gutter="20"> <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;"> - <div class="inspection-card inspection-head"> - <div class="inspection-head-left"> - <h4>鏈瑊{type}}椤圭洰鎺ユ敹</h4> - <span >{{ pageData.RECEVICE }}</span> - <div class="inspection-head-left-info"> - <img :src="`../../../static/img/daliy-${pageData.RECEIVE_RATIO<0?'down':'up'}.svg`" alt=""> - <span :class="{active:pageData.RECEIVE_RATIO<0}" class="num" v-html="` ${handleData(pageData.RECEIVE_RATIO)}% `"></span> - <span style="font-size: 12px;">杈冧笂{{type}}</span> + <div class="inspection-card"> + <div class="inspection-head"> + <div class="inspection-head-left"> + <h4>鏈瑊{type}}椤圭洰鎺ユ敹</h4> + <span >{{ pageData.RECEVICE }}</span> </div> + <img src="../../../static/img/daliy-0.svg" alt="" srcset=""> </div> - <img src="../../../static/img/daliy-0.svg" alt="" srcset=""> + <div class="inspection-head-left-info"> + <img :src="`../../../static/img/daliy-${pageData.RECEIVE_RATIO<0?'down':'up'}.svg`" alt=""> + <span :class="{active:pageData.RECEIVE_RATIO<0}" class="num" v-html="` ${handleData(pageData.RECEIVE_RATIO)}% `"></span> + <span style="font-size: 12px;">杈冧笂{{type}}</span> + </div> </div> </el-col> <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;"> - <div class="inspection-card inspection-head"> - <div class="inspection-head-left"> - <h4>鏈瑊{type}}椤圭洰瀹屾垚</h4> - <span >{{ pageData.FINISHE }}</span> - <div class="inspection-head-left-info"> - <img :src="`../../../static/img/daliy-${pageData.FINISHE_RATIO<0?'down':'up'}.svg`" alt=""> - <span :class="{active:pageData.FINISHE_RATIO<0}" class="num" v-html="` ${handleData(pageData.FINISHE_RATIO)}% `"></span> - <span style="font-size: 12px;">杈冧笂{{type}}</span> + <div class="inspection-card"> + <div class="inspection-head"> + <div class="inspection-head-left"> + <h4>鏈瑊{type}}椤圭洰瀹屾垚</h4> + <span >{{ pageData.FINISHE }}</span> </div> + <img src="../../../static/img/daliy-1.svg" alt="" srcset=""> </div> - <img src="../../../static/img/daliy-1.svg" alt="" srcset=""> + <div class="inspection-head-left-info"> + <img :src="`../../../static/img/daliy-${pageData.FINISHE_RATIO<0?'down':'up'}.svg`" alt=""> + <span :class="{active:pageData.FINISHE_RATIO<0}" class="num" v-html="` ${handleData(pageData.FINISHE_RATIO)}% `"></span> + <span style="font-size: 12px;">杈冧笂{{type}}</span> + </div> </div> </el-col> <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;"> - <div class="inspection-card inspection-head"> - <div class="inspection-head-left"> - <h4>鏈瑊{type}}椤圭洰鍓╀綑</h4> - <span >{{ pageData.SURPLUS }}</span> - <div class="inspection-head-left-info"> - <img :src="`../../../static/img/daliy-${pageData.SURPLUS_RATIO<0?'down':'up'}.svg`" alt=""> - <span :class="{active:pageData.SURPLUS_RATIO<0}" class="num" v-html="` ${handleData(pageData.SURPLUS_RATIO)}% `"></span> - <span style="font-size: 12px;">杈冧笂{{type}}</span> + <div class="inspection-card"> + <div class="inspection-head"> + <div class="inspection-head-left"> + <h4>鏈瑊{type}}椤圭洰鍓╀綑</h4> + <span >{{ pageData.SURPLUS }}</span> </div> + <img src="../../../static/img/daliy-2.svg" alt="" srcset=""> </div> - <img src="../../../static/img/daliy-2.svg" alt="" srcset=""> + <div class="inspection-head-left-info"> + <img :src="`../../../static/img/daliy-${pageData.SURPLUS_RATIO<0?'down':'up'}.svg`" alt=""> + <span :class="{active:pageData.SURPLUS_RATIO<0}" class="num" v-html="` ${handleData(pageData.SURPLUS_RATIO)}% `"></span> + <span style="font-size: 12px;">杈冧笂{{type}}</span> + </div> </div> </el-col> <el-col :xs="12" :sm="8" :md="6" :lg="4" :xl="4" style="margin-bottom: 16px;"> @@ -258,7 +264,11 @@ this.pageData = this.HaveJson(res.data) let xData = res.data.DAYS.map(m=>{ let arr = m.split('-') - return `${arr[1]}-${arr[2]}` + if(this.type=='骞�'){ + return `${arr[1]}鏈坄 + }else{ + return `${arr[1]}-${arr[2]}` + } }) this.chartData0.xData = xData this.chartData1.xData = xData @@ -300,10 +310,10 @@ case '鏈�': const year = new Date(this.time.month).getFullYear(); const month = new Date(this.time.month).getMonth(); - + const day = new Date(year, month + 1, 0).getDate(); // // 璁剧疆璧峰鏃ユ湡鍜岀粨鏉熸棩鏈� - this.startTime = new Date(year, month, 1).toISOString().slice(0, 10); // 鏈堝垵 - this.endTime = new Date(year, month + 1, 0).toISOString().slice(0, 10); // 鏈堟湯 + this.startTime = `${year}-${month + 1}-01` + this.endTime = `${year}-${month + 1}-${day}` // 鏈堟湯 break; case '骞�': const year0 = new Date(this.time.year).getFullYear(); @@ -314,6 +324,7 @@ }else{ this.startTime = getYearAndMonthAndDays(new Date((new Date).getTime() - 24 * 60 * 60 * 1000)) this.endTime = getYearAndMonthAndDays(new Date((new Date).getTime() + 24 * 60 * 60 * 1000 * 5)) + this.time.week = new Date() } this.init() } @@ -339,11 +350,11 @@ background: #FFFFFF; border-radius: 14px; box-shadow: 6px 6px 54px 0px rgba(0,0,0,0.05); + padding: 16px; + box-sizing: border-box; } .inspection-head{ - padding: 16px; - box-sizing: border-box; display: flex; justify-content: space-between; align-items: flex-start; @@ -360,23 +371,23 @@ .inspection-head-left>span{ font-family: Nunito Sans-Bold;color: #202224; font-weight: bold; - font-size: 28px; + font-size: 24px; display: inline-block; - margin-bottom: 16px; + margin-bottom: 18px; } - .inspection-head-left .inspection-head-left-info{ + .inspection-head-left-info{ display: flex; align-items: center; font-size: 16px; color: #202224; } - .inspection-head-left .inspection-head-left-info .num{ + .num{ color: #00B69B; } - .inspection-head-left .inspection-head-left-info .num.active{ + .num.active{ color: #F93C65; } -- Gitblit v1.9.3