Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !49

src/components/IM/chat.vue

@@ -8,8 +8,8 @@
         <section class="c-header">
           <div class="header-line">
             <div class="c-header-l">
-              <span class="num">3519</span>
-              <span class="dep">&nbsp;内科</span>
+              <span class="num">{{currentChat.diagnoseLogId}}</span>
+              <span class="dep">&nbsp;{{currentChat.department}}</span>
             </div>
             <div class="c-header-edit">
             <span class="edit-img" @click="overFn">
@@ -270,7 +270,6 @@ export default {
       doctorImg: ''
     };
   },
-
   computed: {
     ...mapState({
       currentChat: 'currentChat',
@@ -313,9 +312,8 @@ export default {
   mounted() {
     cacheMap = {};
     this.$nextTick(() => {
-      _this.containerHeight = document.body.clientHeight - 80;
-      // _this.getElmByID("screenSet").style.height = _this.containerHeight - 76 + "px";
-      _this.getElmByID("msgContentId").style.height = "400px";
+      // _this.containerHeight = document.body.clientHeight - 80;
+      // _this.getElmByID("msgContentId").style.height = "400px";
     });
   },
 
@@ -324,8 +322,7 @@ export default {
       _this = this;
       this.picakfAccId = getPicaKFAccid();
       const {imTeamId} = this.currentChat;
-      this.tid = imTeamId || '3853944746';
-      console.log('--this.currentChat', this.currentChat);
+      this.tid = imTeamId || '3854284100';
       this.getFiveContentList();
       autoCompletionIntervalId && clearInterval(autoCompletionIntervalId);
       autoCompletionIntervalId = setInterval(() => {

src/components/IM/diagnosis-live.vue

@@ -6,12 +6,12 @@
           <p class="msg-img">
               <img :src="im_text" alt />
             </p>
-          <span>{{ title }}</span>
+          <span>{{ diagnoseType }}</span>
           </div>
         <div class="time-message ml10">
           <p class="msg-img">        <img :src="im_time" alt /></p>
-          <p>设定时长: {{ time }}分钟</p>
-          <p v-if="startTime && endTime">总时长: {{ useTime }}</p>
+          <p>设定时长: {{ time }}分钟 &nbsp;&nbsp;</p>
+          <p v-if="startTime && endTime">总时长: {{ useTime }}&nbsp;&nbsp;</p>
           <p v-if="startTime && endTime">剩余时长: {{ loseTime }}</p>
         </div>
       </div>
@@ -35,7 +35,9 @@
           </div>
         </div>
         <div class="viedo">
-          <el-button class="call-btn"> 已接入</el-button>
+          <el-button class="call-btn" :disabled="item.status === 2" @click="drivingCall(item)" >
+            {{ showText(item.status, item.role, item) }}
+          </el-button>
         </div>
       </div>
       <div class="vedio-man">
@@ -62,6 +64,7 @@ import RtcClient from "../../utils/RtcClient.js";
 import { openLoading, closeLoading } from "@/utils/utils";
 import alert from "@/components/common/alert.vue";
 import timeLeft from "@/components/timeLeft";
+import {mapState} from "vuex";
 export default {
   components: {
     alert,
@@ -102,7 +105,7 @@ export default {
       answerTimeFn: null,
       useTimeFn: null,
       loseTimeFn: null,
-      type: 2, // 1: 语音 2: 视频
+      type:  1, // 1: 语音 2: 视频
       startTime: 0,
       endTime: 0,
       time: 30, //总时长
@@ -113,14 +116,28 @@ export default {
     };
   },
   created() {
-    this.tid = this.$route.query.tid || "3853944746";
-    this.diagnoseLogId = this.$route.query.diagnoseLogId || "35";
+    this.tid = this.$route.query.tid || "3854284100";
+    this.diagnoseLogId = this.$route.query.diagnoseLogId || "38";
     // openLoading(this);
     this.init();
   },
   computed: {
-    title() {
-      return this.type == 1 ? "音频问诊" : "视频问诊";
+    ...mapState({
+      currentChat: 'currentChat',
+    }),
+    diagnoseType() {
+      switch(this.currentChat.diagnoseType) {
+        case 1:
+          return '语音问诊'
+        case 2:
+          return '视频问诊'
+          break;
+        case 3:
+          return '图文问诊'
+          break;
+        default:
+          return''
+      }
     },
   },
   methods: {
@@ -183,6 +200,7 @@ export default {
         .then((res) => {
           if (res.code == "000000") {
             let { liveInfo, memberList } = res.data;
+            console.log('----memberList', memberList);
             if (liveInfo) {
               this.startTime = liveInfo.startTimestamp;
               this.endTime = liveInfo.endTimestamp;
@@ -373,7 +391,7 @@ export default {
           text = "已离线";
           break;
         default:
-          text = `已接入: ${role == 1 ? this.askTime : this.answerTime}`;
+          text = `已接入`;
           break;
       }
       return text;

src/components/common/alert.vue

@@ -85,7 +85,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    background: rgba(0,0,0,0.6);
+    //background: rgba(0,0,0,0.6);
     .diog-main {
       width:480px;
       padding: 34px 32px 24px 34px;

src/views/IM/diagnosis-admin/workbench.vue

@@ -44,8 +44,8 @@
         :total="totalRows">
       </el-pagination>
       </el-row>
-    </div>
   </div>
+    </div>
 </template>
 
 <script>
@@ -82,7 +82,7 @@ export default {
             "appointEndTime": "2021-07-29T05:28:57.396Z",
             "department": "内科",
             "departmentId": 3876,
-            "diagnoseLogId": 11,
+            "diagnoseLogId": 38,
             "diagnoseType": 1,
             "doctorCallKfStatus": 1,
             "doctorCallTime": "",
@@ -91,7 +91,7 @@ export default {
             "doctorName": "孙思邈",
             "doctorTrtcEntryStatus": 1,
             "imStatus": 0,
-            "imTeamId": "3853944746",
+            "imTeamId": "3854284100",
             "returnStatus": 1,
             "roomId": "string",
             "sort": 0,