From 53caddfa1e964dd5a232de7f11ec294acfc611cd Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Mon, 29 Jan 2024 18:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality.js | 20 +++- src/assets/back.png | Bin 0 -> 6280 bytes src/assets/record.png | Bin 0 -> 6389 bytes src/router/index.js | 7 +- src/utils/auth.js | 12 +++ src/utils/request.js | 3 +- src/utils/time.js | 51 ++++++++++ src/views/HomeView.vue | 17 +++- src/views/Login.vue | 96 ++++++++++++++++++- src/views/Quality.vue | 57 ++++++++---- src/views/Scrap.vue | 201 +++++++++++++++++++++++++++++++++++----- src/views/ScrapList.vue | 153 ++++++++++++++++++++++++++++++ 12 files changed, 567 insertions(+), 50 deletions(-) create mode 100644 src/assets/back.png create mode 100644 src/assets/record.png create mode 100644 src/utils/time.js create mode 100644 src/views/ScrapList.vue diff --git a/src/api/quality.js b/src/api/quality.js index d8e3ef8..c24d4c9 100644 --- a/src/api/quality.js +++ b/src/api/quality.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-20 11:05:00 - * @LastEditTime: 2024-01-10 11:20:45 + * @LastEditTime: 2024-01-29 16:51:45 * @LastEditors: DY * @Description: 质量和报废 */ @@ -69,3 +69,21 @@ export function createInspection (data) { data: data }) } + +// 获得所有报废日志列表 +export function scrapLogList (data) { + return request({ + url: '/base/quality-scrap-log/page', + method: 'get', + params: data + }) +} + +// 获得安灯权限 +export function authList (data) { + return request({ + url: '/base/quality-inspection-box-btn-auth/get', + method: 'get', + params: data + }) +} diff --git a/src/assets/back.png b/src/assets/back.png new file mode 100644 index 0000000000000000000000000000000000000000..98bba34536a71909cc99fc6c4686df597e766e2d GIT binary patch literal 6280 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 literal 0 HcmV?d00001 diff --git a/src/assets/record.png b/src/assets/record.png new file mode 100644 index 0000000000000000000000000000000000000000..87085a9240d72c5f4e2a3e78ad15e468970fe0db GIT binary patch literal 6389 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%0DZauX4ecRxwYHDg*^dZu-U@jYNhJroevNJ zCmm*%GpCzLDS+Lyre_$#)TeW~N9Tytpykpjx4ktIE#*0Tr6jJh613GbJjGW4`1y9H z=~}a}+lX2@1ERNDO%R+1buh*^{=k4|u| zQYX2hT$0DU$!S7MDcD^lc5JsmI%?5DakO-kF5Cv;Myp>`vb`jt4wb^TV<~aV`Z-h^ z;K~$wmK-8?PQvR_OEKgY0VbiivscvB|`y3A3=eKrLdYagvl;>Xhf@WE6Ut zreBTHAF2egrHJgGgU>4`XRE!k$47wd~^LxPg{=@omev?c<3 z3icO>0bB{}pz5>(q{@})MWKqFV7|D&C!-AybjVLSAM`NlP#hWT zP^dI&$nB6uu)IK(Lf<3OhO$;Ys;v!mX;7*n3Xhsd7Yfx)g_hxVE46?qP^GFARmyuo zndIT~N6GQd7+2JvmLsQ-xlqVA!D@N2PhtBC3c6zQBi8cX`*^K&rW$SWs`sW#3=NZctzxUQh7V=ZB%GFEjLo4p8y*tA8fb5omWMXVq=jN6vyZJx zR-nB}R1r^uO07|z(x6mPrnimoXbPZWd%+@LwI>r0HGy`)Y;g@x#qOGI0IH;A>*X)= zwvm$#&Rn4;mVOVP$IL{UojzpsX53UZ_2~qhYM9oT&`p`NP$VaLELu*vN;{|36yrs0 zEmL_sUDQ5pL-j$a^`Ov53McFH(n)yp|aTD5h7_ib*i%kRQg&nvAJfc zmjX;FeiXBH)=Nv5yb7u$qkJas1!Y#8GMR6|Oj4inbcma#8u@OkZ+KeGS}K)A2KrfF zhKLJPQD-$uluvDVF7RUOl-H4x!e4+IEp|6e+vi{-BX*bg*;J^+(ooJx$9j7sk{be& z>^+M@1)?OQ%!Zzq05Z3|^cpKKKtpG;%X}kzaUL^OVtg%2eTbh;nEhsdbWZv1J+{6$ z!&QS02hH{DH8oKtF&w+KLalN4i$_CDtwvUfQYEH()N~$GQ)x&kuf2-o+M3Vd6^UX6 zD0@qhfQ`lyAf;F-}Pc@Y+dn zr6j}!umV(Ksu6{XQl(}n6e{sFY6>6=akH&Z!vc|P)Aq{CEjKTrnw<7Z{+Z0DR(lmU zyw0@GV`it#d&A6UByV`~Y`5)K)uqk#MT!~8QcBq!lO!XYZAqy)RI93KMLA=Y%M#_K z*{q!swTemu$R=0;8AX=ly%yB6N}EUvbq4DTOo5o?&kK<9o~Tn)8NgcOb(DH-jjttj zFA1n@bF)xq8AosCmU-;cyL$m01hq&~0=3)z0+lBWRqIx{W?U7uveN;i#8!@^<1B}Z zD7SnL)l!_qkk=hCR2goh4am(^0VkG6mV*sIGim(l0Ft!hpvuH}ou$53F`iZ|mtht* z7ntQFG$?Mi;$@EoU;7T+9%YG)eo%cDlT9+^>Q?c@F;q=6|fNVzFwv6={yy6s-KFeP%GQ01FTOBu}{f2oIamrwJeHkfixKxs#HrE%M3ZGGY=&*tSU8bPmt}kibL?` zs zu&%^jMH!1C1*DErE~_%P`0UtW2H3q6(EZ*p3u3iPs$vO^M+i6#g<4%&B`K|3x=5X1 zSIFBaFXAT*vCRR8*8;hxLMtJD27sm#ES<+w0XWeCQYX_aiAR@I3EYc#>bQIfj1$i2 zDvf&Ed@W_R64fw3hqZrz+9R&E)jCfCc2>GJ0^EdLwir~489-F)vlRli%3y|pKejRx z3@pfO6BadMUUHSFahi3KvRL~d00F5gGdxI@a^4$VqHScL{h)^5v$;xRYr%pR)cpjU zhjJLesi(p&&$U8iM|n3DFA^(5GBg%JVxdT$4u^E z+;<I}2N1 zXq{IMy1fx!Exy9cIgdp z1}Lu{UL0#xNGLw&u>w>M8+kJ6-kJc{f+(L4T4r57U#}|5r!$P=^ONZit(v(0(9>h1>7%3stXW*|mO% zaaelI?^tVx&G>wyfQLP&#{*#Zxr{Z24tt^hpZEJed;smAUu%2*00000NkvXXu0mjf D1$Sgc literal 0 HcmV?d00001 diff --git a/src/router/index.js b/src/router/index.js index b1b748e..c0642b9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-12-27 16:41:40 - * @LastEditTime: 2024-01-09 13:58:18 + * @LastEditTime: 2024-01-29 10:04:05 * @LastEditors: DY * @Description: */ @@ -43,6 +43,11 @@ const routes = [ path: '/scrap', name: 'scrap', component: () => import('../views/Scrap.vue') + }, + { + path: '/list', + name: 'scrapList', + component: () => import('../views/ScrapList.vue') } ] diff --git a/src/utils/auth.js b/src/utils/auth.js index 9314c9e..69326d0 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,3 +1,10 @@ +/* + * @Author: Do not edit + * @Date: 2024-01-09 09:55:17 + * @LastEditTime: 2024-01-29 16:56:22 + * @LastEditors: DY + * @Description: cookie + */ // ========== 租户相关 ========== @@ -21,6 +28,10 @@ export function getAccessToken () { return localStorage.getItem(AccessTokenKey) } +export function getUserId () { + return localStorage.getItem('UserId') +} + export function getRefreshToken () { return localStorage.getItem(RefreshTokenKey) } @@ -28,6 +39,7 @@ export function getRefreshToken () { export function setToken (token) { localStorage.setItem(AccessTokenKey, token.accessToken) localStorage.setItem(RefreshTokenKey, token.refreshToken) + localStorage.setItem('UserId', token.userId) } export function removeToken () { diff --git a/src/utils/request.js b/src/utils/request.js index 9c2d1bf..3b562dc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-20 11:02:29 - * @LastEditTime: 2024-01-11 10:34:34 + * @LastEditTime: 2024-01-29 16:48:54 * @LastEditors: DY * @Description: */ @@ -13,6 +13,7 @@ import { MessageBox } from 'element-ui' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ + // baseURL: 'http://192.168.1.20:48080', // baseURL: 'http://192.168.1.78:48082/admin-api', baseURL: 'http://192.168.0.33:48082/admin-api', timeout: 30000, diff --git a/src/utils/time.js b/src/utils/time.js new file mode 100644 index 0000000..79b6c6b --- /dev/null +++ b/src/utils/time.js @@ -0,0 +1,51 @@ +/* + * @Author: Do not edit + * @Date: 2024-01-29 15:33:10 + * @LastEditTime: 2024-01-29 15:39:34 + * @LastEditors: DY + * @Description: + */ +// 日期格式化（通用） +export function parseTime (time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + // const reg1 = new RegExp(/-/gm) + // const reg2 = new RegExp(/\.\d{3}/gm) + // time = time.replace(reg1, '/').replace('T', ' ').replace(reg2, '') + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const timeStr = format.replace(/{([ymdhisa])+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return timeStr +} diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b85465a..3b84f51 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,12 +1,18 @@