Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !69

src/App.vue

@@ -66,9 +66,8 @@ export default {
   },
   mounted() {
     setTimeout( function () {
-      bindDragHeader('.c-header', '.chat-wrap','.wenzenbox');
+      bindDragHeader('.c-header', '.chat-wrap');
     }, 1000)
-
   },
   methods: {
     // 修改token

src/components/IM/chat.scss

@@ -7,7 +7,7 @@
   min-height: 700px;
   background: #ffffff;
   box-shadow: 10px 10px 50px 0px #d9d9d9;
-  overflow: hidden;
+  overflow: visible;
   border-radius: 18px;
 
   .component-content {
@@ -485,11 +485,14 @@
   }
 }
 .wenzenbox {
+  position: absolute;
+  top: 20px;
+  right: 20px;
       width: 120px;
       height: 120px;
       img{
-        width: 120px;
-        height: 120px;
+       width: 100%;
+        height: 100%;
       }
     }
 .shrink64 {
@@ -497,6 +500,6 @@
   width: 120px;
   background-color: transparent;
   box-shadow:none;
-  overflow: hidden;
+  overflow: visible;
   border-radius: 18px;
 }

src/components/IM/chat.vue

@@ -183,9 +183,12 @@
         </section>
       </article>
     </section>
+
     <div v-show="!toggleChatSize" class="wenzenbox" @click="toggleChatModal">
+      <div class="wenzenbox-header">
         <img src="../../assets/image/IM/wenzhenicon.png" alt="" />
       </div>
+    </div>
     <!-- 选择链接弹窗 -->
     <el-dialog
       title="选择链接"
@@ -265,7 +268,6 @@ let forwardMsgIntervalId = null,
   continueIntervalId = null,
   autoCompletionIntervalId = null,
   cacheMap = {};
-
 let _this = null;
 export default {
   components: {
@@ -320,7 +322,7 @@ export default {
       teamMemberList: [],
       doctorName: "",
       doctorImg: "",
-      toggleChatSize: false,
+      toggleChatSize: true,
     };
   },
   computed: {

src/components/IM/diagnosis-live.vue

@@ -31,7 +31,7 @@
               <span class="text-name">{{ item.name }}</span>
               <span class="text-dep">{{ item.role == 1 ? "问诊医生" : "接诊医生" }}</span>
             </p>
-            <p class="text-num">{{item.role == 1 ? currentChat.doctorMobile : currentChat.userMobile}}</p>
+            <p class="text-num">{{item.role == 1 ? currentChat.userMobile : currentChat.doctorMobile}}</p>
           </div>
         </div>
         <div :class="{viedowrap:currentChat.diagnoseType == 2}" :id="rtc.viewslist[index] ? rtc.viewslist[index].id : ''">
@@ -417,6 +417,12 @@ export default {
       this.memberList.forEach((item) => {
         if (item.liveUserId == id) {
           item.status = 3;
+          if(item.role == 1){
+            this.doctorTrtcEntryStatus = 2;
+          }
+          if(item.role == 2){
+            this.userTrtcEntryStatus = 2;
+          }
         }
       });
       console.log('---this.removeMember', this.memberList, id);

src/components/common/diagnoseAdvice.vue

@@ -50,8 +50,13 @@ export default {
       if(newVal !== oldVal && newVal){
         const c = this.currentAdvice && this.currentAdvice.content;
         console.log('ccc=cc=c=c=', c)
+        if(c == null){
+          this.diagnoseAdvice = '';
+        }else{
           this.diagnoseAdvice = c;
         }
+
+      }
     }
   },
   created() {
@@ -66,7 +71,7 @@ export default {
   },
   methods:{
     SaveAdvice() {
-      if(this.diagnoseAdvice.trim() === ''){
+      if( String(this.diagnoseAdvice).trim() === ''){
         this.$message({
           message: "请填写诊断建议",
           type: "success",

src/components/common/inquirylist.vue

@@ -190,9 +190,9 @@ export default {
         case 1:
             return '待处理'
         case 2:
-             return '问诊进行中'
+             return '待问诊'
         case 3:
-             return '未开始'
+             return '问诊进行中'
         case 4:
              return '问诊已完成'
         case 5:

src/store/module/socket.js

@@ -80,6 +80,7 @@ export default {
               style: `float:right;margin-top:${30}px;`,
               on: {
                 click: function () {
+                  console.log('----state', state)
                   if(state.showChat){
                     _VM.$message({
                       message: '不可同时进入多个诊室，请先退出已进入的诊室，再试。',

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

@@ -269,7 +269,7 @@ export default {
   }
 }
 </style>
-<style lang="scss" scoped>
+<style lang="scss">
 ::v-deep {
   .el-date-editor {
     .el-input__inner {