问诊dan

src/api/workbench.js

@@ -49,9 +49,10 @@ export const manualCall = async (data) => {
 };
 
 // 查询当前上级医生下排队的信息
-export const waitPersonNum = async (doctorId) => {
+export const waitPersonNum = async (data) => {
   return request({
-    url: `/admin/diagnose/queueList/${doctorId}`,
+    url: '/diagnose/admin/diagnose/queueList/doctorId',
     method: 'post',
+    data: data,
   });
 };

src/components/common/consultationCard/index.js

@@ -285,8 +285,12 @@ export default {
     },
     waitPersonFun() {
       if (!this.isShowWait) {
-        console.log(this.item.doctorId, 'this.item.doctorId');
-        waitPersonNum(this.item.doctorId)
+        const parms = {
+          assistantBeginTime: this.item.appointBeginTime,
+          doctorId: this.item.doctorId,
+        };
+        console.log(parms, 'this.item.doctorId');
+        waitPersonNum(parms)
           .then((res) => {
             if (res.code === '000000') {
               this.waitPersonList = res.data || [];

src/components/common/consultationCard/index.scss

@@ -17,6 +17,9 @@
         font-size: 18px;
         margin-top: 3px;
       }
+      .notime {
+        color: #999999;
+      }
     }
     .right {
       margin-left: 23px;
@@ -45,7 +48,7 @@
       }
     }
     .superior-doctor {
-      width: 49%;
+      width: 52%;
       display: flex;
       justify-content: flex-start;
       align-items: flex-start;
@@ -89,19 +92,19 @@
         .info-name-wrap {
           display: flex;
           align-items: center;
+          justify-content: space-between;
+          span {
+            display: block;
+          }
+          .info-name {
+            //display: inline-block;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            font-size: 18px;
+            color: #02120f;
+            font-weight: bold;
+          }
         }
-
-        .info-name {
-          display: inline-block;
-          max-width: 85px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          font-size: 18px;
-          color: #02120f;
-          font-weight: bold;
-        }
-
         .info-container {
           align-items: center;
           flex-direction: row;
@@ -115,17 +118,6 @@
           .info-call-time {
             color: #ff5e57;
           }
-          .info-calling {
-            width: 15px;
-            height: 25px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            img {
-              width: 15px;
-              height: 15px;
-            }
-          }
         }
       }
       .manual-call-status {
@@ -150,7 +142,7 @@
       }
     }
     .basic-doctor {
-      width: 49%;
+      width: 40%;
       display: flex;
       justify-content: flex-start;
       .basic-user-img,
@@ -201,21 +193,23 @@
             color: #ff5e57;
           }
           .info-calling {
-            width: 15px;
-            height: 25px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            img {
-              width: 15px;
-              height: 15px;
-            }
+            background: rgba(255, 94, 87, 0.07);
+            border-radius: 10px;
+            border: 1px solid rgba(255, 94, 87, 0.15);
+            height: 20px;
+            text-align: center;
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ff5e57;
+            line-height: 20px;
+            margin-top: 3px;
           }
         }
       }
     }
     .no-info {
-      width: 100%;
+      width: 30%;
       height: auto;
       color: #ff5e57;
     }

src/components/common/consultationCard/index.vue

@@ -31,8 +31,9 @@
             </li>
             <li class="inquiry-user-status">
               <!-- 只有-->
+              <!--  -->
               <span
-                v-if="item.userId"
+                v-if="!doctorLastCallTime && item.doctorCallKfStatus != 1"
                 :class="
                   doctorCallStatus === '已拨打完成'
                     ? 'status-cll-user-finish'
@@ -44,7 +45,7 @@
                 class="status-cll-user-answer"
               >正在呼叫</span>
               <span
-                v-else
+                v-if="doctorLastCallTime"
                 class="status-cll-user-answer"
               >
                 {{ doctorLastCallTime }}前呼叫医助</span>
@@ -89,8 +90,18 @@
             >
               呼叫中
             </div>
+            <div
+              v-if="item.userCallKfStatus == 2 && userLastCallTime"
+              class="info-calling"
+            >
+              <span v-if="userLastCallTime">
+                {{ userLastCallTime }} 前呼叫医助</span>
+            </div>
           </li>
-          <li class="inquiry-user-status">
+          <li
+            v-if="item.userCallKfStatus != 1 && userCallStatus"
+            class="inquiry-user-status"
+          >
             <span
               :class="
                 userCallStatus === '已拨打完成'
@@ -118,6 +129,12 @@
         >
           暂停接诊
         </div>
+        <div
+          v-if="item.acceptStatus == 4"
+          class="doctor-stop"
+        >
+          离开
+        </div>
       </div>
     </div>
     <!-- 预约时间，复制单号 -->
@@ -133,7 +150,7 @@
         </div>
         <div
           v-else
-          class="time"
+          class="time notime"
         >
           无
         </div>
@@ -205,7 +222,6 @@
         </div>
       </div>
     </div>
-
     <!-- 排队详细 -->
     <div
       v-if="isShowWait"

src/store/modules/socket.js

@@ -26,34 +26,6 @@ const socket = {
         console.log('socket disconnect----', socket);
         // state.socketClient.connect();
       });
-      socketClient.on('diagnose_push_event', (socket) => {
-        const { list, allSize, countRespList } = socket;
-        console.log('-rootState', rootState, socket);
-        const { currentTabStatus } = rootState.main;
-        context.commit('main/updateCurrentCalList', countRespList, {
-          root: true,
-        });
-        context.commit('main/updateAllSize', allSize, { root: true });
-        if (list) {
-          const l = list[0] || [];
-          if (currentTabStatus == 99) {
-            context.commit('main/updateCurrentDiagList', list, { root: true });
-          } else {
-            if (currentTabStatus == l.returnStatus) {
-              context.commit('main/updateCurrentDiagList', list, {
-                root: true,
-              });
-            }
-            if (l.length == 0) {
-              context.commit('main/updateCurrentDiagList', list, {
-                root: true,
-              });
-            }
-          }
-        } else {
-          context.commit('main/updateCurrentDiagList', [], { root: true });
-        }
-      });
       socketClient.on('diagnose_call_push_event', (socket) => {
         console.log(
           socket,
@@ -75,8 +47,9 @@ const socket = {
         if (
           path &&
           String(path).indexOf('workbench') > -1 &&
-          n.operateUserId == operateUserId
+          (n.operateUserId == operateUserId || n.operateUserId == '999999')
         ) {
+          console.log(n);
           const ni = { notifyInfo: n, rootState: rootState };
           context.commit('SET_NOTIFY', ni);
         }

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

@@ -63,15 +63,21 @@
                 placeholder="输入问诊单号/医生姓名"
                 class="input-with-select"
                 @change="getSerachValue"
+              />
+              <el-button
+                slot="append"
+                class="search-botton"
+                @click="getSearchValue"
+              >
+                搜索
+              </el-button>
+              <el-button
+                slot="append"
+                class="reset-botton"
+                @click="resetSearchValue"
               >
-                <el-button
-                  slot="append"
-                  class="search-botton"
-                  @click="getSearchValue"
-                >
-                  搜索
-                </el-button>
-              </el-input>
+                重置
+              </el-button>
             </div>
           </div>
           <!--  问诊状态内容 -->
@@ -350,13 +356,8 @@
       this.tabPositionValue = this.$route.query.type || '3';
     },
     mounted() {
-      const s = storejs.get('soketQuest');
-      const id =
-        s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
       this.userInfo = storejs.get('initSocketInfo');
-      if (!id) {
-        this.localUserId = this.userInfo.userId;
-      }
+      this.localUserId = this.userInfo.userId;
       this.initCard();
       const that = this;
       // 轮循
@@ -365,7 +366,7 @@
           // that.isShowCardData = false;
           that.initCard();
         }, 0);
-      }, 40000);
+      }, 15000);
       this.doctorDeparList();
     },
     destroyed() {
@@ -450,17 +451,16 @@
           }
         });
       },
-
       initCard() {
         const parms = {
           bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
           userId: this.operatId || this.localUserId, //   userId
         };
-        // this.currentDiagList = this.mockData;
         conditionNewList(parms)
           .then((res) => {
             if (res.code === '000000') {
-              this.handleData(res.data.length > 0 ? res.data : this.mockData);
+              this.handleData(res.data);
+            // this.handleData(res.data.length > 0 ? res.data : this.mockData);
             } else {
               this.$message({
                 message: res.message,
@@ -471,8 +471,8 @@
           })
           .catch((err) => {
             console.log(err);
-            // mock 数据
-            this.handleData(this.mockData);
+          // mock 数据
+          // this.handleData(this.mockData);
           });
       },
       handleData(data) {
@@ -480,7 +480,6 @@
         this.midCardData = [];
         const searchVal = this.orderOrName;
         data.forEach((item, index) => {
-          // item.diagnoseLogId = '--' + Math.random() * 10;
           item['definitionRandom'] = Math.random() * 10;
           if (searchVal) {
             // 如果有查询条件一直后去的是查询结果
@@ -513,6 +512,10 @@
           this.handleSearchResult(this.orderOrName);
         }
       },
+      resetSearchValue() {
+        this.orderOrName = '';
+        this.initCard();
+      },
       // 处理查询结果
       handleSearchResult(searchVal) {
         this.isShowCardData = false;
@@ -645,10 +648,16 @@
         margin-left: 8px;
         .el-input {
           width: 364px;
-          .search-botton {
-            background: #0d9078;
-            color: #fff;
-          }
+        }
+        .search-botton {
+          background: #0d9078;
+          color: #fff;
+          margin-left: 5px;
+        }
+        .reset-botton {
+          background: #0d9078;
+          color: #fff;
+          margin-left: 5px;
         }
       }
     }
@@ -831,16 +840,4 @@
   padding: 10px 0;
   background-color: #f9fafc;
 }
-// 屏幕适配
-@media screen and (min-width: 1240px) and (max-width: 1441px) {
-  .workbench-container {
-    .workbench-li-c {
-      .grid-c {
-        .workbench-li {
-          //max-width: 572px;
-        }
-      }
-    }
-  }
-}
 </style>