From a12095b0ea33626b860379920ebca13e373ed65b Mon Sep 17 00:00:00 2001 From: tangchengming <445785772@qq.com> Date: Fri, 14 Feb 2025 14:17:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9D=90=E5=B8=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81UI=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/image/arrange.png | Bin 0 -> 340 bytes src/assets/image/busy.png | Bin 0 -> 301 bytes src/assets/image/free.png | Bin 0 -> 319 bytes src/assets/image/notReady.png | Bin 0 -> 310 bytes src/assets/image/rest.png | Bin 0 -> 251 bytes src/assets/style/common.scss | 4 +- src/pages/layout/components/LayoutHeader.vue | 42 +++++++++++++------ 7 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 src/assets/image/arrange.png create mode 100644 src/assets/image/busy.png create mode 100644 src/assets/image/free.png create mode 100644 src/assets/image/notReady.png create mode 100644 src/assets/image/rest.png diff --git a/src/assets/image/arrange.png b/src/assets/image/arrange.png new file mode 100644 index 0000000000000000000000000000000000000000..a74605096daffb5dcb3bf766de18c0db5216b1c3 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{!336$B+ufqmvqWn+yb8qtzJHGv+XuAK*=3 zy6Iq^z*5TOc7eA?SVFylw}9#O{wK}iIZaZ+`jwge+3UXBn?Adr_`CPJ-O){HRm|1d zxu<7cO@At!6=x>Me``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{vl5n$B+ufrNIYzn+m>Ar5?Rr33hGnyF!MW?@dQa4+^V?`W zQH!~n#9_Cnw%MFZT;`!Y_b%yc=UjPD?+SRW{9(}_fp^E}RlJufUA+H-hn?F8$+dTa t4?U`%af9cwjI`Qxi#3;?CjCBgjK83P|3t5iqb|@l44$rjF6*2UngE1La8m#P literal 0 HcmV?d00001 diff --git a/src/assets/image/free.png b/src/assets/image/free.png new file mode 100644 index 0000000000000000000000000000000000000000..200fa6488ad25ea4e4c5acd9a3cabe375aef8daf GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{uNIb$B+ufslgWon-zF?=ly@n(RYFO6_D_~ z!dW6>o?*U1`T^T6#@e0Ta=Dxd@8&tx@XO7R2s&h0eze>1*o@X9=0j2yOxg*oenq8T zHXRQX`S{EyJ*I=;j<1p#8uqjF%WviP zyvh5&N~rUri(;wN!qXa0CklyuPb-QuUK?dR^GMQE9`m(+cIyooJq@qk+X3_+gQu&X J%Q~loCIAA@bw&UH literal 0 HcmV?d00001 diff --git a/src/assets/image/notReady.png b/src/assets/image/notReady.png new file mode 100644 index 0000000000000000000000000000000000000000..96348928c72ef5bc7e6423bdd1d2300d4520c1aa GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{%KDa$B+ufvy&e3HW>)CRv-Ic#%$$eK0&aA z#k_#Ikjbrp)dZ!I>haQd(Dv9-B^6 z{eMLGgz(Xr^q6zAo<(F7JT_F5c=Kbjtn2cFr|rtvZ8nxo_ii;?di##ck)760kEbfF z_fQl~;L|E#HC}Ku`^?=JO>FsYcUH=V$_jlG^DixJPGFyqwF~Gi22WQ%mvv4FO#l!H BZqEP! literal 0 HcmV?d00001 diff --git a/src/assets/image/rest.png b/src/assets/image/rest.png new file mode 100644 index 0000000000000000000000000000000000000000..9f37633a159958b153c10bad68a658209b9faec4 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{sd1K$B+uft&;+I8w_|{teY5A6j(Vu4lsH+ z2niK1@R^A;G#CDDGHLDAjrlZb>DzU=L5uc3*_;1&>9fLGf4vw{!rv zMOtd@%8HN!QpskCYs_>sg4eUXurfNyc2oGs3Z5tGr%WuEem>w*exXsybjQhkrZCG= s-v --> -
+
+ {{ userInfo.realName || userInfo.showName || '-' }} +
+
+ +
+ + + {{agentStatusName}} + +
+ + + 空闲 + + + 忙碌 + + + 话后整理 + + + 示忙 + + + 小休 + + +
- - - {{agentStatusName}} - - - 空闲 - 忙碌 - 话后整理 - 示忙 - 小休 - - +
@@ -204,7 +204,7 @@ import api from "@/services/eventTracingApi"; type: "warning", }).then(() => { if(!this.$clickThrottle()) { return }//防止重复点击 - api.posttrace_generate_retryl({id: row.id}).then(res => { + api.posttrace_generate_cancel({id: row.id}).then(res => { this.getList(1); this.$message.success("成功"); }) diff --git a/src/pages/mediation-page/components/cassWrit.vue b/src/pages/mediation-page/components/cassWrit.vue index 3fd3011..a1a489b 100644 --- a/src/pages/mediation-page/components/cassWrit.vue +++ b/src/pages/mediation-page/components/cassWrit.vue @@ -168,7 +168,6 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { - if(!this.$clickThrottle()) { return }//防止重复点击 let data = {id: item.generateLogId} caseManagement.traceGenerateRetry(data).then((res) => { this.$message.success("重新生成文件成功"); @@ -182,7 +181,6 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { - if(!this.$clickThrottle()) { return }//防止重复点击 let data = {id: item.generateLogId} caseManagement.traceGenerateDelete(data).then((res) => { this.$message.success("文书删除成功"); diff --git a/src/services/eventTracingApi.js b/src/services/eventTracingApi.js index 11897e9..b526d2e 100644 --- a/src/services/eventTracingApi.js +++ b/src/services/eventTracingApi.js @@ -51,10 +51,10 @@ const traceApi = { }, // 文书生成-批量重试 posttrace_generate_retryl: data => { - return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-retryl`, data) + return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-retry`, data) }, // 文书生成-批量取消 - posttrace_generate_retryl: data => { + posttrace_generate_cancel: data => { return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-cancel`, data) }, From 1668a1dcee14d86f94aa46d5f69b8505102298d5 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Fri, 14 Feb 2025 16:53:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/event-tracing/components/officeWriteDialog.vue | 7 ++++--- .../mediation-management/components/batchofficeWDialog.vue | 5 ++++- .../mediation-page/components/singleofficeWritPopover.vue | 5 ++++- src/utils/util.js | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/pages/event-tracing/components/officeWriteDialog.vue b/src/pages/event-tracing/components/officeWriteDialog.vue index ec74f5e..937dd94 100644 --- a/src/pages/event-tracing/components/officeWriteDialog.vue +++ b/src/pages/event-tracing/components/officeWriteDialog.vue @@ -78,7 +78,8 @@ @@ -93,8 +94,8 @@ diff --git a/src/pages/mediation-management/components/batchofficeWDialog.vue b/src/pages/mediation-management/components/batchofficeWDialog.vue index 291338f..b53a7ca 100644 --- a/src/pages/mediation-management/components/batchofficeWDialog.vue +++ b/src/pages/mediation-management/components/batchofficeWDialog.vue @@ -109,7 +109,10 @@ import api from "@/services/caseManagement"; const year = nextDate.getFullYear(); const month = (nextDate.getMonth() + 1).toString().padStart(2, '0'); const day = nextDate.getDate().toString().padStart(2, '0'); - this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+ + nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0'); + // this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime this.ObjectInfo.caseIdList = this.eventTraDialog.caseids; api.traceSignBatchCreate(this.ObjectInfo).then((res) => { diff --git a/src/pages/mediation-page/components/singleofficeWritPopover.vue b/src/pages/mediation-page/components/singleofficeWritPopover.vue index 813a339..304370b 100644 --- a/src/pages/mediation-page/components/singleofficeWritPopover.vue +++ b/src/pages/mediation-page/components/singleofficeWritPopover.vue @@ -115,7 +115,10 @@ import api from "@/services/caseManagement"; const year = nextDate.getFullYear(); const month = (nextDate.getMonth() + 1).toString().padStart(2, '0'); const day = nextDate.getDate().toString().padStart(2, '0'); - this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+ + nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0'); + // this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59' + this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime this.ObjectInfo.caseId = this.caseId api.traceSignCreate(this.ObjectInfo).then((res) => { diff --git a/src/utils/util.js b/src/utils/util.js index 7d904ae..c236f7a 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -370,6 +370,13 @@ const util = { const day = date.getDate().toString().padStart(2, '0'); // 日期前面补0 return `${year}-${month}-${day}`; }, + + // 和当前时间对比，判断是否大于当前时间 + getTimeContrast(timeString) { + const timedate = moment(timeString); + return timedate > new Date() + }, + // {{scope.row.linkedSituation == 2 ?'':''}} // {{scope.row.linkedSituation == 3 ?'':''}} // {{scope.row.linkedSituation == 4 ?'':''}}