diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index df3c4e1..7fb7ce3 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -55,7 +55,7 @@
             <el-table-column label="被申请人" align="center" prop="respondentName" :show-overflow-tooltip="true" />
             <el-table-column label="案件标的" align="center" prop="caseSubjectAmount" :show-overflow-tooltip="true" />
             <el-table-column label="调解员" align="center" prop="mediatorName" :show-overflow-tooltip="true" />
-            <el-table-column label="开庭日期" align="center" prop="hearDate" :show-overflow-tooltip="true" />
+            <el-table-column label="调解时间" align="center" prop="hearDate" :show-overflow-tooltip="true" />
             <el-table-column label="案件状态" align="center" prop="caseStatusName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -77,7 +77,7 @@
                     <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
                     <el-button size="mini" type="text" icon="el-icon-edit"
-                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">证据修改</el-button>
+                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">上传证据</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
@@ -375,13 +375,13 @@ export default {
         /** 列表提交立案 */
         onsubmitRow(row) {
             this.$modal
-                .confirm("是否提交立案申请？")
+                .confirm("是否提交调解申请？")
                 .then(function () {
                     return submitCaseApply({ id: row.id, caseFlowId: row.caseFlowId });
                 })
                 .then(() => {
                     this.getList(this.queryParams);
-                    this.$modal.msgSuccess("立案申请成功");
+                    this.$modal.msgSuccess("调解申请成功");
                 })
                 .catch(() => { });
         },
diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue
index 36665da..2192949 100644
--- a/src/views/caseManagement/components/addCase.vue
+++ b/src/views/caseManagement/components/addCase.vue
@@ -418,7 +418,7 @@
         </el-col>
       </el-form>
       <div v-if="activeName == 'second'">
-        <el-card class="box-card" style="margin-bottom: 30px">
+        <el-card class="box-card" style="margin-bottom: 30px" v-if="applicantEvidence.length">
           <div slot="header" class="clearfix">
             <span>申请人证据清单</span>
           </div>
@@ -427,7 +427,7 @@
             {{ item.annexName }}
           </div>
         </el-card>
-        <el-card class="box-card">
+        <el-card class="box-card" v-if="respondentEvidence.length">
           <div slot="header" class="clearfix">
             <span>被申请人证据清单</span>
           </div>
diff --git a/src/views/caseManagement/components/confirmMediator.vue b/src/views/caseManagement/components/confirmMediator.vue
index 3f9551b..a4eb14c 100644
--- a/src/views/caseManagement/components/confirmMediator.vue
+++ b/src/views/caseManagement/components/confirmMediator.vue
@@ -10,7 +10,7 @@
                     @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55">
                     </el-table-column>
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -23,7 +23,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">当前调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="tableDataNow" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -36,7 +36,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">申请人调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="applicantTable" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -49,7 +49,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">被申请人调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="respondentTable" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
diff --git a/src/views/caseManagement/components/departmentMediator.vue b/src/views/caseManagement/components/departmentMediator.vue
index c46f9ed..c8ac96d 100644
--- a/src/views/caseManagement/components/departmentMediator.vue
+++ b/src/views/caseManagement/components/departmentMediator.vue
@@ -10,7 +10,7 @@
                     @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55">
                     </el-table-column>
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -23,7 +23,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">当前调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="tableDataNow" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -36,7 +36,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">申请人调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="applicantTable" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
@@ -49,7 +49,7 @@
                     <div style="margin-bottom: 20px;margin-top: 20px;">被申请人调解员</div>
                 </div>
                 <el-table ref="multipleTable" :data="respondentTable" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <!-- <el-table-column prop="specialty" label="专业">
                     </el-table-column>
diff --git a/src/views/caseManagement/components/evidenceDialog.vue b/src/views/caseManagement/components/evidenceDialog.vue
index 09505d9..a0f3f97 100644
--- a/src/views/caseManagement/components/evidenceDialog.vue
+++ b/src/views/caseManagement/components/evidenceDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="修改证据" :visible="evidenceVisable" @close="cancel" center :distroy-on-close="true">
+        <el-dialog title="上传证据" :visible="evidenceVisable" @close="cancel" center :distroy-on-close="true">
             <el-descriptions title="案件内容" :column="2" border>
                 <el-descriptions-item label="案件编号">{{ evidenceData.caseNum }}</el-descriptions-item>
                 <el-descriptions-item label="申请人">{{ evidenceData.applicationName }}</el-descriptions-item>
@@ -8,7 +8,7 @@
                 <el-descriptions-item label="案件状态">
                     <el-tag size="small">{{ evidenceData.caseStatusName }}</el-tag>
                 </el-descriptions-item>
-                <el-descriptions-item label="仲裁方式">{{ evidenceData.arbitratMethodName }}</el-descriptions-item>
+                <!-- <el-descriptions-item label="仲裁方式">{{ evidenceData.arbitratMethodName }}</el-descriptions-item> -->
                 <el-descriptions-item label="申请人证据">
                     <div style="color: #104fad;cursor:pointer" v-for="(item, index) in fileListData"
                         @click="preview(item.annexPath)" :key="index">
diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue
index 1328135..a8f978d 100644
--- a/src/views/caseManagement/components/mediation.vue
+++ b/src/views/caseManagement/components/mediation.vue
@@ -51,17 +51,18 @@
                 <el-radio :label="2">未达成调解</el-radio>
                 <el-radio :label="3">未达成调解但不在争议</el-radio>
                 <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
+                <el-radio :label="5">达成和解</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-form-item label="是否和解" v-if="mediaResult==1">
              <el-radio-group v-model="isReconci">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="24">
           <el-form-item label="被申请人案件证据：">
             <div v-if="quiltArr.length == 0">被申请人暂未提供证据！</div>
@@ -83,7 +84,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="mediationType">
-          <el-form-item label="开庭时间：">
+          <el-form-item label="调解时间：">
             <div>{{ formData.hearDate }}</div>
           </el-form-item>
         </el-col>
@@ -136,7 +137,7 @@ export default {
       roomId: null,
       startTime: null,
       mediaResult:1,
-      isReconci:0,
+      // isReconci:0,
       formData: {
         affiliate: {}
       },
@@ -252,7 +253,7 @@ export default {
         id: this.mediationData.id,
         caseFlowId: this.mediationData.caseFlowId,
         attachList: this.attachList,
-        isReconci:this.isReconci,
+        // isReconci:this.isReconci,
         mediaResult:this.mediaResult,
       });
     },
diff --git a/src/views/caseManagement/components/selectMediator.vue b/src/views/caseManagement/components/selectMediator.vue
index 11118e0..438746f 100644
--- a/src/views/caseManagement/components/selectMediator.vue
+++ b/src/views/caseManagement/components/selectMediator.vue
@@ -9,7 +9,7 @@
                     @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55">
                     </el-table-column>
-                    <el-table-column prop="mediatorName" label="调解员名称">
+                    <el-table-column prop="mediatorName" label="调解员">
                     </el-table-column>
                     <el-table-column prop="specialty" label="专业">
                     </el-table-column>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index cb05b99..c55e903 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -565,7 +565,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .head-container {
-  width: 220px;
+  width: 98%;
 
   ::v-deep .el-tree-node {
     white-space: normal;
diff --git a/vue.config.js b/vue.config.js
index abf5def..8dff498 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,8 +14,13 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // const API = 'http://121.40.189.20:9001'  //生产
 const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
+<<<<<<< HEAD
 // const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.43:6001' //w
+=======
+// const API = 'http://172.16.1.30:6001' //Q
+// const API = 'http://172.16.1.17:6001' //w
+>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions