From 38c750d711380d0973a2863458b0c8518670685d Mon Sep 17 00:00:00 2001 From: gyj Date: Tue, 23 Apr 2024 17:31:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B0=83=E8=A7=A3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home.js | 6 +- src/views/components/roomFooter.vue | 12 +- src/views/room.vue | 195 +++++++++++++++++++++++++--- src/views/testRoom.vue | 5 + 4 files changed, 199 insertions(+), 19 deletions(-) diff --git a/src/api/home.js b/src/api/home.js index c28c1976..5ffd000f 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -1,6 +1,6 @@ import axios from "@/utils/request"; // let baseUrlZc = 'https://api.xayunmei.com/zhongcaiapi'; -// let baseUrl = 'https://api.xayunmei.com/tiaojieapitest'; +let baseUrl = 'https://api.xayunmei.com/tiaojieapitest'; // let baseUrl = 'http://172.16.1.4:6001'; // 获取usersig export function getUsersig(userId) { @@ -46,3 +46,7 @@ export function msCaseSign(data) { export function fileList(caseAppliId,annexTypeList) { return axios.get(`tiaojie/common/fileList?caseAppliId=${caseAppliId}&annexTypeList=${annexTypeList}`); } +// 确定会议结果 +export function confirmMeetingResult(data) { + return axios.post(`tiaojie/caseApplication/confirmMeetingResult`, data); +} diff --git a/src/views/components/roomFooter.vue b/src/views/components/roomFooter.vue index 70a09402..90d32be8 100644 --- a/src/views/components/roomFooter.vue +++ b/src/views/components/roomFooter.vue @@ -56,6 +56,10 @@ v-else @click="sharClickOff" /> + + +
+ 调解
@@ -107,6 +111,10 @@ export default { this.sharFlag = true; this.$emit("sharClickOff"); }, + // 弹出调解内容 + mediationPop(){ + this.$emit("mediationPop"); + }, exitRoom() { if (this.roleFlag) { this.stopVideoFn(); @@ -194,7 +202,9 @@ export default { height: 60px; margin-left: 20px; } - +.mediationPop{ + margin-left: 20px; +} .micImg, .videoImg, .sharImg { diff --git a/src/views/room.vue b/src/views/room.vue index df64a866..5e442369 100644 --- a/src/views/room.vue +++ b/src/views/room.vue @@ -36,6 +36,7 @@ @videoClickOff="videoClickOff" @sharClickOn="sharClickOn" @sharClickOff="sharClickOff" + @mediationPop="mediationPop" :roomId="roomId" :micFlag="micFlag" :videoFlag="videoFlag" @@ -63,7 +64,7 @@ -
+
- + --> 确认修改内容
+ + +
+ + 申请人上传证据 + + + 被申请人上传证据 + + + 上传调解书 + +
+
+
+
申请人证据
+
+ {{ item.annexName }} +
+
+
+
被申请人证据
+
+ {{ item.annexName }} +
+
+
+
调解书
+
+ {{ item.annexName }} +
+
+
+
+ + + + + 达成调解 + 未达成调解 + 未达成调解但不在争议 + 未达成调解但同意引入仲裁 + 达成和解 + + + + + + + 是 + 否 + + + + +
+
+ 确定 +
+