diff --git a/.gitignore b/.gitignore
index 1545149e..26c90e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,10 @@ pnpm-debug.log*
 *.sln
 *.sw?
 node_modules
+<<<<<<< HEAD
 node_modules
 node_modules
 node_modules
+=======
+>>>>>>> ce7123d0f78fb925333f45cb0f43791061dc0431
 /dist
diff --git a/src/api/home.js b/src/api/home.js
index 9a24f42e..e49c3024 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -32,5 +32,17 @@ export function reserveConferenceList(caseId) {
 }
 //根据id查询密文信息
 export function getEncryptInfoByid(caseId) {
-        return axios.get(`tiaojie/shortMessage/getMeetingInfo?authId=${caseId}`);
-}
\ No newline at end of file
+        return axios.get(`${baseUrl}/shortMessage/getMeetingInfo?authId=${caseId}`);
+}
+// 案件列表
+export function caseApplicationList(param) {
+    return axios.get(`${baseUrl}/caseApplication/list?caseId=${param}`);
+  }
+// 签收案件
+export function msCaseSign(data) {
+        return axios.post(`${baseUrl}/mssignSeal/msCaseSign`, data);
+}
+//根据案件id获取附件
+export function fileList(caseAppliId,annexTypeList) {
+    return axios.get(`${baseUrl}/common/fileList?caseAppliId=${caseAppliId}&annexTypeList=${annexTypeList}`);
+  }
diff --git a/src/views/room.vue b/src/views/room.vue
index 3119d48f..11dbaed5 100644
--- a/src/views/room.vue
+++ b/src/views/room.vue
@@ -47,12 +47,7 @@
         <div :class="userClassPhone" id="localStream">
           <div class="userNamePhone">{{ userId }}</div>
         </div>
-        <div
-          :class="userClassPhone"
-          v-for="(item, index) in userList"
-          :key="index"
-          :id="item"
-        >
+        <div :class="userClassPhone" v-for="(item, index) in userList" :key="index" :id="item">
           <div class="userNamePhone">{{ item }}</div>
         </div>
       </div>
@@ -60,8 +55,7 @@
     <!-- 语音转文字弹窗 -->
     <el-drawer title="会议内容" :visible.sync="textVisible" :modal="false">
       <div style="margin-left: 20px; margin-bottom: 10px">
-        <div
-          style="
+        <div style="
             width: 100%;
             display: flex;
             justify-content: space-around;
@@ -153,25 +147,13 @@
           </div>
         </div>
       </div>
-      <quill-editor
-        ref="myQuillEditor"
-        v-model="contentValue"
-        :options="editorOption"
-        @blur="onEditorBlur($event)"
-        @focus="onEditorFocus($event)"
-        @ready="onEditorReady($event)"
-      ></quill-editor>
-      <el-button
-        class="updataBtn"
-        @click="updataClick"
-        type="primary"
-        :disabled="!updataFlag"
-        >确认修改内容</el-button
-      >
+      <quill-editor ref="myQuillEditor" v-model="contentValue" :options="editorOption" @blur="onEditorBlur($event)"
+        @focus="onEditorFocus($event)" @ready="onEditorReady($event)"></quill-editor>
+      <el-button class="updataBtn" @click="updataClick" type="primary" :disabled="!updataFlag">确认修改内容</el-button>
     </el-drawer>
   </div>
 </template>
-  
+
 <script>
 import { getUsersig, reserveConferenceList } from "@/api/home";
 import {
@@ -483,7 +465,7 @@ export default {
           } else if (item.annexType == 12) {
             this.resFile.push(item);
           } else if (item.annexType == 7) {
-            this.mediateFile.push(item);
+            this.mediateFile.push(item)
           }
         });
       });
@@ -717,7 +699,7 @@ export default {
   },
 };
 </script>
-  
+
 <style scoped>
 .roompage {
   width: 100%;
@@ -882,14 +864,17 @@ export default {
   position: absolute;
   bottom: 8px;
 }
+
 .fileList {
   /* max-height: 300px; */
   /* overflow-y: scroll; */
 }
+
 .list {
   display: flex;
   flex-wrap: wrap;
 }
+
 .applicant,
 .res,
 .mediate {
@@ -898,7 +883,4 @@ export default {
   margin-bottom: 10px;
   color: #38393b;
 }
-</style>
-  
-  
-  
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/signFor.vue b/src/views/signFor.vue
new file mode 100644
index 00000000..b4f542f5
--- /dev/null
+++ b/src/views/signFor.vue
@@ -0,0 +1,141 @@
+<template>
+    <div class="signFor">
+        <div>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>案件编号</div></el-col>
+                <el-col :span="16"><div>{{ dataList.caseNum }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>申请人</div></el-col>
+                <el-col :span="16"><div>{{ dataList.applicationName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>被申请人</div></el-col>
+                <el-col :span="16"><div>{{ dataList.respondentName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>调解员</div></el-col>
+                <el-col :span="16"><div>{{ dataList.mediatorName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>调解方式</div></el-col>
+                <el-col :span="16"><div>{{ dataList.mediationMethodName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>调解时间</div></el-col>
+                <el-col :span="16"><div>{{ dataList.hearDate }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>案件状态</div></el-col>
+                <el-col :span="16"><div>{{ dataList.caseStatusName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="8"><div>创建时间</div></el-col>
+                <el-col :span="16"><div>{{ dataList.createTime }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row style="height: 40px;line-height: 40px;text-align: center;">
+                <el-col :span="7"><div>调解书</div></el-col>
+                <el-col :span="15"><div v-for="(item,index) in fileList" :key="index" style="color: blue; cursor: pointer"  @click="toPreview(item.annexPath)">{{ item.annexName }}</div></el-col>
+            </el-row>
+            <hr>
+            <el-row>
+                <el-col :span="24">
+                    <div style="width: 90px; margin: 30px auto;">
+                        <el-button type="primary" @click="getMsCaseSign(caseId)" v-if="showSign" icon="el-icon-edit">签收</el-button>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import { getEncryptInfoByid,caseApplicationList,msCaseSign,fileList } from "@/api/home";
+export default {
+    name: "signFor",
+    components: {},
+    data() {
+        return {
+            dataList: [],
+            loading: false,
+            token:'',
+            caseId:'',
+            showSign:true,
+            fileURL: 'http://121.40.189.20:8002' + "/API",
+            fileList:[]
+
+        };
+    },
+    created() {
+        console.log(this.fileURL)
+    },
+    methods: {
+        /**获取链接参数 */
+        async getEncryptInfoByidFn(data) {
+            await getEncryptInfoByid(data).then((res) => {
+                this.caseId = res.caseId
+                sessionStorage.setItem('token',res.token)
+            });
+        },
+        // 获取案件列表
+        async getList(params){
+            await caseApplicationList(params).then(res =>{
+                res.rows.forEach(item => {
+                    this.dataList = item;
+                });
+            })
+        },
+        // 案件签收
+        async getMsCaseSign(params){
+            console.log(params)
+            let caseIds = {
+                caseId:params
+            }
+            await msCaseSign(caseIds).then(res =>{
+                console.log(res)
+                this.$message({
+                    message: '签收成功',
+                    type: 'success'
+                });
+                this.showSign = false
+            })
+        },
+        // 查看附件
+        async getFileList(caseAppliIds,annexTypeList){
+            fileList(caseAppliIds,annexTypeList).then(res=>{
+                this.fileList = res.data;
+                console.log(this.fileList)
+            })
+        },
+        toPreview(val){
+            console.log(val)
+            window.open(this.fileURL + val)
+        }
+    },
+    async mounted() {
+        let routeParams = this.$route.query;
+        await this.getEncryptInfoByidFn(routeParams.authId)
+        await this.getList(this.caseId)
+        // await this.getList("5461248676208928")
+        let caseAppliIds = this.caseId
+        let annexTypeList = 7
+        await this.getFileList(caseAppliIds,annexTypeList)
+    }
+};
+</script>
+
+<style scoped>
+    .signFor{
+        margin-top: 30px;
+        width: 100%;
+    }
+</style>
\ No newline at end of file