From dd0d818353b30a4d0440ef82c54df0acdce10c65 Mon Sep 17 00:00:00 2001 From: sunshine <1467939124@qq.com> Date: Thu, 8 Aug 2024 15:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E6=BA=90=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/application.js | 54 +++++ src/api/mes/product.js | 1 - src/page_report/reportForm.vue | 1 - src/pages.json | 57 +++++- .../components/deskArrangement.vue | 25 +++ .../components/energyEquipment.vue | 188 ++++++++++++++++++ .../components/energyEquipmentDetail.vue | 132 ++++++++++++ .../components/energyEquipmentForm.vue | 114 +++++++++++ .../components/energyEquipmentFormReset.vue | 89 +++++++++ src/pages/application/index.vue | 119 +++++++++++ src/pages/login.vue | 2 +- src/pages/{index.vue => plan.vue} | 0 src/static/images/icon/arrangement.png | Bin 0 -> 1311 bytes src/static/images/icon/energy.png | Bin 0 -> 1194 bytes src/static/images/tabbar/app.png | Bin 0 -> 543 bytes src/static/images/tabbar/app_.png | Bin 0 -> 569 bytes 16 files changed, 772 insertions(+), 10 deletions(-) create mode 100644 src/api/mes/application.js create mode 100644 src/pages/application/components/deskArrangement.vue create mode 100644 src/pages/application/components/energyEquipment.vue create mode 100644 src/pages/application/components/energyEquipmentDetail.vue create mode 100644 src/pages/application/components/energyEquipmentForm.vue create mode 100644 src/pages/application/components/energyEquipmentFormReset.vue create mode 100644 src/pages/application/index.vue rename src/pages/{index.vue => plan.vue} (100%) create mode 100644 src/static/images/icon/arrangement.png create mode 100644 src/static/images/icon/energy.png create mode 100644 src/static/images/tabbar/app.png create mode 100644 src/static/images/tabbar/app_.png diff --git a/src/api/mes/application.js b/src/api/mes/application.js new file mode 100644 index 0000000..50a84e8 --- /dev/null +++ b/src/api/mes/application.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + + +// 查询能源设备列表 +export function getEnergyDevice(params) { + return request({ + url: '/admin-api/mes/energy-device/page', + method: 'get', + params: params + }) +} + +// 修改能源设备 +export function updateEnergyDeviceCheckRecord(data) { + return request({ + url: '/admin-api/mes/energy-device/update', + method: 'put', + data: data + }) +} + +// 删除能源设备 +export function deleteEnergyDevice(id) { + return request({ + url: '/admin-api/mes/energy-device/delete?id='+id, + method: 'delete' + }) +} + +// 查询抄表记录 +export function getEnergyDeviceCheckRecord(params) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/page', + method: 'get', + params + }) +} + +// 新增抄表记录 +export function createEnergyDeviceCheckRecord(data) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/create', + method: 'post', + data: data + }) +} + +// 删除抄表记录 +export function deleteEnergyDeviceCheckRecordById(id) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/delete?id='+id, + method: 'delete' + }) +} diff --git a/src/api/mes/product.js b/src/api/mes/product.js index b12af00..a6093ee 100644 --- a/src/api/mes/product.js +++ b/src/api/mes/product.js @@ -1,4 +1,3 @@ - import request from '@/utils/request' diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue index 390df6e..1b80699 100644 --- a/src/page_report/reportForm.vue +++ b/src/page_report/reportForm.vue @@ -331,7 +331,6 @@ export default { } .u-button { height: 35px; - width: auto; } .uni-group-title{ height: 55px; diff --git a/src/pages.json b/src/pages.json index 12cbe5c..45d8db9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -13,16 +13,23 @@ }, "pages": [ { - "path": "pages/index", + "path": "pages/login", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/index", "style": { "navigationStyle": "custom", "enablePullDownRefresh": true } }, { - "path": "pages/login", + "path": "pages/plan", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -32,7 +39,13 @@ "enablePullDownRefresh": true } }, - + { + "path": "pages/report", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, { "path": "pages/mine", "style": { @@ -52,10 +65,34 @@ } }, { - "path": "pages/report", + "path": "pages/application/components/deskArrangement", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipment", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipmentDetail", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": true + "onReachBottomDistance": 50 + } + }, + { + "path": "pages/application/components/energyEquipmentForm", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipmentFormReset", + "style": { + "navigationStyle": "custom" } } ], @@ -292,7 +329,13 @@ "backgroundColor": "#ffffff", "list": [ { - "pagePath": "pages/index", + "pagePath": "pages/application/index", + "iconPath": "static/images/tabbar/app.png", + "selectedIconPath": "static/images/tabbar/app_.png", + "text": "我的应用" + }, + { + "pagePath": "pages/plan", "iconPath": "static/images/tabbar/home.png", "selectedIconPath": "static/images/tabbar/home_.png", "text": "计划" diff --git a/src/pages/application/components/deskArrangement.vue b/src/pages/application/components/deskArrangement.vue new file mode 100644 index 0000000..7f5cff5 --- /dev/null +++ b/src/pages/application/components/deskArrangement.vue @@ -0,0 +1,25 @@ + + + diff --git a/src/pages/application/components/energyEquipment.vue b/src/pages/application/components/energyEquipment.vue new file mode 100644 index 0000000..f29ee1b --- /dev/null +++ b/src/pages/application/components/energyEquipment.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentDetail.vue b/src/pages/application/components/energyEquipmentDetail.vue new file mode 100644 index 0000000..2be117d --- /dev/null +++ b/src/pages/application/components/energyEquipmentDetail.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentForm.vue b/src/pages/application/components/energyEquipmentForm.vue new file mode 100644 index 0000000..9352cb5 --- /dev/null +++ b/src/pages/application/components/energyEquipmentForm.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentFormReset.vue b/src/pages/application/components/energyEquipmentFormReset.vue new file mode 100644 index 0000000..ee25b21 --- /dev/null +++ b/src/pages/application/components/energyEquipmentFormReset.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue new file mode 100644 index 0000000..e9dae8e --- /dev/null +++ b/src/pages/application/index.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/pages/login.vue b/src/pages/login.vue index 3a70b77..16f4ae7 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -95,7 +95,7 @@ function loginSuccess(result) { // 设置用户信息 userStore.getInfo().then(res => { uni.switchTab({ - url: '/pages/index' + url: '/pages/application/index' }); }) } diff --git a/src/pages/index.vue b/src/pages/plan.vue similarity index 100% rename from src/pages/index.vue rename to src/pages/plan.vue diff --git a/src/static/images/icon/arrangement.png b/src/static/images/icon/arrangement.png new file mode 100644 index 0000000000000000000000000000000000000000..191004d5a57d20cbd31a65b458d4d4d9754e1169 GIT binary patch literal 1311 zcmV+)1>pLLP)Px#1am@3R0s$N2z&@+hyVZt$w@>(RA_#WgN#}pRcFZmfF@dNoO?AXqDS) zw$(;3$0Ay|pg*F;Dk%D+V1k0wAKQXvPz+Qi1O*bo{*x_mF@%j-NsYzaG;>6Ew~(oc zGi=Uj%iDeW}C z6bM*$$B2hQ2)HhA6`^01E}i9Mph3p$^p`{pDw=f@!ag=K5(-6A@_2Q4Ni!s34 zq>mw-6`|t$f!^+g7hH>p>IA2LmR7*)np*}iZl<_+*3)qFx+$dqNX z6be2ps=|9>-UW)%nCapH1S&*nT=03`RbFy4VD&@r&St2*A0}qt%oS)p2RCjdOY#yZ zPx$Jj*UW%$(9IaHR>J3dpsECNJy4tn`!+)RE3oRWq{@wDPP3FB(IU&ku+tz_RsfxE zfX9NbF2OgyLGe9M_YACC4V^xyJ(U{m04TvwkP?q%Qv=Q;?7odgeA`9%wA)V~J4hrvKJbQ?~UizCJz;9lsjm!fjH82-Ox!rJK(Axu%Tw zgePW9nVag&NvX8vvP#E{PMNZ-Ahxa~-;|Rn_CyM6Eg+7B#GD^8<^HD^U$3|iUVIpC z1tV=zNP)*~K7XvwY~+_7G0W*p09M@%Z$D|4PTR%Q#{vOMDq2+C4zOz-G`|qL)_X?a z%@gp??d3{L%(4ssShvbN^~dKTai<^Je}UUkqvqvAHvU4UXJO)R_xE460d{!zDX81F zbp2;PLCZOJV=wFbtQ~T)VmEp;?`?6Pdbsk`Wd&y0Y$=WJ>tAb+xY@#$Ca9esg4d77 zw*BNec==ISk>hSDIX2*Vues^UoTb}jrF>o^INAg2*TC_;=81kk2wz`@YjGlR?;pkk z9ok_$RdJq)3!_u;(YMe&2;0`e!5t<6T$ux-H=yfx_^`{F0gh(i{b!B%V|_+QBKB>J zywCN(gZG*s*F6ZEAAs`Jk^161*t@~G0k$W*BpZ7h z50(sU?}5^}40AZ{?_>5^Uua&*!nOh76nV&{0pmB#Qi*2pFL&dGacqFw8MrcGHfyqR zWWcqX#&0KLbSkpZvn(jdOWen8@bf5y?0hE}pElyV-by@Z^_P*EvfIZE3Ly))Zm02~ zv(A0>k5`?w?-_B{9=I+QE!qccaNIRB_}N0}Pqzx!2>q5S4zrKUL6t5`XE})yOt%=v zC_$a&q!nn8F@%nE>v4?G5onMx<35$cX_n)hIn5S;uTFXqTGOk@0YYo|_;o&jsc=BS zmp)bYQ1Gd6ApCjW0DrAaYKYyc*g7Fk2da!|h}{d%j2ER4fqLo& zkiT9ARN0i#+*g`87Rq;;gO?3kPw}1ACCR6`z^Dl3% VpCO!PYFq#S002ovPDHLkV1hkghZg_< literal 0 HcmV?d00001 diff --git a/src/static/images/icon/energy.png b/src/static/images/icon/energy.png new file mode 100644 index 0000000000000000000000000000000000000000..5777596396e73e8c39f7bc21f2a5cfaf07bd69ea GIT binary patch literal 1194 zcmV;b1XcTqP)Px#1am@3R0s$N2z&@+hyVZtR7pfZRA_=k84-rkcc*)Fh>CTAGk( zRtuE~A+>oBi(;W|%tJ#Kggz(~ANr`!2Os)ks31a=3Wb!sloCNu`ydt?0|tZ9o7j+o zXlOo~keCMCl$vag53`%yeBaxh?XLdda(8EE=KRmjnVGY9R`7{-hD#9|QBHu=pzH%m zfRNulHX#PgB8-9#BYcI@BN1=fPh;6u_!r^l$&>Rarw|I$6zdOV9-*5>y(DM7p{=TJ z>VS6D6|*GogS-nASQqJ!C};<+UX<3sxs57p=zv}gSF_ADkZ@-8`9(b(TBOYzS^LR4 z2edO>kII)o*<;b>pGibdO2q3+EnMY*`R3&&xhFosB#t(vj)aqVp5o}A~uBOah2t{KtJ za4E}j=do>4wovAAw8}+j3@pB+7ThQ83R+r#+1vi>3xx=cuE}luHVQ%0$FS$e;z>^o3gZN!iF!q62{R?`Z5n^upAC7kW61mwAhxer}2%kA`lS=(a|&6T&)syVw3 zJW&GskHcRh$&Id}0Sb0QC?8(^98P}=1?ARE+6|%FR&YY_TW3n4CO5sx*Wu~Cu&WlL z6IM*x8-dUcsCo+?%)p;FlI3GP#)0u(*jWzqf0&%d681)5|8X-($33%zf(fO$5#wCL zhk!uu1&IA)&8$5K7N*R-qQP7MKYe5zc<~$*R+`Y78MI~+Y&tO62j8?Aq2&!w`5OE^ z0lVs;=8OrQUp}>FE`i-iJTqvnqJ!rBgPCOL{P2O*&`Dr_9{@910S=uqBQki|TJE!! z3^`C??g!sA6WP0*5i^h}2NoCNFXF3?#xi0C%p8be<2OMny%(Um*-Y%Yb*p*UNzuJZ$gi#lC7~~~i4Q6kfG+@us zjr09<8M_s5wbEhHtKriu%k@Bpa^b-ifTPVWN>BVu%Ky{346W&bQ07s39Eo_-2;JG% z6BwaeBHpyw2Nv}b5Y4WlKt$u3%|>R9GPNVSnu4GmiR0JgPVDMMP%mqme50PxYFKeV zS_kKFXaOd(qRStXIJBgm8L!HPq|F;a^d!0IggItib5^`AnUjduhoeoo6;A5mXw%v= zV%Q`bl{Rk#SC4_Vlik%R3fhjV$2K~phyU}RJ=XP^qkp&g7Z+o19uPPtx&QzG07*qo IM6N<$g1sd^Q2+n{ literal 0 HcmV?d00001 diff --git a/src/static/images/tabbar/app.png b/src/static/images/tabbar/app.png new file mode 100644 index 0000000000000000000000000000000000000000..c740126dd8199873b6b141376b85ab6a58c9c93a GIT binary patch literal 543 zcmV+)0^t3LP)Px#1am@3R0s$N2z&@+hyVZq$w@>(R7i>4l|4@zK@f)DnY)$GvP3}xMHF*7xwk0k zT+t$>K=}_8lo5Y`G89NO)JRcE1g(qY2e{^BudNgz-pVMei!A#ljj`-oe;$~Ex4L`x zW}ch(br0>JK?`5r~&v|6ox%MNhXsMqU3P6z<(j$$1-pjxf=FDGOS zTM4u&y)CHQ?H(Irej8)N7$X}2X{}$f_^X4$FnsCaJ8HMvH?3A{XA1P1fC+tO=6kL6 zxPVP=hJ7Ns5)mH&{5%<$8DSWrR4PsR)><^1%}ML1)9D-nxXV>hnx+l}z)TOo3GfEz zNJI{_*1^U>M6@L$I}S)hz`U5x%&^uvzO@!a?u9TI3_JpWY&S@f1ifAlX__vCWyd|w zL!nTBQYs7jICIw(i$w%MF#fwFNftt%B_d8mB4VN_`ZITqCIdXrTMEg>On5(tsK3%? z@cmrJ4FFOi`U;GiDuBmDUo*2a@2f~euFK`}PhiwknfY`XOewWiWkht#%wNXu&ktJb zVARRyDvslVQtAZ28G!9MfWH7P`~CiTrBZovK?e% hJ&K}-Jb7P5{{fg|oo=G`P)Px#1am@3R0s$N2z&@+hyVZq<4Ht8R7i>4mCs8QVHn3h&&=-Zl)8olYq^9T62hBc zhi*dPrGpS?Mt_0_j}jg_1RawQx(E@3ke(v+7IUae2$@tD0~Zw81tG#8xb3#{bXZq* zcV>3nVb??7)6AFmc|JVv^UO2wze)Ve&ZjylFfT%HGs#rRDa;(r$=h(y6SccyWSWIk z!w%={wH?pc5S=F|HoQ&G8GA~5$%eg?K1Cnnw zWaYaqEq&8e4XBlXiWH_ygSF)!dR9Q&hC!5Jb$RJH8Uu($NzxIAcMoBtuhw7RgS)S* zV8ZzRRmOnTNEICyy%6yC5T@Y*z9WS@uQF=49VC#nPDpt`g%b2!Y8>1VFZZKf>wAz) z_yqjL6oC3|@L?MkKEtn*#<1gJt#`c(?hV52bgf@fZuo+rT$yE-pLc%4pHeWiqGAc+ zW}T_*V~`H)kyRCN*$Rh%52UP*6GKus*Dxd#Ain?NP`Ma9hts91kZW|>GQ$TXK#LPY z@(E6tsv*pT!LHcQ?Ke@udS7&zt-PFFh?7x!bU^ZrB47N}L@Lj;2#plb18PQZHZ^S-+!uo}Rr(c7fn5w7S6F#)OSYoqZHfK?@57MAajC=n00000NkvXX Hu0mjfjoAL^ literal 0 HcmV?d00001