Merge branch 'develop' of...

Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/fs

src/components/IM/chat.scss

@@ -389,12 +389,17 @@
             font-size: 14px;
             font-weight: bold;
           }
-          /deep/.el-textarea{
-            width: 75%;
+          ::v-deep.el-textarea{
             .el-textarea__inner{
               border: none;
             }
           }
+          ::v-deep.c-bottom-input{
+            //border: 4px solid #0d9078 !important;
+            ::v-deep textarea{
+              border: none!important ;
+            }
+          }
         }
         &.no-content {
           display: flex;
@@ -444,3 +449,6 @@
       }
     }
   }
+.shrink64{
+  height: 64px;
+}

src/components/IM/chat.vue

 <template>
-  <div class="chat-wrap" v-show="showChat">
+  <div class="chat-wrap" :class="toggleChatSize ? 'shrink64' : ''" v-show="showChat">
     <section class="component-content" id="screenSet">
       <article
         class="center"
@@ -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">
@@ -18,7 +18,7 @@
               <span class="edit-img" @click="closeChat">
   <img src="../../assets/image/IM/im_close2.png" alt />
             </span>
-              <span class="edit-img">
+              <span class="edit-img" @click="toggleChatModal">
   <img src="../../assets/image/IM/im_small.png" alt />
             </span>
             </div>
@@ -267,10 +267,10 @@ export default {
       tid: '',
       teamMemberList: [],
       doctorName: '',
-      doctorImg: ''
+      doctorImg: '',
+      toggleChatSize: false
     };
   },
-
   computed: {
     ...mapState({
       currentChat: 'currentChat',
@@ -313,9 +313,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 +323,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(() => {
@@ -929,6 +927,7 @@ export default {
         })
         .catch((err) => {});
     },
+
     out() {
       const {diagnoseLogId} = this.currentChat;
       let url = `/diagnose/admin/diagnose/endCall/${diagnoseLogId}`;
@@ -958,6 +957,10 @@ export default {
         });
     },
 
+    toggleChatModal () {
+      this.toggleChatSize = !this.toggleChatSize;
+    }
+
   },
 
   beforeDestroy() {

src/components/IM/diagnosis-live.vue

@@ -4,14 +4,14 @@
       <div class="top-left">
         <div class="time-message ">
           <p class="msg-img">
-              <img :src="im_text" alt />
+              <img :src=" diagnoseType == 1 ? im_text : im_video" 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,29 @@ export default {
     };
   },
   created() {
-    this.tid = this.$route.query.tid || "3853944746";
-    this.diagnoseLogId = this.$route.query.diagnoseLogId || "35";
+    const {imTeamId, diagnoseLogId} = this.currentChat;
+    this.tid = imTeamId|| "3854284100";
+    this.diagnoseLogId = 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 +201,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 +392,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/components/common/inquirylist.vue

@@ -42,7 +42,7 @@
               </div>
             </div>
             <div class="inquiryroom">
-              <div class="goroom"><span v-if="nomor" @click="openChat">进入诊室</span><span v-else>正在呼叫医助，进入诊室</span> </div>
+              <div class="goroom" @click="openChat"><span v-if="nomor">进入诊室</span><span v-else>正在呼叫医助，进入诊室</span> </div>
               <div class="suggest" @click="openAdvice">诊断建议 <div class="writesuggest" v-if="inquiry.write">未写</div></div>
             </div>
           </el-card>
@@ -331,10 +331,12 @@ export default {
       }
    }
    .inquiryroom{
+     user-select: none;
      height: 45px;
-     display: flex;
+     //display: flex;
      font-size: 14px;
       .goroom{
+        display: inline-block;
         cursor:pointer;
         width: 238px;
         height: 37px;
@@ -349,6 +351,7 @@ export default {
         }
       }
       .suggest{
+        display: inline-block;
         cursor:pointer;
         width: 238px;
         color: #449284;

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

@@ -28,7 +28,7 @@
         <el-radio-button label="5">已取消({{currentCalList}})</el-radio-button>
       </el-radio-group>
       <div class="forbox">
-        <div class="for" v-for="(item, index) in list" :key="'for'+index">
+        <div class="for" v-for="(item, index) in currentDiagList" :key="'for'+index">
           <inquiryList-component :item="item"></inquiryList-component>
         </div>
       </div>
@@ -44,13 +44,14 @@
         :total="totalRows">
       </el-pagination>
       </el-row>
-    </div>
   </div>
+    </div>
 </template>
 
 <script>
 import { mapState } from "vuex";
 import InquiryListComponent from '../../../components/common/inquirylist.vue';
+import store from "../../../store";
 export default {
   components: {
     InquiryListComponent
@@ -83,7 +84,7 @@ export default {
             "appointEndTime": "2021-07-29T05:28:57.396Z",
             "department": "内科",
             "departmentId": 3876,
-            "diagnoseLogId": 11,
+            "diagnoseLogId": 38,
             "diagnoseType": 1,
             "doctorCallKfStatus": 1,
             "doctorCallTime": "",
@@ -92,7 +93,7 @@ export default {
             "doctorName": "孙思邈",
             "doctorTrtcEntryStatus": 1,
             "imStatus": 0,
-            "imTeamId": "3853944746",
+            "imTeamId": "3854284100",
             "returnStatus": 1,
             "roomId": "string",
             "sort": 0,
@@ -136,6 +137,13 @@ export default {
        this.soketQuest.returnStatus = val
        this.soketQuest.pageNo = 1
        this.search()
+
+       // 测试代码
+       const l = this.currentDiagList;
+       console.log('--l----', l)
+       l.push(...this.list);
+       console.log('--l', l)
+       this.$store.commit('updateCurrentDiagList', l);
      },
      changeDatetime(val) {
        this.soketQuest.dateTime = val.toLocaleDateString().split('/').join('-')