From d1084377699404617cc807a8c0e46065aae7053b Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Sep 2025 16:58:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E4=B8=A4=E5=88=97=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 133 ++++++++++++------------ src/views/statistics/good_check_gx2.vue | 100 +++++++++--------- 2 files changed, 122 insertions(+), 111 deletions(-) diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 25db06f0..b27a85de 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -100,7 +100,6 @@ style="height: 100%;" :summary-method="getSummaries" show-summary - > @@ -109,6 +108,9 @@ + + + @@ -177,6 +179,9 @@ + + + @@ -485,7 +490,7 @@ export default { } let propert = ''; //尺寸检验 - if(index == 3&&column.label=='检验数'){ + if(index == 4&&column.label=='检验数'){ propert = '尺寸检验_count_real'; }else if(column.label=='黑圈内径'){ propert = '尺寸检验_缺陷_黑圈内径'; @@ -499,13 +504,13 @@ export default { propert = '尺寸检验_缺陷_产品外径小'; }else if(column.label=='产品外径大(返修)'){ propert = '尺寸检验_缺陷_产品外径大(返修)'; - }else if(index == 14&&column.label=='黑圈缺口'){ + }else if(index == 15&&column.label=='黑圈缺口'){ propert = '尺寸检验_缺陷_黑圈缺口'; }else if(column.label=='外径发货片(B)'){ propert = '尺寸检验_缺陷_外径发货片(B)'; }else if(column.label=='前道崩'){ propert = '尺寸检验_缺陷_前道崩'; - }else if(index==17&&column.label=='合格数'){ + }else if(index==18&&column.label=='合格数'){ propert = '尺寸检验_count_ok_full'; }else if(column.label=='准合格(B)'){ propert = '尺寸检验_缺陷_准合格(B)'; @@ -513,83 +518,83 @@ export default { propert = '尺寸检验_缺陷_圆准(B)'; }else if(column.label=='总合格数'){ propert = '尺寸检验_count_ok'; - }else if(index == 25&&column.label=='检验数'){ + }else if(index == 27&&column.label=='检验数'){ propert = '外观检验_count_real'; - }else if(index==26&&column.label=='合格数'){ + }else if(index==28&&column.label=='合格数'){ propert = '外观检验_count_ok_full'; - }else if(index==28&&column.label=='划麻(返修)'){ + }else if(index==30&&column.label=='划麻(返修)'){ propert = '外观检验_缺陷_划麻(返修)'; - }else if(index==30&&column.label=='脏(返修)'){ + }else if(index==32&&column.label=='脏(返修)'){ propert = '外观检验_缺陷_脏(返修)'; - }else if(index==32&&column.label=='气泡'){ + }else if(index==34&&column.label=='气泡'){ propert = '外观检验_缺陷_气泡'; - }else if(index==34&&column.label=='浅气泡(B)'){ + }else if(index==36&&column.label=='浅气泡(B)'){ propert = '外观检验_缺陷_浅气泡(B)'; - }else if(index==35&&column.label=='黑圈变形'){ + }else if(index==37&&column.label=='黑圈变形'){ propert = '外观检验_缺陷_黑圈变形'; - }else if(index==36&&column.label=='黑圈缺口'){ + }else if(index==38&&column.label=='黑圈缺口'){ propert = '外观检验_缺陷_黑圈缺口'; - }else if(index==37&&column.label=='重水纹'){ + }else if(index==39&&column.label=='重水纹'){ propert = '外观检验_缺陷_重水纹'; - }else if(index==38&&column.label=='浅水纹(B)'){ + }else if(index==40&&column.label=='浅水纹(B)'){ propert = '外观检验_缺陷_浅水纹(B)'; - }else if(index==39&&column.label=='大崩'){ + }else if(index==41&&column.label=='大崩'){ propert = '外观检验_缺陷_大崩'; - }else if(index==40&&column.label=='小崩边(B)'){ + }else if(index==42&&column.label=='小崩边(B)'){ propert = '外观检验_缺陷_小崩边(B)'; - }else if(index==42&&column.label=='棕点'){ + }else if(index==44&&column.label=='棕点'){ propert = '外观检验_缺陷_棕点'; - }else if(index==43&&column.label=='浅划麻(B)'){ + }else if(index==45&&column.label=='浅划麻(B)'){ propert = '外观检验_缺陷_浅划麻(B)'; - }else if(index==44&&column.label=='双面划麻'){ + }else if(index==46&&column.label=='双面划麻'){ propert = '外观检验_缺陷_双面划麻'; - }else if(index==45&&column.label=='倒角'){ + }else if(index==47&&column.label=='倒角'){ propert = '外观检验_缺陷_倒角'; - }else if(index==46&&column.label=='棕圈'){ + }else if(index==48&&column.label=='棕圈'){ propert = '外观检验_缺陷_棕圈'; - }else if(index==47&&column.label=='蓝圈'){ + }else if(index==49&&column.label=='蓝圈'){ propert = '外观检验_缺陷_蓝圈'; - }else if(index==48&&column.label=='尺寸小'){ + }else if(index==50&&column.label=='尺寸小'){ propert = '外观检验_缺陷_尺寸小'; - }else if(index==49&&column.label=='破损'){ + }else if(index==51&&column.label=='破损'){ propert = '外观检验_缺陷_破损'; - }else if(index==50&&column.label=='发白'){ + }else if(index==52&&column.label=='发白'){ propert = '外观检验_缺陷_发白'; - }else if(index==51&&column.label=='漏光'){ + }else if(index==53&&column.label=='漏光'){ propert = '外观检验_缺陷_漏光'; - }else if(index == 54&&column.label=='返修数'){ + }else if(index == 56&&column.label=='返修数'){ propert = '外观检验_返修_count_real'; - }else if(index==55&&column.label=='合格数'){ + }else if(index==57&&column.label=='合格数'){ propert = '外观检验_返修_count_ok_full'; - }else if(index==56&&column.label=='黑圈变形'){ + }else if(index==58&&column.label=='黑圈变形'){ propert = '外观检验_返修_缺陷_黑圈变形'; - }else if(index==57&&column.label=='气泡'){ + }else if(index==59&&column.label=='气泡'){ propert = '外观检验_返修_缺陷_气泡'; - }else if(index==58&&column.label=='浅气泡(B)'){ + }else if(index==60&&column.label=='浅气泡(B)'){ propert = '外观检验_返修_缺陷_浅气泡(B)'; - }else if(index==59&&column.label=='浅划麻(B)'){ + }else if(index==61&&column.label=='浅划麻(B)'){ propert = '外观检验_返修_缺陷_浅划麻(B)'; - }else if(index==60&&column.label=='双面划麻'){ + }else if(index==62&&column.label=='双面划麻'){ propert = '外观检验_返修_缺陷_双面划麻'; - }else if(index==61&&column.label=='浅水纹(B)'){ + }else if(index==63&&column.label=='浅水纹(B)'){ propert = '外观检验_返修_缺陷_浅水纹(B)'; - }else if(index==62&&column.label=='重水纹'){ + }else if(index==64&&column.label=='重水纹'){ propert = '外观检验_返修_缺陷_重水纹'; - }else if(index==63&&column.label=='大崩'){ + }else if(index==65&&column.label=='大崩'){ propert = '外观检验_返修_缺陷_大崩'; - }else if(index==64&&column.label=='小崩边(B)'){ + }else if(index==66&&column.label=='小崩边(B)'){ propert = '外观检验_返修_缺陷_小崩边(B)'; - }else if(index==65&&column.label=='倒角'){ + }else if(index==67&&column.label=='倒角'){ propert = '外观检验_返修_缺陷_倒角'; - }else if(index==66&&column.label=='棕点'){ + }else if(index==68&&column.label=='棕点'){ propert = '外观检验_返修_缺陷_棕点'; - }else if(index==67&&column.label=='漏光'){ + }else if(index==69&&column.label=='漏光'){ propert = '外观检验_返修_缺陷_漏光'; - }else if(index==68&&column.label=='黑圈缺口'){ + }else if(index==70&&column.label=='黑圈缺口'){ propert = '外观检验_返修_缺陷_黑圈缺口'; - }else if(index==69&&column.label=='破损'){ + }else if(index==71&&column.label=='破损'){ propert = '外观检验_返修_缺陷_破损'; - }else if(index==70&&column.label=='尺寸小'){ + }else if(index==72&&column.label=='尺寸小'){ propert = '外观检验_返修_缺陷_尺寸小'; }else if(column.label=='外观总合格数'){ propert = '外观检验_完全总合格数'; @@ -611,34 +616,34 @@ export default { } } - if(index==5||index==7||index==9||index==11||index==18||index==22){ + if(index==6||index==8||index==10||index==12||index==19||index==23){ if(sums[index-1]){ - sums[index] = ((sums[index-1]/sums[3])*100).toFixed(4); + sums[index] = ((sums[index-1]/sums[4])*100).toFixed(4); } } - if(index==27||index==29||index==31||index==33||index==41){ + if(index==29||index==31||index==33||index==35||index==43){ if(sums[index-1]){ - sums[index] = ((sums[index-1]/sums[25])*100).toFixed(4); - } - } - if(index==71){ - let sum = 0; - if(sums[26]){ - sum += sums[26]; - } - if(sums[55]){ - sum += sums[55]; - } - sums[index] = sum; - } - if(index==72){ - if(sums[71]&&sums[25]){ - sums[index] = ((sums[71]/sums[25])*100).toFixed(2); + sums[index] = ((sums[index-1]/sums[27])*100).toFixed(4); } } if(index==73){ - if(sums[72]&&sums[22]){ - sums[index] = ((sums[72]*sums[22])/100).toFixed(2); + let sum = 0; + if(sums[28]){ + sum += sums[28]; + } + if(sums[57]){ + sum += sums[57]; + } + sums[index] = sum; + } + if(index==74){ + if(sums[73]&&sums[27]){ + sums[index] = ((sums[73]/sums[27])*100).toFixed(2); + } + } + if(index==75){ + if(sums[74]&&sums[23]){ + sums[index] = ((sums[74]*sums[23])/100).toFixed(2); } } }); diff --git a/src/views/statistics/good_check_gx2.vue b/src/views/statistics/good_check_gx2.vue index c6359291..edad8041 100644 --- a/src/views/statistics/good_check_gx2.vue +++ b/src/views/statistics/good_check_gx2.vue @@ -109,6 +109,9 @@ + + + @@ -174,6 +177,9 @@ + + + @@ -426,7 +432,7 @@ export default { } let propert = ''; //尺寸检验 - if(index == 2&&column.label=='检验数'){ + if(index == 3&&column.label=='检验数'){ propert = '尺寸检验_count_real'; }else if(column.label=='黑圈内径'){ propert = '尺寸检验_缺陷_黑圈内径'; @@ -446,7 +452,7 @@ export default { propert = '尺寸检验_缺陷_外径发货片(B)'; }else if(column.label=='前道崩'){ propert = '尺寸检验_缺陷_前道崩'; - }else if(index==16&&column.label=='合格数'){ + }else if(index==17&&column.label=='合格数'){ propert = '尺寸检验_count_ok_full'; }else if(column.label=='准合格(B)'){ propert = '尺寸检验_缺陷_准合格(B)'; @@ -454,53 +460,53 @@ export default { propert = '尺寸检验_缺陷_圆准(B)'; }else if(column.label=='总合格数'){ propert = '尺寸检验_count_ok'; - }else if(index == 23&&column.label=='检验数'){ + }else if(index == 25&&column.label=='检验数'){ propert = '外观检验_count_real'; - }else if(index==24&&column.label=='合格数'){ + }else if(index==26&&column.label=='合格数'){ propert = '外观检验_count_ok_full'; - }else if(index==26&&column.label=='划麻(返修)'){ + }else if(index==28&&column.label=='划麻(返修)'){ propert = '外观检验_缺陷_划麻(返修)'; - }else if(index==28&&column.label=='脏(返修)'){ + }else if(index==30&&column.label=='脏(返修)'){ propert = '外观检验_缺陷_脏(返修)'; - }else if(index==30&&column.label=='气泡'){ + }else if(index==32&&column.label=='气泡'){ propert = '外观检验_缺陷_气泡'; - }else if(index==32&&column.label=='浅气泡(B)'){ + }else if(index==34&&column.label=='浅气泡(B)'){ propert = '外观检验_缺陷_浅气泡(B)'; - }else if(index==33&&column.label=='黑圈变形'){ + }else if(index==35&&column.label=='黑圈变形'){ propert = '外观检验_缺陷_黑圈变形'; - }else if(index==34&&column.label=='黑圈缺口'){ + }else if(index==36&&column.label=='黑圈缺口'){ propert = '外观检验_缺陷_黑圈缺口'; - }else if(index==35&&column.label=='重水纹'){ + }else if(index==37&&column.label=='重水纹'){ propert = '外观检验_缺陷_重水纹'; - }else if(index==36&&column.label=='浅水纹(B)'){ + }else if(index==38&&column.label=='浅水纹(B)'){ propert = '外观检验_缺陷_浅水纹(B)'; - }else if(index==37&&column.label=='大崩'){ + }else if(index==39&&column.label=='大崩'){ propert = '外观检验_缺陷_大崩'; - }else if(index==38&&column.label=='小崩边(B)'){ + }else if(index==40&&column.label=='小崩边(B)'){ propert = '外观检验_缺陷_小崩边(B)'; - }else if(index==40&&column.label=='棕点'){ + }else if(index==42&&column.label=='棕点'){ propert = '外观检验_缺陷_棕点'; - }else if(index==41&&column.label=='浅划麻(B)'){ + }else if(index==43&&column.label=='浅划麻(B)'){ propert = '外观检验_缺陷_浅划麻(B)'; - }else if(index==42&&column.label=='双面划麻'){ + }else if(index==44&&column.label=='双面划麻'){ propert = '外观检验_缺陷_双面划麻'; - }else if(index==43&&column.label=='倒角'){ + }else if(index==45&&column.label=='倒角'){ propert = '外观检验_缺陷_倒角'; - }else if(index==44&&column.label=='棕圈'){ + }else if(index==46&&column.label=='棕圈'){ propert = '外观检验_缺陷_棕圈'; - }else if(index==45&&column.label=='蓝圈'){ + }else if(index==47&&column.label=='蓝圈'){ propert = '外观检验_缺陷_蓝圈'; - }else if(index==46&&column.label=='尺寸小'){ + }else if(index==48&&column.label=='尺寸小'){ propert = '外观检验_缺陷_尺寸小'; - }else if(index==47&&column.label=='破损'){ + }else if(index==49&&column.label=='破损'){ propert = '外观检验_缺陷_破损'; - }else if(index==48&&column.label=='发白'){ + }else if(index==50&&column.label=='发白'){ propert = '外观检验_缺陷_发白'; - }else if(index==49&&column.label=='漏光'){ + }else if(index==51&&column.label=='漏光'){ propert = '外观检验_缺陷_漏光'; - }else if(index == 50&&column.label=='返修数'){ + }else if(index == 52&&column.label=='返修数'){ propert = '外观检验_返修_count_real'; - }else if(index==51&&column.label=='合格数'){ + }else if(index==53&&column.label=='合格数'){ propert = '外观检验_返修_count_ok_full'; }else if(column.label=='外观总合格数'){ propert = '外观检验_完全总合格数'; @@ -522,38 +528,38 @@ export default { } } - if(index==4||index==6||index==8||index==10||index==17||index==21){ + if(index==5||index==7||index==9||index==11||index==18||index==22){ if(sums[index-1]){ - sums[index] = ((sums[index-1]/sums[2])*100).toFixed(4); + sums[index] = ((sums[index-1]/sums[3])*100).toFixed(4); }else{ sums[index] = null; } } - if(index==25||index==27||index==29||index==31||index==39){ + if(index==27||index==29||index==31||index==33||index==41){ if(sums[index-1]){ - sums[index] = ((sums[index-1]/sums[23])*100).toFixed(4); + sums[index] = ((sums[index-1]/sums[25])*100).toFixed(4); }else{ sums[index] = null; } } - if(index==52){ - let sum = 0; - if(sums[24]){ - sum += sums[24]; - } - if(sums[51]){ - sum += sums[51]; - } - sums[index] = sum; - } - if(index==53){ - if(sums[52]&&sums[23]){ - sums[index] = ((sums[52]/sums[23])*100).toFixed(2); - } - } if(index==54){ - if(sums[53]&&sums[21]){ - sums[index] = ((sums[53]*sums[21])/100).toFixed(2); + let sum = 0; + if(sums[25]){ + sum += sums[25]; + } + if(sums[53]){ + sum += sums[53]; + } + sums[index] = sum; + } + if(index==55){ + if(sums[54]&&sums[25]){ + sums[index] = ((sums[54]/sums[25])*100).toFixed(2); + } + } + if(index==56){ + if(sums[55]&&sums[22]){ + sums[index] = ((sums[55]*sums[22])/100).toFixed(2); } } }); From 9f66afc6b262a04345bec33d8247b505b8e1c14f Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 09:06:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E5=B7=B2=E6=8F=90=E4=BA=A4=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=AF=A6=E6=83=85=E5=85=B3=E9=97=AD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 7 ++++++- src/views/wpm_bx/mlogs.vue | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index cd642b9d..931df1af 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -3,7 +3,7 @@
@@ -1048,6 +1048,11 @@ export default { }); }) }, + closedPage(){ + let that = this; + that.visible = false; + that.$emit('closed',that.isSubmit); + }, }, }; diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue index 5e6bfae5..437147eb 100644 --- a/src/views/wpm_bx/mlogs.vue +++ b/src/views/wpm_bx/mlogs.vue @@ -374,9 +374,11 @@ export default { } } }, - detailClose() { + detailClose(data) { this.dialog.detail = false; - this.$refs.table.refresh(); + if(data){}else{ + this.$refs.table.refresh(); + } }, table_monitor(row){ let that= this; From cefd2173ff44a0a684521c4f4f0c3b000dbee38e Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 09:30:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=BF=AB=E9=80=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_form2.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/mlog_form2.vue b/src/views/wpm_bx/mlog_form2.vue index f58a2da6..0eb5d3a7 100644 --- a/src/views/wpm_bx/mlog_form2.vue +++ b/src/views/wpm_bx/mlog_form2.vue @@ -463,12 +463,18 @@ export default { that.bwItemForms.forEach(item=>{ item.mlogb = res.mlogbin; }) - that.$API.wpm.mlogbw.create.req(that.bwItemForms).then((res1) => {}) + that.$API.wpm.mlogbw.create.req(that.bwItemForms).then((res1) => { + that.isSaveing = false; + that.$emit("success",res.mlog); + that.visible = false; + that.$message.success("操作成功"); + }) + }else{ + that.isSaveing = false; + that.$emit("success",res.mlog); + that.visible = false; + that.$message.success("操作成功"); } - that.isSaveing = false; - that.$emit("success",res.mlog); - that.visible = false; - that.$message.success("操作成功"); }).catch(()=>{ that.isSaveing = false; }); From 4984c6a9a4f8270a8b41bbc0da238585e71d3496 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 10:11:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:routepack=E6=96=B9=E4=BE=BF=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/routepack_form.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue index d84e9465..79992440 100644 --- a/src/views/mtm/routepack_form.vue +++ b/src/views/mtm/routepack_form.vue @@ -296,6 +296,11 @@ export default { //组件点击下一步 handleNextStep() { let that = this; + // that.routepack = that.form.id; + // that.query.routepack = that.form.id; + // that.apiObj = that.$API.mtm.route.list; + // that.active = 1; + // that.getDEGdatas(); let form = {}; form.name = that.form.name; form.material = that.form.material; From 235e221606bbc01ab83283b65d3097301aa58605 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 13:54:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 61836d5f..3dee7507 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -506,6 +506,7 @@ export default { configData5:{}, scrollNum:0, scrollInterval:null, + reloadInterval:null, //近七天日数组 dayArr:[], visibals0: false, @@ -525,6 +526,7 @@ export default { lineWidth:0, pieHeight:0, lineHeight:0, + timeoutDuration : 86400000, setIntervals:null, }; }, @@ -544,6 +546,38 @@ export default { this.timerTime = setInterval(() => { this.showTime(); }, 1000); + + + let lastActiveTime = new Date().getTime(); + let timer; + // 重置最后活动时间并重启计时器 + function resetActiveTime() { + console.log('用户活动'); + lastActiveTime = new Date().getTime(); + clearTimeout(timer); + timer = setTimeout(checkIdleTime, that.timeoutDuration); + } + // 检查是否超时 + function checkIdleTime() { + let currentTime = new Date().getTime(); + if (currentTime - lastActiveTime > that.timeoutDuration) { + refreshPage(); + } else { + resetActiveTime(); + } + } + // 刷新页面函数 + function refreshPage() { + window.location.reload(true); + } + // 监听所有可能触发用户活动的行为并重置最后活动时间 + document.addEventListener('click', resetActiveTime); + document.addEventListener('keypress', resetActiveTime); + document.addEventListener('scroll', resetActiveTime); + document.addEventListener('mousemove', resetActiveTime); + that.reloadInterval = setInterval(() => { + window.location.reload(true); + },86400000) }, methods: { //初始化视图 @@ -1026,9 +1060,11 @@ export default { clearInterval(that.timerTime); clearInterval(that.scrollInterval); clearInterval(that.setIntervals); + clearInterval(that.reloadInterval); that.timerTime = null; that.scrollInterval = null; that.setIntervals = null; + that.reloadInterval = null; }, beforeDestoryed() { let that = this; @@ -1036,9 +1072,11 @@ export default { clearInterval(that.timerTime); clearInterval(that.scrollInterval); clearInterval(that.setIntervals); + clearInterval(that.reloadInterval); that.timerTime = null; that.scrollInterval = null; that.setIntervals = null; + that.reloadInterval = null; }, }; From 89bd60c5472e8fc397255208b11f7592dc6d1fbe Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 15:21:54 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/clock_record.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/hrm/clock_record.vue b/src/views/hrm/clock_record.vue index 53f47516..f1749087 100644 --- a/src/views/hrm/clock_record.vue +++ b/src/views/hrm/clock_record.vue @@ -102,7 +102,6 @@ import config from "@/config" import * as XLSX2 from "xlsx"; import * as XLSX from "xlsx-style"; - import { fill } from "lodash"; export default { name: "clock_record", components: {}, From 3b444b427e69f8b231a62a83bc537dd6505c0819 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Sep 2025 15:22:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package.json b/package.json index 5d14edbf..ebf02feb 100644 --- a/package.json +++ b/package.json @@ -13,37 +13,29 @@ "@tinymce/tinymce-vue": "5.0.0", "animate.css": "^4.1.1", "axios": "1.3.4", - "babylon": "^6.18.0", "babylonjs": "^6.46.0", "babylonjs-gui": "^6.46.0", "babylonjs-loaders": "^6.46.0", "cesium": "^1.126.0", "codemirror": "^5.65.17", "codemirror-editor-vue3": "^2.7.0", - "compression-webpack-plugin": "^11.1.0", "copy-webpack-plugin": "^12.0.2", "core-js": "3.29.0", "cropperjs": "1.5.13", "crypto-browserify": "^3.12.0", "crypto-js": "4.1.1", "d3": "^7.6.1", - "dagre": "^0.8.5", "dagre-d3": "^0.6.4", "dhtmlx-gantt": "^8.0.6", "echarts": "^5.5.1", "element-plus": "^2.8.4", - "file-saver": "^2.0.5", "html2canvas": "^1.4.1", "json-editor-vue3": "^1.0.6", "jspdf": "^2.5.1", - "moment": "^2.30.1", "node-polyfill-webpack-plugin": "^4.0.0", "nprogress": "0.2.0", - "path": "^0.12.7", - "print-js": "^1.6.0", "qrcodejs2": "0.0.2", "sortablejs": "1.15.0", - "three": "^0.155.0", "tinymce": "6.3.2", "vue": "3.2.47", "vue-i18n": "9.2.2",