Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !50

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"
@@ -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,7 +267,8 @@ export default {
       tid: '',
       teamMemberList: [],
       doctorName: '',
-      doctorImg: ''
+      doctorImg: '',
+      toggleChatSize: false
     };
   },
   computed: {
@@ -926,6 +927,7 @@ export default {
         })
         .catch((err) => {});
     },
+
     out() {
       const {diagnoseLogId} = this.currentChat;
       let url = `/diagnose/admin/diagnose/endCall/${diagnoseLogId}`;
@@ -955,6 +957,10 @@ export default {
         });
     },
 
+    toggleChatModal () {
+      this.toggleChatSize = !this.toggleChatSize;
+    }
+
   },
 
   beforeDestroy() {

src/components/IM/diagnosis-live.vue

@@ -4,7 +4,7 @@
       <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>{{ diagnoseType }}</span>
           </div>
@@ -116,8 +116,9 @@ export default {
     };
   },
   created() {
-    this.tid = this.$route.query.tid || "3854284100";
-    this.diagnoseLogId = this.$route.query.diagnoseLogId || "38";
+    const {imTeamId, diagnoseLogId} = this.currentChat;
+    this.tid = imTeamId|| "3854284100";
+    this.diagnoseLogId = diagnoseLogId || "38";
     // openLoading(this);
     this.init();
   },

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>
@@ -51,6 +51,7 @@
 <script>
 import { mapState } from "vuex";
 import InquiryListComponent from '../../../components/common/inquirylist.vue';
+import store from "../../../store";
 export default {
   components: {
     InquiryListComponent
@@ -121,6 +122,13 @@ export default {
        this.searchParam.returnStatus = val
        this.searchParam.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.searchParam.dateTime = val.toLocaleDateString().split('/').join('-')