From f0f4d795852b52061949103a67ab5bfc970e602f Mon Sep 17 00:00:00 2001 From: tdg930622 <51816549+tdg930622@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:20:20 +0800 Subject: [PATCH 01/11] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=8F=90=E5=89=8D=E6=8F=90=E9=86=92=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 9 + src/pages/layout/components/LayoutHeader.vue | 879 +++++++++--------- src/pages/login/index.vue | 9 + .../components/MediationRoom.vue | 14 + src/store/index.js | 4 + 5 files changed, 494 insertions(+), 421 deletions(-) diff --git a/src/App.vue b/src/App.vue index e662242..ada34da 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,10 +33,19 @@ export default { methods: { socketSucc(frame) { console.log(frame, '---初始化成功app') + // '/user/'+userId+'/queue/video' + let userInfo = JSON.parse(sessionStorage.getItem('userInfo')) + let url = `/user/${userInfo.phone}/queue/video` + // console.log(url, '---订阅地址') + this.$stompSocket.subscription(url, this.receivePush) }, socketErr(frame) { console.log(frame, '---初始化失败app') }, + receivePush(message) { + console.log(message, '---接收订阅消息') + // this.$store.commit('setVideoReminder', JSON.stringify(message)) + }, scriptWithDataSetExists(dataId) { const scriptElement = document.querySelector(`script[data-telephone="${dataId}"]`); return scriptElement !== null; diff --git a/src/pages/layout/components/LayoutHeader.vue b/src/pages/layout/components/LayoutHeader.vue index 6f3f741..ab258b9 100644 --- a/src/pages/layout/components/LayoutHeader.vue +++ b/src/pages/layout/components/LayoutHeader.vue @@ -1,447 +1,484 @@ \ No newline at end of file diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 1150ad9..770f2e9 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -306,9 +306,18 @@ export default { socketSucc(frame) { console.log(frame, '---初始化成功login') + // '/user/'+userId+'/queue/video' + let userInfo = JSON.parse(sessionStorage.getItem('userInfo')) + let url = `/user/${userInfo.phone}/queue/video` + // console.log(url, '---订阅地址') + this.$stompSocket.subscription(url, this.receivePush) }, socketErr(frame) { console.log(frame, '---初始化失败login') + }, + receivePush(message) { + console.log(message, '---接收订阅消息') + // this.$store.commit('setVideoReminder', JSON.stringify(message)) } } } diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 2f155fc..67205f4 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -223,6 +223,7 @@ - \ No newline at end of file diff --git a/src/pages/payment-receipt/components/CaseTraceDialog.vue b/src/pages/payment-receipt/components/CaseTraceDialog.vue deleted file mode 100644 index dad3e7f..0000000 --- a/src/pages/payment-receipt/components/CaseTraceDialog.vue +++ /dev/null @@ -1,179 +0,0 @@ - - - - diff --git a/src/pages/payment-receipt/components/RepaymentRecordDialog.vue b/src/pages/payment-receipt/components/RepaymentRecordDialog.vue deleted file mode 100644 index 9916848..0000000 --- a/src/pages/payment-receipt/components/RepaymentRecordDialog.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/components/addCaseDialog.vue b/src/pages/payment-receipt/components/addCaseDialog.vue deleted file mode 100644 index 9f799a2..0000000 --- a/src/pages/payment-receipt/components/addCaseDialog.vue +++ /dev/null @@ -1,750 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/components/caseAllocationDialog.vue b/src/pages/payment-receipt/components/caseAllocationDialog.vue deleted file mode 100644 index 2a99401..0000000 --- a/src/pages/payment-receipt/components/caseAllocationDialog.vue +++ /dev/null @@ -1,393 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/components/editCaseDrawer.vue b/src/pages/payment-receipt/components/editCaseDrawer.vue deleted file mode 100644 index d31c9e2..0000000 --- a/src/pages/payment-receipt/components/editCaseDrawer.vue +++ /dev/null @@ -1,836 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/components/importCaseDialog.vue b/src/pages/payment-receipt/components/importCaseDialog.vue deleted file mode 100644 index 1d38b71..0000000 --- a/src/pages/payment-receipt/components/importCaseDialog.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/index.vue b/src/pages/payment-receipt/index.vue index 2fd143c..ae06291 100644 --- a/src/pages/payment-receipt/index.vue +++ b/src/pages/payment-receipt/index.vue @@ -251,9 +251,15 @@ import smapi from "@/services/systemManage"; jumpUrl (url) { this.$router.push(url); }, - handleCaseShow(scope){ - this.fileDialog = {showfile:{url:scope.row.proofUrl},filelist:[]} + async handleCaseShow(scope){ + let previewUrl = await this.getProofFile(scope.row.proofUrl) + this.fileDialog = {showfile:{url:previewUrl},filelist:[]} }, + async getProofFile(url){ + let previewUrl = await this.$fetchApi.viewFullFile({path: url}) + return previewUrl + }, + UpdateClick(scope){ this.UpdateDialog = scope.row this.UpdateDialog.paybackTime = scope.row.actualPayDate From 93807b701f62bce37b7a13b3c3f57ccc33b3f98b Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Mon, 20 Jan 2025 11:38:50 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RepaymentRecordDialog.vue | 2 +- .../components/addCaseDialog.vue | 750 ------------------ .../case-package/components/addCaseDialog.vue | 29 +- .../components/addCaseDialog.vue | 692 ---------------- .../components/caseAllocationDialog.vue | 392 --------- .../components/importPackageDialog.vue | 209 ----- src/pages/payment-receipt/index.vue | 2 +- 7 files changed, 16 insertions(+), 2060 deletions(-) delete mode 100644 src/pages/case-management/components/addCaseDialog.vue delete mode 100644 src/pages/mediation-package/components/addCaseDialog.vue delete mode 100644 src/pages/mediation-package/components/caseAllocationDialog.vue delete mode 100644 src/pages/mediation-package/components/importPackageDialog.vue diff --git a/src/pages/case-management/components/RepaymentRecordDialog.vue b/src/pages/case-management/components/RepaymentRecordDialog.vue index 64b4fd5..0f84489 100644 --- a/src/pages/case-management/components/RepaymentRecordDialog.vue +++ b/src/pages/case-management/components/RepaymentRecordDialog.vue @@ -80,7 +80,7 @@ import api from "@/services/caseManagement"; }, async handleCaseShow(scope){ let previewUrl = await this.getProofFile(scope.row.proofUrl) - this.fileDialog = {showfile:{url:previewUrl},filelist:[]} + this.fileDialog = {showfile:{fullUrl:previewUrl,url:scope.row.proofUrl},filelist:[]} }, async getProofFile(url){ let previewUrl = await this.$fetchApi.viewFullFile({path: url}) diff --git a/src/pages/case-management/components/addCaseDialog.vue b/src/pages/case-management/components/addCaseDialog.vue deleted file mode 100644 index 9f799a2..0000000 --- a/src/pages/case-management/components/addCaseDialog.vue +++ /dev/null @@ -1,750 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/case-package/components/addCaseDialog.vue b/src/pages/case-package/components/addCaseDialog.vue index 1843457..7ac6676 100644 --- a/src/pages/case-package/components/addCaseDialog.vue +++ b/src/pages/case-package/components/addCaseDialog.vue @@ -62,7 +62,7 @@ > - + + + + -
- -
-
基本信息
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
- -
-
案件当事人
-
-
-
-
申请人
-
清空
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
被申请人
- 新增被申请人 -
- -
- -
-
-
被申请人{{inx+1}}
-
删除
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
-
-
- -
-
证据材料
-
- - -
-
- -
- - - -
- - - - 取消 - 上一步 - - 下一步 - 确认 - - - - - - - - \ No newline at end of file diff --git a/src/pages/mediation-package/components/caseAllocationDialog.vue b/src/pages/mediation-package/components/caseAllocationDialog.vue deleted file mode 100644 index 3be3f19..0000000 --- a/src/pages/mediation-package/components/caseAllocationDialog.vue +++ /dev/null @@ -1,392 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/mediation-package/components/importPackageDialog.vue b/src/pages/mediation-package/components/importPackageDialog.vue deleted file mode 100644 index 4f12597..0000000 --- a/src/pages/mediation-package/components/importPackageDialog.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - \ No newline at end of file diff --git a/src/pages/payment-receipt/index.vue b/src/pages/payment-receipt/index.vue index ae06291..9c7c7d0 100644 --- a/src/pages/payment-receipt/index.vue +++ b/src/pages/payment-receipt/index.vue @@ -253,7 +253,7 @@ import smapi from "@/services/systemManage"; }, async handleCaseShow(scope){ let previewUrl = await this.getProofFile(scope.row.proofUrl) - this.fileDialog = {showfile:{url:previewUrl},filelist:[]} + this.fileDialog = {showfile:{fullUrl:previewUrl,url:scope.row.proofUrl},filelist:[]} }, async getProofFile(url){ let previewUrl = await this.$fetchApi.viewFullFile({path: url}) From 8da38ba732540b5366c39b69ba3ade97536dadad Mon Sep 17 00:00:00 2001 From: tdg930622 <51816549+tdg930622@users.noreply.github.com> Date: Mon, 20 Jan 2025 12:03:12 +0800 Subject: [PATCH 08/11] tj --- src/App.vue | 2 +- .../components/MediationRoom.vue | 43 ++++++++++++++++--- .../components/missedCallPopover.vue | 39 +++++++++++++++++ .../components/videoReminderPopover.vue | 38 ++++++++++++++++ 4 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 src/pages/mediation-page/components/missedCallPopover.vue create mode 100644 src/pages/mediation-page/components/videoReminderPopover.vue diff --git a/src/App.vue b/src/App.vue index ada34da..9c8e900 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default { }, receivePush(message) { console.log(message, '---接收订阅消息') - // this.$store.commit('setVideoReminder', JSON.stringify(message)) + this.$store.commit('setVideoReminder', message.body) }, scriptWithDataSetExists(dataId) { const scriptElement = document.querySelector(`script[data-telephone="${dataId}"]`); diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 67205f4..35ca9cf 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -115,12 +115,31 @@
- - - - - - + + + + +
{{missedCallData.list.length}}
+ + + + + + + +
1
+ +
@@ -234,6 +253,9 @@ export default { singlesmsPopover: () => import('./singlesmsPopover.vue'),//发送短信 VideoRoom: () => import('./VideoRoom'), LayoutContentNew: () => import('./LayoutContentNew'),//调解数据 + + missedCallPopover: () => import('./missedCallPopover'),//来电 + videoReminderPopover: () => import('./videoReminderPopover'),//视频 }, data() { return { @@ -345,6 +367,15 @@ export default { elapsedTime: 0, timerInterval: null, isRunning: false, + + // 未接来电 + missedCallVisible: false, + missedCallData: { + list: [] + }, + // 视频提醒 + videoReminderVisible: false, + videoReminderData: {} }; }, computed: { diff --git a/src/pages/mediation-page/components/missedCallPopover.vue b/src/pages/mediation-page/components/missedCallPopover.vue new file mode 100644 index 0000000..87bd20f --- /dev/null +++ b/src/pages/mediation-page/components/missedCallPopover.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mediation-page/components/videoReminderPopover.vue b/src/pages/mediation-page/components/videoReminderPopover.vue new file mode 100644 index 0000000..b52e68f --- /dev/null +++ b/src/pages/mediation-page/components/videoReminderPopover.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file From 4fe54341cf567d771dc5a8836aee9347f0207168 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Mon, 20 Jan 2025 13:36:27 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LayoutContentNew.vue | 2 +- .../mediation-page/components/SidebarTool.vue | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/pages/mediation-page/components/LayoutContentNew.vue b/src/pages/mediation-page/components/LayoutContentNew.vue index 3732e37..7f44b7d 100644 --- a/src/pages/mediation-page/components/LayoutContentNew.vue +++ b/src/pages/mediation-page/components/LayoutContentNew.vue @@ -445,7 +445,7 @@ export default { }) }, handleCaseShowFile(item) { - //还款凭证相关 + //查看录音录像文件相关 this.$fetchApi.viewFullFile({path: item}).then((res) => { this.fileDialog = {showfile: {url: item,fullUrl: res}, filelist: []} }); diff --git a/src/pages/mediation-page/components/SidebarTool.vue b/src/pages/mediation-page/components/SidebarTool.vue index 0012718..345c712 100644 --- a/src/pages/mediation-page/components/SidebarTool.vue +++ b/src/pages/mediation-page/components/SidebarTool.vue @@ -52,7 +52,10 @@
通话{{itemrecord.linkedDuration}}秒
-
播放录音
+
+ 播放录音 {{index > 0 ? index : ''}} +
+
沟通备注：{{itemrecord.communicationRemarks}}
@@ -130,7 +133,10 @@
视频{{itemrecord.linkedDuration}}秒
-
播放视频
+
+ 播放视频 {{index > 0 ? index : ''}} +
+
@@ -283,6 +289,8 @@ + + @@ -293,6 +301,7 @@ import contactPerson from "@/services/contactPerson"; export default { name: "SidebarTool", components: { + showFile: () => import('../../../components/showFile.vue'),// uploadFile: () => import('@/components/uploadFile.vue'),//上传 }, props: { @@ -306,6 +315,7 @@ export default { }, data(){ return{ + fileDialog:null, materialTypeOptions: this.$util.getMediationprogress(), rightActive: 0, imgPdf: require('@/assets/image/util/pdf_img.jpg'), @@ -437,6 +447,12 @@ export default { } }) }, + handleCaseShowFile(item) { + //查看录音录像文件相关 + this.$fetchApi.viewFullFile({path: item}).then((res) => { + this.fileDialog = {showfile: {url: item,fullUrl: res}, filelist: []} + }); + }, } } From 2f8994ba58c08112ec9c62f640fd694f053e3bc0 Mon Sep 17 00:00:00 2001 From: tdg930622 <51816549+tdg930622@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:08:42 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/index.vue | 2 +- src/pages/mediation-page/components/MediationRoom.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 770f2e9..3b6d414 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -317,7 +317,7 @@ export default { }, receivePush(message) { console.log(message, '---接收订阅消息') - // this.$store.commit('setVideoReminder', JSON.stringify(message)) + this.$store.commit('setVideoReminder', message.body) } } } diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 35ca9cf..fc66a57 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -418,6 +418,7 @@ export default { handler: function (val) { if (val){ console.log(val, '---视频提前5分钟提醒') + this.videoReminderData = JSON.parse(val) } } } From 5d050e83e2826b0ae129388b597928682f1bcc9a Mon Sep 17 00:00:00 2001 From: tdg930622 <51816549+tdg930622@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:17:03 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediation-page/components/MediationRoom.vue | 16 ++++++++++++++++ .../components/missedCallPopover.vue | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index fc66a57..ef6836e 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -750,6 +750,22 @@ export default { box-shadow: 0 2px 12px 0 rgba(0,0,0,.1); .btn-group-real-time{ width: 64px; + .ell-warn-dot{ + background-color: #f56c6c; + border-radius: 11px; + color: #fff; + display: inline-block; + font-size: 12px; + line-height: 17px; + height: 18px; + padding: 0 6px; + text-align: center; + border: 1px solid #fff; + position: absolute; + top: 0; + right: 10px; + transform: translateY(-50%) translateX(100%); + } } .btn-group-interval{ width: 1px; diff --git a/src/pages/mediation-page/components/missedCallPopover.vue b/src/pages/mediation-page/components/missedCallPopover.vue index 87bd20f..54afb54 100644 --- a/src/pages/mediation-page/components/missedCallPopover.vue +++ b/src/pages/mediation-page/components/missedCallPopover.vue @@ -18,7 +18,7 @@ export default { name: "missedCallPopover", props: { missedCallList: { - type: {}, + type: Object, default: () => { return {} },