From e2dc0cb89db56e9715de2d96b489f3502cb61ba4 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 19 Nov 2025 13:15:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96zzy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/monitor/iframe.html | 2 +- src/assets/images/camera.png | Bin 0 -> 1127 bytes src/assets/images/grad.png | Bin 0 -> 188 bytes src/assets/images/grad16.png | Bin 0 -> 745 bytes src/assets/images/grad4.png | Bin 0 -> 295 bytes src/assets/images/grad9.png | Bin 0 -> 605 bytes src/assets/images/playVideo.png | Bin 0 -> 1855 bytes src/assets/images/switchWindow.png | Bin 0 -> 602 bytes src/components/TopNav/index.vue | 16 +- src/main.js | 2 + src/utils/bonus.js | 7 + .../account/accountManager/index.vue | 26 +- .../account/tradeRecords/index.vue | 6 +- .../accountCenter/account/wallet/index.vue | 22 +- .../account/wallet/outRecord.vue | 6 +- .../account/wallet/rechargeRecord.vue | 6 +- .../accountCenter/account/wallet/record.vue | 12 +- .../accountCenter/butie/butie/index.vue | 54 +- .../butie/butieRecordsTab/index.vue | 12 +- .../canteen/base/mobile/complaint/index.vue | 6 +- src/views/canteen/dish/menu/index.vue | 3 +- .../healthCenter/examinationReport/index.vue | 6 +- .../healthCenter/healthRecords/indexOld.vue | 6 +- .../canteen/order/offlineManagement/index.vue | 6 +- .../canteen/order/reserveManagement/index.vue | 6 +- .../canteen/reportCenter/accountSum/index.vue | 26 +- .../inComeSum/psnPaymentSum/index.vue | 6 +- .../reportCenter/rechargeSumByAcc/index.vue | 6 +- .../reportCenter/tradeSumByCanteen/index.vue | 10 +- .../reportCenter/tradeSumByDishes/index.vue | 8 +- .../reportCenter/tradeSumByMachine/index.vue | 30 +- .../reportCenter/tradeSumByPersonal/index.vue | 10 +- .../reportCenter/tradedDetail/index.vue | 11 +- .../canteen/superstore/orderShenhe/index.vue | 6 +- .../canteen/superstore/superOrder/index.vue | 12 +- src/views/energySaving/index.vue | 963 +++++++----------- src/views/foodManage/index.vue | 4 +- .../pickManage/materialPicking/detail.vue | 12 +- .../pickManage/materialPicking/edit.vue | 13 +- .../purchaseManage/contractList/detail.vue | 5 +- .../purchaseManage/contractList/edit.vue | 16 +- .../purchaseManage/contractList/index.vue | 2 +- .../goodsInquiry/checkPrice.vue | 7 +- .../purchaseManage/goodsInquiry/detail.vue | 17 +- .../purchaseManage/goodsInquiry/edit.vue | 43 +- .../purchaseManage/goodsInquiry/index.vue | 8 +- .../purchaseManage/materialBidPrice/index.vue | 12 +- .../purchaseManage/productionPlan/index.vue | 5 +- .../purchaseInspection/detail.vue | 9 +- .../purchaseInspection/edit.vue | 14 +- .../purchaseInspection/index.vue | 12 +- .../purchaseManage/purchaseOrder/detail.vue | 9 +- .../purchaseManage/purchaseOrder/edit.vue | 25 +- .../purchaseManage/purchaseOrder/index.vue | 16 +- .../purchaseManage/purchasePlan/detail.vue | 13 +- .../purchaseManage/purchasePlan/edit.vue | 14 +- .../purchaseManage/purchasePlan/index.vue | 6 +- .../correlationReport/index.vue | 24 +- .../procurePlanReport/index.vue | 17 +- .../returnManage/materialReturn/detail.vue | 5 +- .../returnManage/materialReturn/edit.vue | 5 +- .../stockManage/depotManage/index.vue | 27 +- .../stockManage/depotManage/materialStock.vue | 8 +- .../stockManage/goodsTransfer/detail.vue | 7 +- .../stockManage/totalStock/index.vue | 14 +- .../stockManage/warehouseIn/detail.vue | 5 +- .../stockManage/warehouseIn/edit.vue | 16 +- .../stockManage/warehouseOut/detail.vue | 5 +- .../stockManage/warehouseOut/edit.vue | 12 +- .../stockReport/expiredWarning/index.vue | 8 +- .../stockReport/inoutDetails/index.vue | 28 +- .../stockReport/stockWarning/index.vue | 8 +- .../supplierQuotation/detail.vue | 24 +- .../supplierQuotation/edit.vue | 17 +- .../supplierQuotation/index.vue | 26 +- .../supplierManage/goodsSupplier/index.vue | 25 +- .../supplierManage/supplierList/index.vue | 22 +- .../supplierQualification/index.vue | 6 +- .../supplierManage/supplyStatistics/index.vue | 14 +- src/views/ims/person_setting/index.vue | 10 +- src/views/ims/supplier_person/index.vue | 8 +- .../devicesManage/deviesRecord/index.vue | 20 +- .../environment/videoMonitoring/history.vue | 33 +- .../environment/videoMonitoring/index.vue | 67 +- .../kitchen/foodSafety/sampleManage/index.vue | 12 +- .../kitchen/foodSafety/sampleRecord/index.vue | 28 +- src/views/kitchen/index.vue | 2 +- .../kitchen/staffManage/intoRecords/index.vue | 18 +- .../staffManage/morningCheck/index.vue | 10 +- src/views/kitchen/staffManage/staff/index.vue | 6 +- src/views/login1.vue | 4 +- src/views/system/role/authUser.vue | 6 +- src/views/system/role/selectUser.vue | 6 +- src/views/system/user/index.vue | 17 +- vue.config.js | 3 +- 95 files changed, 1199 insertions(+), 928 deletions(-) create mode 100644 src/assets/images/camera.png create mode 100644 src/assets/images/grad.png create mode 100644 src/assets/images/grad16.png create mode 100644 src/assets/images/grad4.png create mode 100644 src/assets/images/grad9.png create mode 100644 src/assets/images/playVideo.png create mode 100644 src/assets/images/switchWindow.png diff --git a/public/monitor/iframe.html b/public/monitor/iframe.html index 6975780e..fe0928cc 100644 --- a/public/monitor/iframe.html +++ b/public/monitor/iframe.html @@ -17,7 +17,7 @@ html, body { } .plugin { width: 1300px; - height: 680px; + height: 650px; } .vpopmenu{ position: absolute; diff --git a/src/assets/images/camera.png b/src/assets/images/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..faaab19afc142e6b1bb6553e96f272a3476eee6a GIT binary patch literal 1127 zcmV-t1ep7YP)}=-7-^9CQ4vY{ryt4AbxR2LhdOsMfxA*Mq-ezX!I)nSDL?1xZdl?pX`W;nUQ%K0V^~5ydW$WY21l!WZ*3;Sah^AH@3EM zQ0vwj0`c7FJs`Ea#p$a^>#sUpZ#X{u+wCpRnHE+6R>wf~k zAFWJiA?60DpS{K4g#?ODa+f3=0D~A9mQ8e+Vl<*P zKM2qvw5bX90tUSj1ed=|WW9~58n@^y+rcpvXW$eFU9vGx#T0Guo#a{~GHW~%$e`sG@%RrJJ^BsGi9N82>Jp$k-Sr+Hgzc>lfD=p)klVFHe$x)Hwd({~S6o6I;QV3b;+vywP{Ilzii+D`wu)jn41uV{XH+51rF zBF0{Tdo}n+CUk4kW|@Sb9+D*M{FMD@Wk&5&d=-Pd4b@8W&QjWT|K4VwuS7&Y{TJ+C zi)p)$34IdfnaUBX&j5PKm$$y)*ar~NLIM%~8JSBddvAIE!X6?#ZNzty8=3*Mm4He1 z*XG;&V#@x+h|!x#+X*yFSnr=AaH8HZSGpmvUv}}Pxk^}{NBNHZq}j#wj=9oJ1+HnX tX5jw;00960H-Xx300006Nklz7B2t*002ovPDHLkV1lfL5M2NO literal 0 HcmV?d00001 diff --git a/src/assets/images/grad.png b/src/assets/images/grad.png new file mode 100644 index 0000000000000000000000000000000000000000..7633f54b1849dcdf0ce3d280982799ecafe3a9a8 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJLQfaRkP5~((;T@P40u?sifh&# z*te(7;fwpNVj&I>XYZMZFMOnJTgTqAFbJ?+tBs> zXDCAg1GB^d1~!8RMxKNNMg_m(Pu`ba70qb#eX7^91uC8E7@jzNv9W7N|G><^@c;kJ i`>cLI%h^DdGc$B@Bsta@>~;Z)FnGH9xvXNkl#e+c9tf>*(dS8uxk45RFxV1VZo;Q$5ak z-OSDweX$A2j^c9yoEFt{^cTRSWZ7kkzX%SyPZ!LN5qlEbnLyB3CGg6dnTww9@yp5l zFvYPKW~11>b#tndB%gp74;+Tt_6qo$5s2<&Jiio=OLa>ZpgK|=4wK?>iM3!N%_`)9 zSvJD@Zk56v%6O4gG~YX&!>l|Wd(Q~?{#^tDpCyD9_JU>b5^f&btb;va-TNMx&B48J zyP2(c@5of=(Q^9|Iv>ENzAZ&Ugv=aq6<2 z()I}lUiI{cKWS*cZu#ZRug@oB|8z0dE#*(Y!^A2#FZkBNbg^p(9D*%gH!K8@3G zE|6C>Q-C>>muJazPQwY;4m7-wxj(JZ3uLg~M4;S+_i0hhESFBVNZhz8aHjsY*d%$N m_x}H%!{Kxc$Y2BclbKySHY{Wtkv@kE=GbGR81Ef(9EyPB!O2o=8A&I28 zB8`?JHU{#~?_17g)thjQq`5G2H<|g(+_1Mdta4q~DHI9~Ngc;INmxH{S5S#Rx6lN0 z=di5dsbn(wh$K%^rBod;Ew1a{!8m|Q{1F~lMO;geE3w{eHmfU;tI$Y-W|ty?5h2ve zvVn;B|6p+g@d|JSn)9|7c52UxKUlV8ntI56lAyrfRH;;IAAib{;#=N9OiQ=hv%$ixa+r#XTKQjvL?#_*e;1Fiu~s;E$nX`HczQjBZTEfeC~gO@%47j#y1njMGiT zw17Q^@tfs%rqX}f>2$8aXqikV9K-b6`pwo*ugn!lz^F>fajL5Ymk^GHsH|}oVEV>f zfhWsG5~@@xt>7T(Nm?ux*L1buB60NN(CP%3zUA}zEd7$^a=B$S9*=K8Hzb`-r}v0y zK_PZ6vV8wwcna2hI-S0RA@Z3_=9aI(Bmn*+*hsGB+_r4VH1&|XAwhxPV*`P`m|NUH zyaHT-x2W3>yZSRK8-+u?fx=}AFi*0fiaAh0Tni4JyD&IvLs`TwIQekb!dw^<+r-?c rd;tIe|Nq7=zIy-w00v1!K~w_(J*t%r5=)Ur00000NkvXXu0mjfGMg7G literal 0 HcmV?d00001 diff --git a/src/assets/images/playVideo.png b/src/assets/images/playVideo.png new file mode 100644 index 0000000000000000000000000000000000000000..926b8c1d3c9f3df07557ae111638f6f70d15784d GIT binary patch literal 1855 zcmV-F2f+A=P)Y_(>0LlG;er4?H01H{@y@Kq5-5VbM0t)hZhL0Sc0R4CN! zEPdENzAdQqAtIF)><_CgXzLHNlc-Gv#b$St>W`9k=XlP{&g`A+ZnCeW6ddN$u1{OtYEd2yhD^J_HEQBj7#; zb<#+tUyf`W6g#N*s0)A;ZdmDU4$x69_;r-xYOi1cAij!u=Q!VlJ#+g8I|Ij<1HBk0hw^OwwOrxw*ld9|2;x>#=_K#JW)nSzsVLbrp|9VluLY68H; ze+%OZ=Ysa~Pv=q9GGkuWjIPKgIydEdV;^MJ#gCkMVtzK)(=nP`-*F;m#`m*6l`&&x z){M0Qz#69AOz!E7wY=*JH8xcPFf98d04|5ZA%zpF?u;3`JJTC`Z@A~`KMP$|F$S@l zX^n&D7c$3@XBUq6j*(QlYi^%?gMU2{uL=Mc&!Y?r{6IvoK?=|HcI@+Y_41M4MZfF5 zoaO(Vd);8;0P1VaedEK00L-z{*Ra7-ChsIV;0d+1*vZpjiZ^M8B7OaL)#|O=7yf_$ zxHw(NnHiXF~uhQK|h#%Kjv})t*^r7w~{0aeH;-A&u z?S1{X*A$It$hT)OSNO8<5CDFv3IM1)4TwRri2yDqr4BHVLsiGlw*&zACR82)pyH16 z+^kERJ_35d3}mHY$zDs>R*)}&003J|Faq4`pE%}l4*zP3ID)oNRnFn$TlHUxqg(17 zz)N<3bOxN0DHW#fpv^7LSjoy-E?=k?42=ea0T2cN9H1!yfI$0*)QYSbf8liE+JDOx zJYE;7MXOQlLI5~;0Dyl#O$ESzzCl1-n=#|vxkSgL`+OwMAUJVXHiE~q<_ z8tn3VCT_FxLd%TZnoGpi%RYW$>*{(Xx76TU>$Um15&*;Qvo8ftVTy{6m%h_<@o;Y1 z?$s8~UIIY66%-#MeSCSjn;9~}V z1o z+}@X7D*G5Akt3`#Quao%5nBLfm**={e4_1M4*z;`UK0Qb$0O0B+&9%>AkqgwOF&+1 z5xh?dziS;kn-LNjSqB80TpJjF&~}L_vB&pJcC98eDAzyCtFtTF)cE zz7j)XNz7UUh`o}gUXr9)-UIQlFUtdU@E`GM{9aDwB?*T_+DW!x`)Vk5TV zBfb)Y?dm=o0-$FdHRHc#%=kMQ_bViSpy-V)<|5l%a^+~3^ofnw>b{N0O#{$K5smm> t^Z@_yoh#-QpVq;_Lt+Y}fKoG3dBtVm+-b#udRvDTC#O(AT5Wf;nT>7k2K(-q_ zOWjpVcUDaS0Qit|TQEihoN_D4x-&Ed$XlZ;2(V3vdwvNBE>y8VG+bG`i>3hbo}883 zFRUeY{1QX7WgU*>ABVG2Ba7K7(xLv7)Qpr4FX^EQ^qM^r@G|iGdI%6E&|wF{SE$1V zcKmoRCD3uRx?&I}(3Q5fVHzgTMzgwdtN97=63pt5YOfA2>7o3*W>XUwQDBTk;8BMv zhMN79?_aa22~>DY1^7|~MgkD9BNyP8r7kGfeYWy1`d;$@cbL)w{y6VMA-~mL9kXs#lliT}p z-6$gf8jG$yHy=QL`RS1AiViR7q5QmNR@_KFX_p31ufo-J^IsuFV(J_w;CFJyC-4gZ o0RR6{owRrW000I_L_t&o06#WAj%*U1pa1{>07*qoM6N<$f(a}Jr2qf` literal 0 HcmV?d00001 diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index d649b0e9..f274c9da 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue b/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue index 207ba811..417feecc 100644 --- a/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue +++ b/src/views/foodManage/purchaseManage/purchaseInspection/detail.vue @@ -67,11 +67,12 @@ - - + / + + + + + + - + + + diff --git a/src/views/foodManage/purchaseManage/purchasePlan/detail.vue b/src/views/foodManage/purchaseManage/purchasePlan/detail.vue index 36452ec6..c82364ac 100644 --- a/src/views/foodManage/purchaseManage/purchasePlan/detail.vue +++ b/src/views/foodManage/purchaseManage/purchasePlan/detail.vue @@ -15,21 +15,21 @@ {{ baseInfo.createBy }} - + + @@ -83,10 +83,11 @@ - + / + @@ -459,7 +461,7 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(item.unitPrice==0 || item.purchaseNum==0){ + if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) @@ -522,7 +524,7 @@ export default { this.noMaterial = false; if(this.materialList.length>0){ this.materialList.forEach(item=>{ - if(item.unitPrice==0 || item.purchaseNum==0){ + if(Number((item.unitPrice*item.purchaseNum).toFixed(2))==0){ this.noMaterial = true }else{ let obj = Object.assign({}, item) diff --git a/src/views/foodManage/purchaseManage/purchasePlan/index.vue b/src/views/foodManage/purchaseManage/purchasePlan/index.vue index d18b19bb..6391c290 100644 --- a/src/views/foodManage/purchaseManage/purchasePlan/index.vue +++ b/src/views/foodManage/purchaseManage/purchasePlan/index.vue @@ -95,7 +95,11 @@ 是 - + + + diff --git a/src/views/foodManage/purchaseReport/correlationReport/index.vue b/src/views/foodManage/purchaseReport/correlationReport/index.vue index 0c36e92c..5c3f06d6 100644 --- a/src/views/foodManage/purchaseReport/correlationReport/index.vue +++ b/src/views/foodManage/purchaseReport/correlationReport/index.vue @@ -83,7 +83,11 @@ 是 - + + + @@ -111,19 +115,29 @@ {{(queryParams3.pageNum - 1) * queryParams3.pageSize + scope.$index + 1}} - + + + diff --git a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue index 2edab2d7..691d3e1f 100644 --- a/src/views/foodManage/purchaseReport/procurePlanReport/index.vue +++ b/src/views/foodManage/purchaseReport/procurePlanReport/index.vue @@ -39,19 +39,20 @@ - - + + - + / + - - - + + + - + - + / + diff --git a/src/views/foodManage/returnManage/materialReturn/edit.vue b/src/views/foodManage/returnManage/materialReturn/edit.vue index 8658ddcc..7a61fe67 100644 --- a/src/views/foodManage/returnManage/materialReturn/edit.vue +++ b/src/views/foodManage/returnManage/materialReturn/edit.vue @@ -66,10 +66,11 @@ - + / + diff --git a/src/views/foodManage/stockManage/depotManage/index.vue b/src/views/foodManage/stockManage/depotManage/index.vue index 6c168877..8dd7b77a 100644 --- a/src/views/foodManage/stockManage/depotManage/index.vue +++ b/src/views/foodManage/stockManage/depotManage/index.vue @@ -61,20 +61,35 @@ - - - + + + + + + + + + + + diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue index 4f155717..29e046c0 100644 --- a/src/views/foodManage/stockManage/totalStock/index.vue +++ b/src/views/foodManage/stockManage/totalStock/index.vue @@ -67,10 +67,16 @@ - - - - + + + + + + + / + diff --git a/src/views/foodManage/stockManage/warehouseIn/edit.vue b/src/views/foodManage/stockManage/warehouseIn/edit.vue index 6cd98005..46770f83 100644 --- a/src/views/foodManage/stockManage/warehouseIn/edit.vue +++ b/src/views/foodManage/stockManage/warehouseIn/edit.vue @@ -65,8 +65,13 @@ - - + + + - + / + + - + + - + @@ -190,6 +191,15 @@ export default { //查询 getGoodsInquiryDetailInfoApi(param).then((response) => { this.baseInfo = this.supplierQuotationData; + //是否在报价时间段判断 + let start = new Date(this.supplierQuotationData.startTime).getTime() + let end = new Date(this.supplierQuotationData.endTime).getTime() + let now = new Date().getTime() + if(now>start&&now - + + + - + @@ -147,11 +153,12 @@ - - + / + + - - + + + + + + diff --git a/src/views/kitchen/foodSafety/sampleRecord/index.vue b/src/views/kitchen/foodSafety/sampleRecord/index.vue index 2931871e..8743b24c 100644 --- a/src/views/kitchen/foodSafety/sampleRecord/index.vue +++ b/src/views/kitchen/foodSafety/sampleRecord/index.vue @@ -9,8 +9,8 @@ - - + + @@ -32,11 +32,27 @@ - - + + + + + + - - + + + + + + - + + @@ -241,12 +244,17 @@ export default { "pageNum":this.queryParams.pageNum, "pageSize":this.queryParams.pageSize, "articleTitle":this.queryParams.articleTitle, - "deptIds":this.queryParams.deptIdList.join(",")||"", - "startDate":this.formatDate(this.dateRange[0]), + "deptIds":this.queryParams.deptIdList.join(",")||"", "areaId":this.queryParams.areaId, "canteenId":this.queryParams.canteenId, - "subPlaceId":this.queryParams.subPlaceId, - "endDate":this.formatDate(this.dateRange[1]) + "subPlaceId":this.queryParams.subPlaceId, + } + if(this.dateRange&&this.dateRange.length>0){ + param.startDate=this.formatDate(this.dateRange[0]) + param.endDate=this.formatDate(this.dateRange[1]) + }else{ + param.startDate=undefined; + param.endDate=undefined; } console.log("param",param); getIntoRecordsListApi(param).then(response => { diff --git a/src/views/kitchen/staffManage/morningCheck/index.vue b/src/views/kitchen/staffManage/morningCheck/index.vue index e75bc561..17d71b2b 100644 --- a/src/views/kitchen/staffManage/morningCheck/index.vue +++ b/src/views/kitchen/staffManage/morningCheck/index.vue @@ -31,14 +31,18 @@ - + + + - +