Просмотр исходного кода

Merge branch 'hcb' of SH-Arbitrate/Arbitrate-FrontendH5 into master

hanchaobo 2 лет назад
Родитель
Сommit
c01b283b1f
2 измененных файлов: 20 добавлений и 30 удалений
  1. 19
    3
      src/api/room.js
  2. 1
    27
      src/views/room.vue

+ 19
- 3
src/api/room.js Просмотреть файл

49
 }
49
 }
50
 // 获取证据列表
50
 // 获取证据列表
51
 export function selectById(caseId) {
51
 export function selectById(caseId) {
52
-    return axios.get(`tjformal/caseApplication/selectById?id=${caseId}`);
52
+    let appType = sessionStorage.getItem('type');
53
+    if (appType == 'tiaojie') {
54
+        return axios.get(`tjformal/caseApplication/selectById?id=${caseId}`);
55
+    } else {
56
+        return axios.get(`zhongcai/caseApplication/selectById?id=${caseId}`);
57
+    }
53
 }
58
 }
54
 // 根据案件id查询登录人是否为申请人被申请人
59
 // 根据案件id查询登录人是否为申请人被申请人
55
 export function selectRoleMenuByCaseId(caseId) {
60
 export function selectRoleMenuByCaseId(caseId) {
56
-    return axios.get(`tjformal/video/selectRoleMenuByCaseId?caseId=${caseId}`);
61
+    let appType = sessionStorage.getItem('type');
62
+    if (appType == 'tiaojie') {
63
+        return axios.get(`tjformal/video/selectRoleMenuByCaseId?caseId=${caseId}`);
64
+    } else {
65
+        return axios.get(`zhongcai/video/selectRoleMenuByCaseId?caseId=${caseId}`);
66
+    }
67
+    
57
 }
68
 }
58
 // 保存onlyOffice文档
69
 // 保存onlyOffice文档
59
 export function saveOnlyOfficeFile(data) {
70
 export function saveOnlyOfficeFile(data) {
61
 }
72
 }
62
 //获取当前用户的操作权限
73
 //获取当前用户的操作权限
63
 export function getMenuPermsByUser(caseId) {
74
 export function getMenuPermsByUser(caseId) {
64
-    return axios.get(`tjformal/system/menu/getMenuPermsByUser`);
75
+    let appType = sessionStorage.getItem('type');
76
+    if (appType == 'tiaojie') {
77
+        return axios.get(`tjformal/system/menu/getMenuPermsByUser`);
78
+    } else {
79
+        return axios.get(`zhongcai/system/menu/getMenuPermsByUser`);
80
+    }
65
 }
81
 }
66
 // 上传文件
82
 // 上传文件
67
 export function videoUpload(data) {
83
 export function videoUpload(data) {

+ 1
- 27
src/views/room.vue Просмотреть файл

2
   <div class="page">
2
   <div class="page">
3
     <div class="iconImg" v-if="!modileFlag && rightType && rightTypeall" @click="checkList(1)">
3
     <div class="iconImg" v-if="!modileFlag && rightType && rightTypeall" @click="checkList(1)">
4
       <i class="el-icon-d-arrow-left" style="font-size: 30px;color: aqua;"></i>
4
       <i class="el-icon-d-arrow-left" style="font-size: 30px;color: aqua;"></i>
5
-      <!-- <i class="el-icon-d-arrow-right"></i> -->
6
     </div>
5
     </div>
7
     <div class="roompage" @mouseover="mouseHover" v-if="modileFlag">
6
     <div class="roompage" @mouseover="mouseHover" v-if="modileFlag">
8
       <div class="txtContent">
7
       <div class="txtContent">
27
         </roomFooter>
26
         </roomFooter>
28
       </div>
27
       </div>
29
     </div>
28
     </div>
30
-    <div class="roomPhone">
29
+    <div class="roomPhone" v-if="!modileFlag">
31
       <div class="videoPage">
30
       <div class="videoPage">
32
         <div :class="sharingType" id="screenShare">
31
         <div :class="sharingType" id="screenShare">
33
         </div>
32
         </div>
40
           </div>
39
           </div>
41
           <i class="el-icon-d-arrow-right" style="font-size: 30px;color: aqua;" @click="checkList(2)"
40
           <i class="el-icon-d-arrow-right" style="font-size: 30px;color: aqua;" @click="checkList(2)"
42
             v-if="!rightType && rightTypeall"></i>
41
             v-if="!rightType && rightTypeall"></i>
43
-          <!-- <i class="el-icon-d-arrow-left" style="font-size: 30px;color: aqua;" @click="checkList(2)"
44
-            v-if="!rightType && !rightTypeall"></i> -->
45
         </div>
42
         </div>
46
         <div class="footerPhone">
43
         <div class="footerPhone">
47
           <roomFooterPhone @exitRoom="exitRoom" @micClickOn="micClickOn" @micClickOff="micClickOff"
44
           <roomFooterPhone @exitRoom="exitRoom" @micClickOn="micClickOn" @micClickOff="micClickOff"
50
             :videoFlag="videoFlag" :sharFlag="sharFlag"></roomFooterPhone>
47
             :videoFlag="videoFlag" :sharFlag="sharFlag"></roomFooterPhone>
51
         </div>
48
         </div>
52
       </div>
49
       </div>
53
-      <!-- <div class="header">
54
-        <roomFooterPhone @exitRoom="exitRoom"></roomFooterPhone>
55
-      </div>
56
-      <div class="bodyVideo">
57
-        <div :class="userClassPhone" id="localStream">
58
-          <div class="userNamePhone">{{ userId }}</div>
59
-        </div>
60
-        <div :class="userClassPhone" v-for="(item, index) in userList" :key="index" :id="item">
61
-          <div class="userNamePhone">{{ item }}</div>
62
-        </div>
63
-      </div> -->
64
     </div>
50
     </div>
65
     <!-- 语音转文字弹窗 -->
51
     <!-- 语音转文字弹窗 -->
66
     <el-drawer title="会议内容" :visible.sync="textVisible" :modal="false">
52
     <el-drawer title="会议内容" :visible.sync="textVisible" :modal="false">
935
   color: #ffffff;
921
   color: #ffffff;
936
 }
922
 }
937
 
923
 
938
-/* .header {
939
-  width: 100%;
940
-  height: 8%;
941
-  background-color: #716c6c;
942
-  display: flex;
943
-  flex-direction: row-reverse;
944
-  align-items: center;
945
-} */
946
 /* 移动端样式 */
924
 /* 移动端样式 */
947
 .roomPhone {
925
 .roomPhone {
948
   width: 100%;
926
   width: 100%;
1033
   bottom: 8px;
1011
   bottom: 8px;
1034
 }
1012
 }
1035
 
1013
 
1036
-.fileList {
1037
-  /* max-height: 300px; */
1038
-  /* overflow-y: scroll; */
1039
-}
1040
 
1014
 
1041
 .list {
1015
 .list {
1042
   display: flex;
1016
   display: flex;