From 8d168957190d8801c39715099265c2472af7285c Mon Sep 17 00:00:00 2001 From: 17792275749 <812100002@qq.com> Date: Fri, 6 Feb 2026 13:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1=E5=87=BA=E9=A4=90=20=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../danger_name_icon.png | Bin 0 -> 975 bytes .../warning_name_icon.png | Bin 0 -> 941 bytes .../mealSurplusInformation.vue | 110 +++++++++++++----- 3 files changed, 81 insertions(+), 29 deletions(-) create mode 100644 src/assets/images/mealSurplusInformation/danger_name_icon.png create mode 100644 src/assets/images/mealSurplusInformation/warning_name_icon.png diff --git a/src/assets/images/mealSurplusInformation/danger_name_icon.png b/src/assets/images/mealSurplusInformation/danger_name_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..16330d3e7cf7674c30fdd3c0527f46d1b63db6f9 GIT binary patch literal 975 zcmV;=12FuFP)Px&iAh93R9Hvtms@BYWfaGMXEtiLLGqB)7DUk|Ef&=7Y%K+~r0r7?Yzf}_BDCGv zeN!lil%|S86-20t;KS|=c!8n_DpaH(#Tu;Ehh~RbA*7MU)+h}PVQrdi+Q}Su)?{7d zUS_k41o1qd%kP}?egAJpSRy7%goCC)bno6I*_5@dEI3rJNO4qn7mw zZ~*WT*(sUK=T!^r+4CTV(Mcq7T+-?3s(y*Yiv{5M)jcM*{YklRHIPSuqkw_x?-<5L z$z+BXyMIk29!2D{Vm`>B`hYmjNL`S?K`pBvI5g+HOKkh2CO}?C>QGJKW$>(Ks^ja98hCp=v`aTTfLqu+#xN(C|FHi9O zl`D+R%+MWO#@jtT3u}IZ=WUlWXRg+R5ly8!fDTEgFVu3@SS*HNd^>FQw!NEWdil)irT73UiL>>lK0;fci$!S!hWyJf$w%;u8Kuxn3 zkrO%3BQboAso7cjx;ja%T2&O)x~4iH*=%nK#Il|R-YSc`7EELtB7La#qPiNx*d&?E zkADM+#}5~TXy1|Xao)c)&OOm6hr3r}gn=lIKz;K0+hk~HVosyh6}E7^xCPa35jh&7 z9ng3@2-= z%tRU=Ls>*CC-Of?Ns>+TaiFWIiKreE*Bxz2N16f%8C?5Qv8U%2qS3V&Mq9{ywcUK* zBcC6Zk&&5&j-%p2{Q;)`aa6Io{!IV?002ovPDHLkV1iqn)n@Px&XGugsR9HvV)>~*4R~!cL@0;Dt>?VyjYN-$nNK}ZZPa>!gA<)}Hsp87+WY(Y* z6nv0^4_bQT=Hapo7gH4~b4{Ae;7UGjv@QT!^cuUe~GOnAQzif1iCc86d zw;M?3^?c`>A7^IH9Ab)GoFWeV{~*%#Wvvsc{+iULtE?h{r~2&&N4TeFR57m-14fdu zm4x<*TKY{&W9Eczc3oDPqx@)`WNeM5X-#exeL=c6MkUl2*4$?pu5mDPfEdnHr-Pvn z#SP7+CJP0e1Gqhr#Ic@=LZs7}iC0y^O+O8eSnKKnh^zwK29WyLjYQIbb}I|#T($X2 zpB#_QdhU#JT5I>SibAgLiB`>T2$+DjmB4bZauHkzKn{mSYAtU0F;g)}CK+3k1&@MU zs8ae)=DLWxRps&cz9UXYd>6^@L1-l+^6{)dzKfXley{nS5XXw|Be=6nzL$vc^K=nXs9v@_RJd+#g&8a{9z6 z&lpKGulsCbM&O1MsrNpHi7%^V3;>v+0_pwzFAVh$mb@Ya26Qtu%kLfO_4~W#3(DBg z-tHyn)y>ojzt8s|i0vvXQhr7bhE4k$?-l8YH&LU~sj6Iv5KWPm)E}M@0hqRo+&Ob` zxi|8hCvrtk*h>kBCnPtRPQ||xm)(;Ap~zZ2VgEY5yXZ0Cr4{c2xW1AY5?y*rYD1yU zqLBWh(djicp+5y!QX$M`9b8SbbEqUpF8rcB`f)H6{0-o;|AY~_s0Z*V4f|2C9^W&o z9FKnRDjhl`#Kv+k6m(SSnQh$A^}=huFC;(Nv0}{{xL3fHDj*R#56bR{dF+fzUKx@v zOaB~SiXhhtunK}j0LHdz5%g2Tbpq!wD&2akeMtq7&y)-)rM#5vl!3ek@kc8%_uokN P00000NkvXXu0mjf;v2l5 literal 0 HcmV?d00001 diff --git a/src/views/mealSurplusInformation/mealSurplusInformation.vue b/src/views/mealSurplusInformation/mealSurplusInformation.vue index 44031b3..3c9f0ef 100644 --- a/src/views/mealSurplusInformation/mealSurplusInformation.vue +++ b/src/views/mealSurplusInformation/mealSurplusInformation.vue @@ -12,6 +12,7 @@
{{ item.foodName }}
+
当前余量 @@ -25,16 +26,30 @@
@@ -177,6 +192,7 @@ export default { if (item.marginWeight < item.dangerWeight) { item.class = "danger"; } + item.foodWeight_kg = Math.round(item.foodWeight / 10) / 100; item.marginWeight_kg = Math.round(item.marginWeight / 10) / 100; item.progress = (1 - item.marginWeight / item.foodWeight) * 100 + '%'; }); @@ -296,6 +312,14 @@ export default { line-height: 24px; font-size: 20px; } + + > div:nth-of-type(3) { + width: 24px; + height: 24px; + background-repeat: no-repeat; + background-position: left bottom; + background-size: contain; + } } .content_l_list_margin { @@ -313,28 +337,39 @@ export default { } .content_l_list_status { - width: 200px; + width: 100%; height: 36px; - display: flex; - flex-wrap: nowrap; - justify-content: center; - align-items: center; - border-radius: 6px; - margin: 0 auto 16px; + margin-bottom: 16px; - .content_l_list_status_icon { - width: 20px; - height: 20px; - background-repeat: no-repeat; - background-position: center; - background-size: contain; - margin-right: 10px; - } + .content_l_list_status_ { + height: 36px; + display: flex; + flex-wrap: nowrap; + justify-content: center; + align-items: center; + border-radius: 6px; + margin: 0 auto; - .content_l_list_status_text { - height: 16px; - font-size: 16px; - line-height: 16px; + .content_l_list_status_icon { + width: 20px; + height: 20px; + background-repeat: no-repeat; + background-position: center; + background-size: contain; + margin-right: 10px; + } + + .content_l_list_status_text { + height: 16px; + font-size: 16px; + line-height: 16px; + } + + .content_l_list_status_value { + height: 14px; + font-size: 14px; + line-height: 14px; + } } } @@ -362,6 +397,8 @@ export default { > div:nth-of-type(2) { color: #FFFFFF; } + + .content_l_list_name_normal {} } .content_l_list_margin { @@ -372,10 +409,16 @@ export default { } } - .content_l_list_status { + .content_l_list_status_ { .content_l_list_status_text { + flex: 1; color: #869CC5; } + + .content_l_list_status_value { + color: #869CC5; + font-weight: bold; + } } .content_l_list_progress { @@ -399,6 +442,10 @@ export default { > div:nth-of-type(2) { color: #F6BD9E; } + + .content_l_list_name_warning { + background-image: url("@/assets/images/mealSurplusInformation/warning_name_icon.png"); + } } .content_l_list_margin { @@ -409,7 +456,8 @@ export default { } } - .content_l_list_status { + .content_l_list_status_ { + width: 200px; background-color: #5A2F00; .content_l_list_status_icon { @@ -442,6 +490,10 @@ export default { > div:nth-of-type(2) { color: #FFC8C8; } + + .content_l_list_name_danger { + background-image: url("@/assets/images/mealSurplusInformation/danger_name_icon.png"); + } } .content_l_list_margin { @@ -452,7 +504,8 @@ export default { } } - .content_l_list_status { + .content_l_list_status_ { + width: 200px; background-color: #5A0A0A; .content_l_list_status_icon { @@ -519,7 +572,6 @@ export default { .content_r_content_table { width: 100%; - height: 50%; display: flex; flex-flow: column;