Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !70

src/components/IM/diagnosis-live.vue

@@ -24,7 +24,7 @@
       >
         <div class="text">
           <div class="text-left">
-            <img :src="item.avatarImageUrl" alt />
+            <img :src="item && item.avatarImageUrl" alt />
           </div>
           <div class="text-right">
             <p>

src/components/common/consultation.vue

@@ -10,24 +10,6 @@
         </div>
       </div>
     </div>
-    <!-- <div class="data">
-       <div>
-           <div class="totallist">暂无</div>
-           <div class="statelist">全部</div>
-       </div>
-       <div>
-           <div class="totallist">暂无</div>
-           <div class="statelist">全部</div>
-       </div>
-       <div>
-           <div class="totallist">暂无</div>
-           <div class="statelist">全部</div>
-       </div>
-       <div>
-           <div class="totallist">暂无</div>
-           <div class="statelist">全部</div>
-       </div>
-    </div> -->
   </div>
 </template>
 

src/components/common/inquirylist.vue

@@ -67,9 +67,9 @@
           </div>
         </div>
         <div class="line-btn" @click="openChat">
-          <span v-if="isDoctorChat">正在呼叫接诊医生，进入诊室</span>
-          <span v-else-if="isUserChat">正在呼叫医助，进入诊室</span>
-          <span v-else>进入诊室</span>
+<!--          <span v-if="isDoctorChat">正在呼叫接诊医生，进入诊室</span>-->
+<!--          <span v-else-if="isUserChat">正在呼叫医助，进入诊室</span>-->
+          <span>进入诊室</span>
         </div>
       </div>
       <div class="inquiry-user-container">
@@ -267,6 +267,12 @@ export default {
     },
     // 主动呼叫 roletype 1：助诊医生 2：接诊医生
     drivingCall(id, roletype) {
+      if(roletype == 1 && this.isUserChat){
+        return false;
+      }
+      if(roletype == 2 && this.isDoctorChat){
+        return false;
+      }
       this.getInfo(id).then((res) => {
         console.log(res);
         let url = `/im/team/call/direct/`;

src/store/module/socket.js

@@ -41,6 +41,7 @@ export default {
       state.socketClient.on("diagnose_push_event", (socket) => {
         console.log('diagnose_push_event---', socket);
         const {list,allSize,countRespList} = socket;
+        console.log('--_VM', _VM.$route)
         store.commit('updateCurrentDiagList', list);
         store.commit('updateAllSize', allSize);
         store.commit('updateCurrentCalList', countRespList);
@@ -54,6 +55,7 @@ export default {
         l.push(socket);
         const n = {notifyIndex: l.length, ...socket}
         store.commit('updateNoticeList', l);
+        console.log('--_VM', _VM)
         store.commit('socket/SET_NOTIFY', n);
       });
       state.socketClient.on('ping', function () {

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

@@ -15,20 +15,6 @@
           >
           </el-date-picker>
         </div>
-
-        <div class="search-item">
-          <el-input
-            size="small"
-            class="input-item"
-            v-model="searchParam.checkvalue"
-            placeholder="输入问诊单号/医生姓名"
-          ></el-input>
-        </div>
-        <div>
-          <el-button type="primary" size="small" @click="search()"
-            >搜索</el-button
-          >
-        </div>
       </div>
       <!-- tab栏 -->
       <el-radio-group
@@ -179,9 +165,6 @@ export default {
       const s = this.searchParam;
       s.dateTime = val.format("yyyy-MM-dd");
       this.searchParam = s;
-    },
-
-    search() {
       this.inquirySearch("clear");
     },