save

src/App.vue

@@ -150,7 +150,7 @@ export default {
   .content {
     background: #f0f2f5;
     position: absolute;
-    left: 255px;
+    left: 215px;
     right: 0;
     top: 64px;
     bottom: 0;

src/components/common/consultation.vue

  <template>
-  <div class="consultationlist" style="user-select: none">
+  <div class="consultationlist" @click="goworkBench" style="user-select: none">
     <div class="list">
       <div class="name">{{ operatorsItem.name || "" }}</div>
-      <div class="details" @click="goworkBench">
+      <div class="details">
         <!-- <div class="handle">待处理: <span> 暂无</span></div> -->
         <div class="see">
           <span>查看详情</span>
@@ -64,6 +64,7 @@ export default {
   width: 100%;
   background: #ffffff;
   border-radius: 18px;
+  cursor: pointer;
   .list {
     display: flex;
     justify-content: space-between;

src/components/common/inquirylist.vue

@@ -37,7 +37,7 @@
               </div>
             </div>
             <div class="inquiry-user-info">
-              <div>
+              <div class="info-name-wrap">
                 <span class="info-name">
                   {{ item.doctorName }}
                 </span>
@@ -48,7 +48,7 @@
                   {{ item.doctorMobile }}
                 </span>
                 <span class="info-call-time" v-if="item.doctorCallTime">
-                  {{ pastCallTime }}小时前呼叫
+                  {{ pastDoctorCallTime }}小时前呼叫
                 </span>
                 <span class="info-calling" v-if="item.doctorCallKfStatus == 1">
                   <img :src="infocallImg" alt="" />
@@ -57,7 +57,7 @@
             </div>
           </div>
 
-          <div class="call-status">
+          <div class="call-status" v-if="item.diagnoseType == 1 || item.diagnoseType == 2">
             <img
               v-if="isCall"
               @click="drivingCall(item.doctorId, 2)"
@@ -67,8 +67,8 @@
           </div>
         </div>
         <div class="line-btn" @click="openChat">
-<!--          <span v-if="isDoctorChat">正在呼叫接诊医生，进入诊室</span>-->
-<!--          <span v-else-if="isUserChat">正在呼叫医助，进入诊室</span>-->
+          <!--          <span v-if="isDoctorChat">正在呼叫接诊医生，进入诊室</span>-->
+          <!--          <span v-else-if="isUserChat">正在呼叫医助，进入诊室</span>-->
           <span>进入诊室</span>
         </div>
       </div>
@@ -81,7 +81,7 @@
               </div>
             </div>
             <div class="inquiry-user-info">
-              <div>
+              <div class="info-name-wrap">
                 <span class="info-name">
                   {{ item.userName }}
                 </span>
@@ -92,7 +92,7 @@
                   {{ item.userMobile }}
                 </span>
                 <span class="info-call-time" v-if="item.userCallTime">
-                  {{ userCallTime }}小时前呼叫
+                  {{ pastUserCallTime }}小时前呼叫
                 </span>
                 <span class="info-calling" v-if="item.userCallKfStatus == 1">
                   <img :src="infocallImg" alt="" />
@@ -101,7 +101,7 @@
             </div>
           </div>
 
-          <div class="call-status">
+          <div class="call-status" v-if="item.diagnoseType == 1 || item.diagnoseType == 2">
             <img
               v-if="isCall"
               @click="drivingCall(item.userId, 1)"
@@ -199,9 +199,9 @@ export default {
         case 1:
           return "待处理";
         case 2:
-             return '待问诊'
+          return "待问诊";
         case 3:
-             return '问诊进行中'
+          return "问诊进行中";
         case 4:
           return "问诊已完成";
         case 5:
@@ -219,18 +219,24 @@ export default {
     userCallTime() {
       return new Date(this.item.userCallTime).format("hh:mm");
     },
+    pastUserCallTime() {
+      let now_data = new Date().getTime();
+      if (this.item.userCallTime) {
+        return new Date(now_data - this.item.userCallTime).format("hh:mm");
+      } else {
+        return null;
+      }
+    },
     doctorCallTime() {
-      return this.item.doctorCallTime
+      return this.item.doctorCallTime;
     },
-     pastCallTime(){
+    pastDoctorCallTime() {
       let now_data = new Date().getTime();
-      if(this.item.doctorCallTime){
+      if (this.item.doctorCallTime) {
         return new Date(now_data - this.item.doctorCallTime).format("hh:mm");
+      } else {
+        return null;
       }
-      else{
-        return null
-      }
-
     },
     nowtime() {
       return new Date().getTime() - this.item.appointBeginTime;
@@ -267,10 +273,10 @@ export default {
     },
     // 主动呼叫 roletype 1：助诊医生 2：接诊医生
     drivingCall(id, roletype) {
-      if(roletype == 1 && this.isUserChat){
+      if (roletype == 1 && this.isUserChat) {
         return false;
       }
-      if(roletype == 2 && this.isDoctorChat){
+      if (roletype == 2 && this.isDoctorChat) {
         return false;
       }
       this.getInfo(id).then((res) => {
@@ -347,12 +353,12 @@ export default {
 .inquiry-wrap {
   box-sizing: border-box;
   margin-bottom: 10px;
-  padding: 20px 34px;
+  padding: 20px 32px;
   background: #ffffff;
   border-radius: 18px;
   user-select: none;
   //min-width: 610px;
-  border: 1px solid #cccccc;
+  //border: 1px solid #cccccc;
   .line {
     display: flex;
     justify-content: space-between;
@@ -438,8 +444,16 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: center;
-
+            .info-name-wrap{
+              display: flex;
+              align-items: center;
+            }
             .info-name {
+              display: inline-block;
+              max-width: 85px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
               font-size: 18px;
               color: #02120f;
               font-weight: bold;

src/style/common.scss

@@ -128,7 +128,7 @@ html,body{
         // width: 163vh !important;
         // height: 66vh !important;
       //  height: 430px !important;
-        margin: 20px 30px 0px;
+        margin: 10px 10px 0px;
         overflow: auto;
     }
 }
@@ -138,7 +138,7 @@ html,body{
         // height: 78vh !important;
       //  height: 800px !important;
         overflow: auto;
-        margin: 20px 30px 0px;
+        margin: 10px 10px 0px;
     }
 }
 

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

@@ -50,7 +50,7 @@
         <img src="../../../assets/image/workbench/no_data_wz.png" alt="" />
         <div class="nodata-title">暂时没有问诊</div>
       </div>
-      <div class="pagination-container">
+      <div class="pagination-container" v-if="allSize>0">
         <el-pagination
           background
           @size-change="handleSizeChange"
@@ -89,6 +89,7 @@ export default {
     isSuperAdmin(newdata, olddata) {
       // console.log("ererer")
       if (newdata !== olddata && newdata.userID) {
+        console.log('-isSuperAdminisSuperAdmin', newdata)
         const s = storejs.get("soketQuest");
         const d = s ? s.dateTime : new Date().format("yyyy-MM-dd");
         let id =
@@ -296,8 +297,8 @@ export default {
     }
   }
   .workbench-content {
-    min-width: 1250px;
-    padding: 20px;
+    //min-width: 1250px;
+    padding: 20px 10px;
     .workbench-li-c {
       width: 100%;
       .grid-c {
@@ -372,4 +373,16 @@ export default {
   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>

src/views/layout/header.vue

@@ -136,7 +136,7 @@ export default {
   // background-color: #242f42;
   .logo {
     float: left;
-    width: 255px;
+    width: 215px;
     text-align: center;
     color: #fff;
     background: #0b2f3f;

src/views/layout/slidebar.vue

@@ -157,7 +157,7 @@ export default {
   left: 0;
   top: 64px;
   bottom: 0;
-  width: 255px;
+  width: 215px;
   background: #06232c;
   .el-menu {
     background: #06232c;