From e0357759e7e05e5f1426df137747657cb8cc6d4e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 16 Sep 2023 17:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/img/task/video_bg.png | Bin 0 -> 5707 bytes subpkg/otherTask/otherTask.vue | 198 +++++++++++++++++++++------------ 2 files changed, 124 insertions(+), 74 deletions(-) create mode 100644 static/img/task/video_bg.png diff --git a/static/img/task/video_bg.png b/static/img/task/video_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..63755aef18f1cbd0574595bcd6dc0ff14f162925 GIT binary patch literal 5707 zcmbVQ2{@GP-lux)DY9o7W2Z5TG0jYtj3L{QUE*cT3?{~CX6)px6jSyr*&AMD3l+*z zL{t>nvPQ^=N~naEGkUA*obR0TedjyRbv@60KllB+|I6?G|NqZ@J=nxwr)PZQtBn*|}0&T))YZ9b6bLI4d-PO3}s> zsa_=QP)Z;N&Bdi>7#fHt_>mX@FOm;AKp(i=bQcI96ZL`4x;O|f(3s>)HVdbb?8B`c z2;qJN6cK1>0MH9Xa|BRG3_Ku|;vYaqhw1~r%SChg+rwZW;5&rjrw=sRRtRvx9R(Ou zX(WKIHUdO|!gT=$QQA<14jhF#0DwWDNH7EmhU$Qz2s9jmhQRn!(bo|0z?lBVBkYR0d%FG60jsXfkqBw zkf{NHZHagE`0|Q3BPcGK{WsG%83Lp z$)7|a1u*CwEc6#P(3i@f(tWA_M)a@ge^9`o7Ki(#<6qiBq5M)oXP5+Y-1tGrzeLj= z!U9QPI})85L?e()f;na?ZF>`lHl~sA3@XimO7;J_QAdB83@|p{-WU`>-I*Lfq=wKn z{%#Eki)WDZfiMV62LwTJcFh5*gNEy(p(rf~5)Fa;1;tT`Wbd$lhU%hW2sGp$p`558 z;u-k=6HFway{R+`p5rr_g7+bT0|R`3fL~0ajj8@r8b>k5I-S2CH#asuN~3y{{W%kK zyCWEYxrs3Xib5bjFm32}b8$Gdc>tY(4&2dQh~T}+QS3}7|3 zj*N7Aivm2OM5J#w4DiGof-^FBa;Kudxt|4;oaUKs4nK3K@ATdn{@))7CHHmo09edp zMwop!&cvvC|HhB&5fIJ3EUpZPYMJ?ZIdK4${}%9Rg!gd##WxjYbV}CQn0!=k z;ffYE74Y1=nd*GW(#UKf%T7(^F2*mRy5LA9Mq#P%U?k&<5vDf|@$}XOtOb`cLk)W% zMY(+aiGUy;4gS*^%Y<1(4uJmBQp zsVVtFIQrC{QE6QkLCOfrH?OlXv%rh%Bz;Af-A+xoG$y>pdqTjj1dK; zj+6DL1PH>zc*v%!nv=j|H_5WaXqI%LT+8)pz}m9N(98Z}-!< z$**zC#=D;6_A4l=7~J`I^h9ouab8;~aoqVH+Wnj=56w zfZv^Ye6Fp4;r#ld_77j!7gH^+2H6YG*SPvcf=w4#hJpLGbi#Uu1*#XadXN)sq>zW6y`Vox~5`Gf(fFGFbmKaj|r(Y)sNe z_&GvR&!B8TkE}{Bu`gbE79IHlAQt)7bN}WvsB1Y=LC3sca#ABjG89aDvpnbM!c|Zjgo1dkaYxipH&C>vBzvlMbEbOC{Be!s#!SU}D zML(_FxgGYJQ1C|UT~EG@;+*lAq9}jgq-s2jpS5l)F)2j{>`v57*Q~G-vrjyG^xWN? z@yuk=mnO}aK(p&511pswynhYS)H_LB%%D=sen(RKsHO)SpVBDEII^0%K>s%sKVl>21C37pZ!) zzrE+U?4ksP6p}?^+pA)SYx0{0TLj%3hBZYu06GNWGk@$C4^wBJ#$&HVR1iDe%(8$O zJ-;$uX5V$piS&{^uq^}Q=`hnILK#f5)_l>xDegM(CDLT&@i*KfD^bJ#*g;Jkc=tx+ zt~sf&tp$u4v(Z844|=u{EYk}!FRNj%oOs6PNh} z-=P@`oo_9zZ9nMnFf#gUwy-%ab>0?zfe?AB05DW{#4#iCc5y$KeR3-IPLh1*YmwRx z_A~BPS-Il==>zvvg=&tagORDqi<^;E(>H>b!Rzvf`9;(7)#Q}<^b#qpRPVtw z+e*FriIpHms`}@M=)+>q4EJn=X0afu@87ba!FJxV8m?Mv4pKbl2fX2+5p0p4j%E*E9S>>_?W$i{<` zv|~=S1e;z`Z20yqNzPz>#=Go%>+B`wBa?Xk$Cod1$@YT|)WcTDo34JcCT?L_;9-Ko zw~Qbd7PjQehg=?f&WDWcmFrmj0M#XXE(;p(!AwoeO+z7L7uzf(ru?$Ic8jDhVdv05 z_Fw|hj%=3B5Y2%~Mu&UME;r5Em$ge!GPIYHMmpY4oyPy^Fd~1)lv`c2 zPKHGmy!dv?zvhtYXwONvwaMhQ&P#w(qw$8TPsEA@-G@nIl8!0I_?RtMoh7vT5zpeE zsN7PuldKM1_SUeq^$&@k3V8FwPcw2kn0eu>-K`qArfR4{G3d(Q9 zT|wux!?BhK4W02Vv)cG!)*3f7C_0Hb+-SQq`G&vys~P`n7mL@zwxzP0`DPaWBcEl$ zjibJr)@LiY4NSQ|lyJEH6|U%^)Tq4ckTR_gB|Ak8&|$J}Q2?eEzhoePe_mjr>s z&r2N=KJMRq7M4hoGhC|U^|;>Yky_eS3cp3DKke3e^lZ&}Vrs%Ygvjj&FYZ5Rg`HVz zt?+5NY(YjQo?XX<>NH#v?By}Yy0Wx!BkLjmrpzG2TUA7O+w~E?{ z(wX;?`&7jv@KOkMz*E~rnzeO7-5ss*JM;4ik9gEb&Bv#WmdjqZzoKWc*>2t&PRxa(cX#- zxs)xL7egwV2g?}m+v2!C%bWe40k9a`MJ5c^5xgPTcx* z>tU^cs(pfr$$ajyQd!4cxjTL9JqgF)2$i}r2Lcnw?!hc*rx;Aj+NtFA^BgDse*FQe zh~0;%;cvFK%YMKz_tvq3Vb)V3*jjRR$Kp!5Gg+2IRi*-q&mAz`{4oJ^@n%9_NjJR% z3w)p4K;lF4hA@J43bG3k34LKIMP)rvCUa9?BhK|M4;%;=Qd4~2H`g7a;b`-^(J`?e zxc)d;d?u=?ll}IOq-EdN?XO~nFiAn}xicf|WcrnwG25&OM_7pX?Pa&H=nK;)6CZ1~ zdW(CmuZ?_~FRF($_BpOs)}M=%u67H!(!A6(0)?eNy1%X%jvS`69-oY1_?t>@%I`0v ziEqSGJ(W*r7(0XWqgLvfPU{&z;1z=eCh zBCZ{xv^noO5O7@eq;%NvLh}zkLOlCi%f#%8<7T90a&r^YsKr-ts zZnUWnm~l{465rFN>WPe_D|Pqjo8;p!bs(@W{oh|12we?qMeRs5^@@&sBeF}DwXF1R zYb!ot^tzpfwe5}+<@AJR+=FV2*6#N8nwz5gi3lU@k4DY%6X{9%k{Aphf2Z57{8+~Y z>7+5!54M{3zlx=s&ieT8*kh0+Vwqs9oG>B!CS30$me?wva`C0^^BtT+;|qX8Y0lh8JP0<`e%XE_?0#*dUJ`wM z6*U#W`!4D{(&=1Rc>{=ap(TFreeL>+8hXcDWd^iv;U4gJh9c-NcPN?pF1 zXEQFEMM=4J0)h4s9zN}{F-pz@^&TBodL+y9@_oqjJ!;(PB`&e2ik|68gh%g<+dZ{h z{h*qvSkK)x6>`Mvx8`aOOUlI_d&N1~JH01<19qLvw;prc85yRO0&tWW#~t0$P2im4 zPFBO%ySTdwq9fWBAJG>32<%Akq1*Lldg*aOL|fGKXZ$TAac*`|{<4dOtWs(4pVvS) z?KDI+c&iRKQ!vex>paG?9$Em$DmIG;`C*jbA=d4to{IXGzZCri^6?>?Yt`(`a#Q)C zwFSL2L1x;~@p5nTaULwkoR1-`@WrSq4LFY9q&TrEA;D& zZ1q*&q0DhY7udC?#+LipBBy)XvJRba&vxNC?Od%>Y*uk03^Du1+1s;{6U?xFQ|~M7 zp&SvAc}!Vap)NkY9>`{ByF=!^9!GZ6M#itR6~za;%m&*!;0FkG$ZwGlayF*K=Und@ zA93t%{U?QHG56oCr9U6}7*BZ>zts579e~rdtK#-Oyi-FKscnuUUY6Ln?ml~5Z?;j` z4cX_aw1ze*mqTh_vA4iv@EHnDu+QkUgnUCK?(E`rBYs$d<5+UMv_DOxnJ=U;)3H&) z^`$!3BBCx4s^Avydy_>arGx(H{F0;ER@&{dV~Q{oS9JXnCUra(w3^X&+P|@J7MVGP zSb05{vham)<5ur2>_Vh??&k)I*A$^$c@zaPA$zR6pG*U-!NpetHX02#{N`7iUPTn_ zJGgvRz4ndBm@>l5cXd7W#HS*3dK p(=H=g_;3VFT {{task_info.content}} + + 驳回提示 + + {{deny_notes}} + + 详情描述 - 添加附件 - - + + + @@ -31,10 +39,12 @@ - - - - + + + + + @@ -47,18 +57,12 @@ + - - - - - - - - + @@ -78,22 +82,24 @@ data() { return { task_id: -1, - task_info: { - - }, + task_info: {}, + approve_status: 0, // 审核状态： 1待审核，2已通过，3已驳回 + deny_notes: '', // 驳回提示 other: { - annex: [], // 附件列表 + annex: [], // 图片列表 is_commit: 0, // 是否提交 note: "", // 详情描述 + video_annex: [] // 视频列表 }, list1: [{ name: '图片', }, { name: '视频', }], - current: 1, + current: 0, + note: '', fileList: [], - videoList: ['https://ceshi-worker-task.lihaink.cn/uploads/video/20230916/20230916144834ddf521318.mp4'], + videoList: [], video_src: '', show_video: false }; @@ -118,21 +124,53 @@ initDetail() { taskOtherTaskDetail({ id: this.task_id }).then((res) => { this.task_info = res.data; - this.other = res.data?.extend?.other; + this.other = JSON.parse(JSON.stringify(res.data?.extend?.other)); // 深拷贝 + this.approve_status = res.data?.approve_status; + this.deny_notes = res.data?.deny_notes; + res.data?.extend?.other?.note ? this.note = res.data?.extend?.other?.note : null; res.data?.extend?.other?.annex ? this.fileList = res.data?.extend?.other?.annex : null; - this.other.is_commit = 0; + res.data?.extend?.other?.video_annex ? this.videoList = res.data?.extend?.other?.video_annex : null; + // this.other.is_commit = 0; }) }, + // 被驳回时点击重新修改 + toUpdate() { + this.other.is_commit = 0; + }, + // 判断内容是否更改, 返回true代表更改 + isReject(){ + if (this.approve_status == 3) { // 被驳回，重新提交需要修改内容后方可提交 + let other = { + note: this.note, + annex: this.fileList, + video_annex: this.videoList + } + let flag = true; + if(JSON.stringify(other)==JSON.stringify({ + note: this.other.note, + annex: this.other.annex, + video_annex: this.other.video_annex + })) flag = false; + if (!flag) { + Toast('未检测到您的修改，请修改后提交') + } + return flag; + } + else return true; + }, + // 提交 async submit() { + if(!this.isReject())return; // 判断是否进行更改 if (this.other.note.trim() == '') return Toast('详情描述不能为空'); await taskOtherTaskCommit({ id: this.task_id, - note: this.other.note, + note: this.note, annex: this.fileList, - vedio_annex: this.videoList + video_annex: this.videoList }); this.other.is_commit = 1; - Toast('提交成功') + this.approve_status = 1; + Toast('提交成功'); }, clickTabs(item) { this.current = item.index; @@ -151,39 +189,47 @@ }); this.fileList.push(ul.data.uri); } - // this.fileList = [...this.fileList, res.tempFiles] } }); }, - chooseVideo(){ - console.log(VIDEO_URL); + chooseVideo() { uni.chooseVideo({ sourceType: ['album', 'camera'], // 视频选择的来源，可以是相册或摄像头 maxDuration: 60, // 视频最大时长，单位秒 success: (res) => { - // 选择视频成功的回调函数 const video = res.tempFilePath; - // this.videoList.push(video) - // return ; - uni.uploadFile({ + let timer; + let title = '上传中'; + timer = setInterval(() => { + uni.showLoading({ + title: title + }) + }, 1000) + // 上传视频文件 + let uploadTask = uni.uploadFile({ url: VIDEO_URL, filePath: video, name: 'file', - header:{ + header: { token: this.$store.state.app.token }, success: (uploadFileRes) => { - console.log(uploadFileRes); + clearInterval(timer); + uni.hideLoading(); uploadFileRes.data = JSON.parse(uploadFileRes.data) - if(uploadFileRes.data.code==1) { - this.videoList.push(uploadFileRes.data.uri) - } - else Toast('网络错误') + if (uploadFileRes.data.code == 1) { + this.videoList.push(uploadFileRes.data.data.uri) + } else Toast('网络错误') }, fail: (err) => { + clearInterval(timer); + uni.hideLoading(); Toast('网络错误') } }) + uploadTask.onProgressUpdate((fileRes) => { + title = `上传中...${fileRes.progress}%`; + }) }, fail() { Toast('用户取消上传') @@ -205,25 +251,17 @@ }, /*查看视频*/ videoshow(src) { - console.log('视频', src); this.video_src = src; - this.show_video = true; - this.$nextTick(() => { + this.show_video = true; + this.$nextTick(() => { this.videoContext = uni.createVideoContext('myVideo', this); - this.videoContext.play(); - }) + this.videoContext.play(); + }) }, - screenChange(e) { - let fullScreen = e.detail.fullScreen; //值true为进入全屏，false为退出全屏 - // console.log(e, "qweeee========================================"); - if (!fullScreen) { - this.videoplay = false - //退出全屏 this.videoplay = false; // 隐藏播放盒子 - } - }, - deleteFile(index, type='image') { - if(type=='image') this.fileList.splice(index, 1); - else if(type=='video') this.videoList.splice(index, 1); + // 删除已上传文件 + deleteFile(index, type = 'image') { + if (type == 'image') this.fileList.splice(index, 1); + else if (type == 'video') this.videoList.splice(index, 1); }, navTo(url) { if (url) { @@ -244,27 +282,29 @@ \ No newline at end of file