From 7f3d1ab1e1f2f7570e5f8aeb279e1c39e98365a7 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 18 Apr 2024 16:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=AE=94=E7=AB=99=E7=82=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 9 +++ pages.json | 16 +++++ pages/home/home.vue | 4 +- pages/manage/sb-point-manage.vue | 109 +++++++++++++++++++++++++++++++ static/image/menu/RF01.png | Bin 2352 -> 2394 bytes static/image/menu/RF04.png | Bin 0 -> 2352 bytes static/image/menu/RF05.png | Bin 0 -> 1876 bytes utils/getData2.js | 41 ++++++++++++ utils/mork2.js | 28 ++++++++ 9 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 pages/manage/sb-point-manage.vue create mode 100644 static/image/menu/RF04.png create mode 100644 static/image/menu/RF05.png diff --git a/common/style/layout.styl b/common/style/layout.styl index 3b7e0fc..7ca5571 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -290,6 +290,15 @@ uni-button:after { border: 2rpx solid #ff6a00; border-radius: 10rpx; } +.button-primary1 + background-color: #E9B451 + border-color: #E9B451 +.button-primary2 + background-color: #6CBE8B + border-color: #6CBE8B +.button-primary3 + background-color: #6798ef + border-color: #6798ef .button-info, .submit-button[disabled] { background-color: #c9c9c9; border: 2rpx solid #c9c9c9; diff --git a/pages.json b/pages.json index ad5f40f..b1768ef 100644 --- a/pages.json +++ b/pages.json @@ -42,6 +42,22 @@ } } + ,{ + "path" : "pages/manage/sb-point-manage", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/manage/agv-call-manage", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index def4f8d..239b12e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -34,7 +34,9 @@ menuList: [ {id: 1, title: '呼叫管理', icon: 'RF01', path: '/pages/manage/call-manage'}, {id: 2, title: '指令管理', icon: 'RF02', path: '/pages/manage/inst-manage'}, - {id: 3, title: '任务管理', icon: 'RF03', path: '/pages/manage/task-manage'} + {id: 3, title: '任务管理', icon: 'RF03', path: '/pages/manage/task-manage'}, + {id: 4, title: '生箔站点管理', icon: 'RF04', path: '/pages/manage/sb-point-manage'}, + {id: 5, title: 'agv呼叫管理', icon: 'RF05', path: '/pages/manage/agv-call-manage'} ], show: false, secM: [] diff --git a/pages/manage/sb-point-manage.vue b/pages/manage/sb-point-manage.vue new file mode 100644 index 0000000..3351253 --- /dev/null +++ b/pages/manage/sb-point-manage.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png index e18e35a8b677caafc369e413bdb96743acc63312..d648d050478a233b3bf309cb8ab75d646f70bb8e 100644 GIT binary patch delta 1675 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 Av;Y7A literal 0 HcmV?d00001 diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png new file mode 100644 index 0000000000000000000000000000000000000000..b33885fe997777e23ccc0a40fecc6775b0be2a14 GIT binary patch literal 1876 zcmV-a2dnsrP)+hw>X}`3L6ij+pRiA(##@8Y_(Y$0U{Iq*5hNbSMiGr7sL6vTs4pIg2>O&& zffzKzgQyV|*Tg%D8a$%@;ekdJ;(-T9)CCv!=$Z15YG9C=b-Snf@V)vZotduf`u=LZ zTT@e2U0vXCI2;a#!{Kl^91e%W;cz${4oCcmO);%?=sXwRqY=?40j208!l_CatrUkT zVGpGkC<>H9D`A~dtWv@|O6g~n@S2!(l!DS%*>Wx*%IJFnctKilTz+h>V%bFO*;6@6 zveW@HfGdFk6|NCr*WeflOb5OIZUP<#!vB{OM5SE-;2_{b;07w2T#3Db2Z85+2D`zpgAV_>&ecK{8rMc(HCR6YgxkIfm34Aj!arcpZOQp4^84mpMR$w z2<#hkn4@CW4^0|1`hWyt>_f)d=`@UPN+5>9j36^Z8b3B>puC?*i6*CcNAlB=Z+SRHei z_hZ%%O$QfvgSKvu-SkVjehV-`31PnqGSQM!lIs4(w+}k04%qpH5+)(l9qK+ zHTr>RQUuPX`hImQW?e{TNxMb^Yyd_9pGC~y3Y?2+Ix6Y<>KI24YUCF0l!%&qE!+%`usa}9})hogy}$Ei_&`mcVQMk z&cZBw%nXTs-Ojy39|3%X`Qfr@aw$!~L%<8bu$W?mCNZPW`LDj5XbT!w1Lpx9A@hyK z%;Fs%GG8pj-gJzgt3?zoB20}aaV_u|a3nA-WZp(h&2GjlfJ}`fYV>@FY;rsBbnt#j zM2&oqcVfi+R*2Q;v*+ml0GCxE@e%j<%El9mt<~*v=VEXGH zSNNM=w8H;XgoPq3oHQb5b)*?r({TsYKju)xbOlTKpi0f25X`#3yMad+zvWx?#(IrD zYqmaAV1fmyHSE}>TUp`SPl2VtPZ49)V21H$U<@AzOa|_asJ8=gG#xW7>6A0|M_?T= zq$F)Ark~v%CCH^Cw^^`gg+C5>JUG3KtQtM$7TqYq7)x@MYVRj(Gup=((hYF^ncj96 zPP^S-xbv>ky!mIjzhMuing={Jo)VO2UQ3yLbZ+T=Z~9MTYWDt?J_lgGMvt+m`E`Z# zFH7Ekj+tgHOZ_e~Zqs_^_Z>)c+t;kBt>bVnr{1Wo)1y4p6mLMWTvPKl#^{>JB`)~Eb))fnk&(|}#?_du0f77FCc4BB@6LTovriUHs_X^v+ zj^P%ycBzow>&d95;qt9g^cO&DV_;2Rh6azUdp+f~jcucMx2SbDaC*sk4)_-#ZoqEc z13>U7(pKoEpnZJp>kbjVitV|uGT3f9@)orkFt@3;EFri6*fWek;A2q)&-Yo`)y@!| z7s=;Ed3oJRhin8+wpiwh*fzQY=wn&)AHfkCZ4O@-@pH8tS3iJ*mC~l?;RzziZHQpI z=~!b~uPUVUtu{ZLU7J|b)uztVzU~&1bK17iFI(2D4&!uD1OYT?M92gCYNT5y*hbqn zdOl_lks1DW0GkmM;0Z#$o?$AlPxJD+UJ~3(#j4Ry&5~7^J0h9kyOkVL@cF4&V6ES+ z{bE7;xf%}CzI5w?B=($(^|_8GXUg2MvvntMdmQ?Ipth$!uKh@l9?&FDDnWPs$}=55 z%Z7X{IclgOk4R3wD3h%|j)KNAP5Q)4X#oz!-0O?8DcOe}_WbD6k6D{Hu%u%n%WLWx zD;`avWEhG;A`BGhS0>vD!E2|@g2qLrDznU^_OpPuEkG&=739woWNpm9RPNc5I#if{1X0 z2uE&7S1{qCqw-O22=74F_PsM7vUf(0R>Cq-)K#g;xyS$PVu!=wa5x+ehr{7;I2;a#!{Kl^vdHhu6Pq}v^AYj@ O0000Jx literal 0 HcmV?d00001 diff --git a/utils/getData2.js b/utils/getData2.js index 71c5605..93e0618 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -83,4 +83,45 @@ export const handTaskoperation = (type, id) => request({ type: type, task_uuid: id } +}) +/** + * 生箔站点管理 + */ +// 1.1根据区域查询设备编号及状态 +export const queryDevices = () => request({ + url:'api/hands/queryDevices', + data: {} +}) +// 1.3更新设备状态操作 +export const updateDeviceStatus = (code, option) => request({ + url:'api/hands/updateDeviceStatus', + data: { + device_code: code, + option: option + } +}) +/** + * agv呼叫管理 + */ +// 1.1查询所有区域信息 +export const agvqueryDevices = () => request({ + url:'api/hands/queryArea', + data: {} +}) +// 1.2根据区域查询设备编号及状态 +export const agvqueryPointByArea = (code) => request({ + url:'api/hands/queryPointByArea', + data: { + areaCode: code + } +}) +// 1.2创建任务(生成任务号为-开头) +export const agvcallTask = (scode1, ncode1, scode2, ncode2) => request({ + url:'api/hands/callTask', + data: { + start_device_code1: scode1, + next_device_code1: ncode1, + start_device_code2: scode2, + next_device_code2: ncode2, + } }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index e507916..829e72a 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -115,4 +115,32 @@ export const queryPointByArea = () => { }] } return res +} +export const queryDevices = () => { + let res = { + data: [{ + device_code: '1', + device_name: 'JLDFJLLJ', + seq_num: '1' + }, { + device_code: '12', + device_name: 'JLDFJLLJ' + }, { + device_code: '13', + device_name: 'JLDFJLLJ' + }, { + device_code: '14', + device_name: 'JLDFJLLJ' + }, { + device_code: '15', + device_name: 'JLDFJLLJ' + }, { + device_code: '16', + device_name: 'JLDFJLLJ' + }, { + device_code: '17', + device_name: 'JLDFJLLJ' + }] + } + return res } \ No newline at end of file