Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !71

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/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>
@@ -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)"
@@ -81,7 +81,7 @@
               </div>
             </div>
             <div class="inquiry-user-info">
-              <div>
+              <div class="info-name-wrap">
                 <span class="info-name">
                   {{ item.userName }}
                 </span>
@@ -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)"
@@ -353,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;
+  //min-width: 610px;
+  //border: 1px solid #cccccc;
   .line {
     display: flex;
     justify-content: space-between;
@@ -444,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/store/module/socket.js

@@ -56,7 +56,10 @@ export default {
         const n = {notifyIndex: l.length, ...socket}
         store.commit('updateNoticeList', l);
         console.log('--_VM', _VM)
-        store.commit('socket/SET_NOTIFY', n);
+        const {path} =_VM.$route;
+        if(path && String(path).indexOf('workbench') > -1){
+          store.commit('socket/SET_NOTIFY', n);
+        }
       });
       state.socketClient.on('ping', function () {
         console.log('[E] 心跳请求已发出 →', true);

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

@@ -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;