From 6358b5bbfaeaef67883fe9fd7daf0814a613efb8 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 10:23:24 +0800 Subject: [PATCH 1/6] =?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/case-management/index.vue | 3 +-- src/pages/mediation-page/components/VideoInvitation.vue | 1 + src/pages/mediation-page/components/VideoRoom.vue | 2 +- src/utils/util.js | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/case-management/index.vue b/src/pages/case-management/index.vue index bba1b13..7199c4c 100644 --- a/src/pages/case-management/index.vue +++ b/src/pages/case-management/index.vue @@ -378,8 +378,7 @@ import { values } from "lodash"; //调解进度 MediateProgEnum:this.$util.getMediationprogress(), //调解状态 - MediateStatusEnum:[{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2}, - {label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}], + MediateStatusEnum:this.$util.getMediationType(), showSearch: true, queryDate: '', activeUsage: '', diff --git a/src/pages/mediation-page/components/VideoInvitation.vue b/src/pages/mediation-page/components/VideoInvitation.vue index 7a9b7f9..9518099 100644 --- a/src/pages/mediation-page/components/VideoInvitation.vue +++ b/src/pages/mediation-page/components/VideoInvitation.vue @@ -82,6 +82,7 @@ diff --git a/src/pages/mediation-page/components/VideoRoom.vue b/src/pages/mediation-page/components/VideoRoom.vue index 70b2d0f..ae87678 100644 --- a/src/pages/mediation-page/components/VideoRoom.vue +++ b/src/pages/mediation-page/components/VideoRoom.vue @@ -6,7 +6,7 @@
{{ formattedTime }}
-
退出房间
diff --git a/src/utils/util.js b/src/utils/util.js index 3247aa5..27f7831 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -434,7 +434,8 @@ const util = { */ getMediationType() { return [{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2}, - {label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}] + {label:'已签署协议',value:3},{label:'协议已签章',value:4},{label:'调解成功',value:5}, + {label:'调解失败',value:6}] }, /** * 根据不同的类型返回不同的调解状态 this.$util.getMediationprogressData @@ -449,9 +450,10 @@ const util = { case 0: // 预警 return {key:2,label:this.getMediationType().find(item => item.value == value).label}; - case 4: + case 6: // 高预警 return {key:1,label:this.getMediationType().find(item => item.value == value).label}; + case 4: case 5: // 成功 return {key:3,label:this.getMediationType().find(item => item.value == value).label}; From 0690f25351fc536a1348f32507037966ac515b92 Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 10:32:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?UI=E8=89=B2=E5=BD=A9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/workbench/case-manage/index.vue | 4 ++-- src/pages/workbench/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workbench/case-manage/index.vue b/src/pages/workbench/case-manage/index.vue index 03b8ed1..9564582 100644 --- a/src/pages/workbench/case-manage/index.vue +++ b/src/pages/workbench/case-manage/index.vue @@ -613,7 +613,7 @@ } .case-pro3 { - background-image: linear-gradient(to right,#ffd900,#ff0000cb) + background-image: linear-gradient(to right,#ffd900,#f09d9d80) } .case-pro4 { @@ -625,7 +625,7 @@ } .case-pro6 { - background-image: linear-gradient(to right,#b0d65e,#dbf41e) + background-image: linear-gradient(to right,#b0d65e,#9aad09) } .case-pro7 { diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue index 5683d5a..4256a28 100644 --- a/src/pages/workbench/index.vue +++ b/src/pages/workbench/index.vue @@ -687,7 +687,7 @@ } .case-pro3 { - background-image: linear-gradient(to right,#ffd900,#ff0000cb) + background-image: linear-gradient(to right,#ffd900,#f09d9d80) } .case-pro4 { @@ -699,7 +699,7 @@ } .case-pro6 { - background-image: linear-gradient(to right,#b0d65e,#dbf41e) + background-image: linear-gradient(to right,#b0d65e,#9aad09) } .case-pro7 { From 5a32ab5f24ee931077b86408b4f09fb913d39d7f Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 10:48:10 +0800 Subject: [PATCH 3/6] =?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/caseVideoReservationDialog.vue | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/pages/mediation-page/components/caseVideoReservationDialog.vue b/src/pages/mediation-page/components/caseVideoReservationDialog.vue index 88aed1c..cb42cb0 100644 --- a/src/pages/mediation-page/components/caseVideoReservationDialog.vue +++ b/src/pages/mediation-page/components/caseVideoReservationDialog.vue @@ -20,7 +20,7 @@
-
+
{{item.bookingTime}}
@@ -32,7 +32,21 @@ 已取消 已过期
-
+
+
+ {{item.bookingTime}} +
+ + 未开始 + 进行中 + 已结束 + 视频失败 + 已取消 + 已过期 +
+ + +
Date: Wed, 26 Feb 2025 10:55:30 +0800 Subject: [PATCH 4/6] =?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/voideDialog.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/event-tracing/components/voideDialog.vue b/src/pages/event-tracing/components/voideDialog.vue index 19718ae..4d124f9 100644 --- a/src/pages/event-tracing/components/voideDialog.vue +++ b/src/pages/event-tracing/components/voideDialog.vue @@ -66,7 +66,10 @@ @@ -358,6 +358,7 @@ export default { const { userId, streamType } = event; try { let obj = this.arrPersonnel.find(item => item.phone === userId) + console.log(obj, '---obj远端进入房间') let data = { id: `${userId}_main`, name: obj.name, diff --git a/src/pages/mediation-page/components/cassWrit.vue b/src/pages/mediation-page/components/cassWrit.vue index 9f567b3..4f0d102 100644 --- a/src/pages/mediation-page/components/cassWrit.vue +++ b/src/pages/mediation-page/components/cassWrit.vue @@ -56,7 +56,7 @@ handleBy 操作人 handleTime 操作时间 --> {{item.handleBy}}  {{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}} -
+
签字
{{item1.signName}} From 3a4088839a25617f495bfda912e5174c111daa0f Mon Sep 17 00:00:00 2001 From: liuxi <357439530@qq.com> Date: Wed, 26 Feb 2025 14:57:24 +0800 Subject: [PATCH 6/6] =?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/contactPersonDialog.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pages/mediation-page/components/contactPersonDialog.vue b/src/pages/mediation-page/components/contactPersonDialog.vue index f64d09e..0b3f31e 100644 --- a/src/pages/mediation-page/components/contactPersonDialog.vue +++ b/src/pages/mediation-page/components/contactPersonDialog.vue @@ -20,9 +20,10 @@ - + @@ -156,15 +157,15 @@ export default { return { diglogType: '', relationOptions: [ - {label: '本人', value: '本人'}, - {label: '父母', value: '父母'}, - {label: '配偶', value: '配偶'}, - {label: '子女', value: '子女'}, - {label: '其他', value: '其他'}, - {label: '朋友', value: '朋友'}, - {label: '兄弟', value: '兄弟'}, - {label: '同事', value: '同事'}, - {label: '同学', value: '同学'} + {label: '本人', value: '本人',disabled:true}, + {label: '父母', value: '父母',disabled:false}, + {label: '配偶', value: '配偶',disabled:false}, + {label: '子女', value: '子女',disabled:false}, + {label: '其他', value: '其他',disabled:false}, + {label: '朋友', value: '朋友',disabled:false}, + {label: '兄弟', value: '兄弟',disabled:false}, + {label: '同事', value: '同事',disabled:false}, + {label: '同学', value: '同学',disabled:false} ], respondentObj: { caseId: '',