save

package-lock.json

@@ -1308,7 +1308,6 @@
       "resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -2832,8 +2831,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2854,14 +2852,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2876,20 +2872,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3006,8 +2999,7 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3019,7 +3011,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3034,7 +3025,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3042,14 +3032,12 @@
         "minimist": {
           "version": "1.2.5",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3068,7 +3056,6 @@
           "version": "0.5.3",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -3130,8 +3117,7 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -3159,8 +3145,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3172,7 +3157,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3250,8 +3234,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3287,7 +3270,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3307,7 +3289,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3351,14 +3332,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3739,8 +3718,7 @@
       "version": "2.16.3",
       "resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "home-or-tmp": {
       "version": "2.0.0",

src/App.vue

@@ -66,7 +66,7 @@ export default {
   },
   mounted() {
     setTimeout( function () {
-      bindDragHeader('.c-header', '.chat-wrap');
+      bindDragHeader('.c-header', '.chat-wrap','.wenzenbox');
     }, 1000)
 
   },

src/components/IM/chat.scss

@@ -4,9 +4,9 @@
   right: 20px;
   z-index: 1000;
   width: 640px;
-  height: 733px;
+  min-height: 700px;
   background: #ffffff;
-  box-shadow: 10px 10px 50px 0px #D9D9D9;
+  box-shadow: 10px 10px 50px 0px #d9d9d9;
   overflow: hidden;
   border-radius: 18px;
 
@@ -27,42 +27,42 @@
         }
         .c-header-l {
           color: #063948;
-            .num{
+          .num {
             font-size: 28px;
           }
-            .dep{
+          .dep {
             font-size: 20px;
           }
         }
-          .c-header-edit{
+        .c-header-edit {
           display: flex;
           min-width: 140px;
           justify-content: space-around;
-            .edit-img{
+          .edit-img {
             width: 24px;
             height: 24px;
-              img{
+            img {
               width: 100%;
               height: 100%;
             }
           }
-            .edit-imgclose{
+          .edit-imgclose {
             width: 70px;
             height: 24px;
-              background: #FF5E57;
+            background: #ff5e57;
             border-radius: 12px;
             font-size: 13px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-              color: #FFFFFF;
+            color: #ffffff;
             line-height: 24px;
-              user-select:none;
+            user-select: none;
           }
         }
       }
       .msg-content {
         height: 400px;
-          background: #F0F2F5;
+        background: #f0f2f5;
         word-break: break-all;
         overflow: scroll;
         display: flex;
@@ -223,7 +223,7 @@
                 }
                 .time {
                   padding-bottom: 10px;
-                      font-size:12px;
+                  font-size: 12px;
                   font-weight: 700;
                 }
                 .time-text {
@@ -247,7 +247,6 @@
                   .label {
                   }
                 }
-
               }
               & > .audio-box audio {
                 width: 242px;
@@ -274,14 +273,14 @@
                   font-size: 14px;
                   &::before {
                     flex: 1;
-                      content: '';
+                    content: "";
                     height: 1px;
                     margin-right: 18px;
                     //background: #f0f1f2;
                   }
                   &::after {
                     flex: 1;
-                      content: '';
+                    content: "";
                     height: 1px;
                     margin-left: 18px;
                     //background: #f0f1f2;
@@ -308,17 +307,21 @@
             }
           }
         }
-          .msg-item{
+        .msg-item {
           color: #063948;
-            .mid-text{
+          .mid-text {
             background: #ffffff;
           }
         }
-          .cr{
+        .cr {
           color: #ffffff;
-            .mid-text, .live-notice, .time-box, .diagnosis-box, .suggession-box{
+          .mid-text,
+          .live-notice,
+          .time-box,
+          .diagnosis-box,
+          .suggession-box {
             background: #449284;
-              .time{
+            .time {
               color: #ffffff;
             }
           }
@@ -333,14 +336,14 @@
           color: #999999;
           &::before {
             flex: 1;
-              content: '';
+            content: "";
             height: 1px;
             margin-right: 18px;
             background: #f0f1f2;
           }
           &::after {
             flex: 1;
-              content: '';
+            content: "";
             height: 1px;
             margin-left: 18px;
             background: #f0f1f2;
@@ -357,7 +360,7 @@
           opacity: 0.45;
           margin: -2px 0 10px;
           padding: 4px 12px;
-            color: #FFFFFF;
+          color: #ffffff;
           background: #000000;
           margin-left: 50px;
           &.mr {
@@ -366,8 +369,7 @@
           }
         }
       }
-        .msg-content::-webkit-scrollbar
-        {
+      .msg-content::-webkit-scrollbar {
         width: 0px;
         height: 0px;
         background-color: #fff;
@@ -401,15 +403,15 @@
           font-size: 14px;
           font-weight: bold;
         }
-          ::v-deep.el-textarea{
-            .el-textarea__inner{
+        ::v-deep.el-textarea {
+          .el-textarea__inner {
             border: none;
           }
         }
-          ::v-deep.c-bottom-input{
+        ::v-deep.c-bottom-input {
           //border: 4px solid #0d9078 !important;
-            ::v-deep textarea{
-              border: none!important ;
+          ::v-deep textarea {
+            border: none !important ;
           }
         }
       }
@@ -430,6 +432,7 @@
         }
       }
     }
+
     background: #fff;
     .time {
       color: #999999;
@@ -437,7 +440,7 @@
     .small {
       font-size: 12px;
     }
-      .ld{
+    .ld {
       -webkit-transition-property: -webkit-transform;
       -webkit-transition-duration: 1s;
       -moz-transition-property: -moz-transform;
@@ -447,20 +450,53 @@
       -o-animation: rotate 3s linear infinite;
       animation: rotate 3s linear infinite;
     }
-      @-webkit-keyframes rotate{from{-webkit-transform: rotate(0deg)}
-          to{-webkit-transform: rotate(360deg)}
+    @-webkit-keyframes rotate {
+      from {
+        -webkit-transform: rotate(0deg);
+      }
+      to {
+        -webkit-transform: rotate(360deg);
+      }
+    }
+    @-moz-keyframes rotate {
+      from {
+        -moz-transform: rotate(0deg);
       }
-      @-moz-keyframes rotate{from{-moz-transform: rotate(0deg)}
-          to{-moz-transform: rotate(359deg)}
+      to {
+        -moz-transform: rotate(359deg);
       }
-      @-o-keyframes rotate{from{-o-transform: rotate(0deg)}
-          to{-o-transform: rotate(359deg)}
     }
-      @keyframes rotate{from{transform: rotate(0deg)}
-          to{transform: rotate(359deg)}
+    @-o-keyframes rotate {
+      from {
+        -o-transform: rotate(0deg);
       }
+      to {
+        -o-transform: rotate(359deg);
       }
     }
-.shrink64{
-  height: 64px;
+    @keyframes rotate {
+      from {
+        transform: rotate(0deg);
+      }
+      to {
+        transform: rotate(359deg);
+      }
+    }
+  }
+}
+.wenzenbox {
+      width: 120px;
+      height: 120px;
+      img{
+        width: 120px;
+        height: 120px;
+      }
+    }
+.shrink64 {
+  height: 120px;
+  width: 120px;
+  background-color: transparent;
+  box-shadow:none;
+  overflow: hidden;
+  border-radius: 18px;
 }

src/components/IM/diagnosis-live.vue

@@ -16,8 +16,7 @@
         </div>
       </div>
     </div>
-    <div class="main" v-if="currentChat.diagnoseType == 1">
-
+    <div class="main" v-if="currentChat.diagnoseType == 1 || currentChat.diagnoseType == 2">
       <div
         class="viedo-wrapper"
         v-for="(item, index) of memberList"
@@ -35,13 +34,16 @@
             <p class="text-num">{{item.role == 1 ? currentChat.doctorMobile : currentChat.userMobile}}</p>
           </div>
         </div>
-        <div class="viedo" :id="rtc.viewslist[index] ? rtc.viewslist[index].id : ''">
+        <div :class="{viedowrap:currentChat.diagnoseType == 2}" :id="rtc.viewslist[index] ? rtc.viewslist[index].id : ''">
+        </div>
+        <div class="viedo-btn-wrap" :id="rtc.viewslist[index] ? rtc.viewslist[index].id : ''">
           <el-button class="call-btn"
                      :class="{calling1: item.role == 1 && doctorTrtcEntryStatus== 3, calling2: item.role == 2 && userTrtcEntryStatus== 3}"
                      @click="drivingCall(item)">
             {{ item.role == 1 ? showText(doctorTrtcEntryStatus) : showText(userTrtcEntryStatus)}}
           </el-button>
         </div>
+
       </div>
       <div class="vedio-man">
         <p class="man-img" @click="toggleVol">
@@ -637,11 +639,12 @@ export default {
     flex: 1;
     .viedo-wrapper {
       width: 224px;
-      height: 120px;
+      // height: 240px;
       background: #F0F2F5;
       border-radius: 18px;
       padding: 15px;
       margin-right: 2%;
+         position: relative;
       .text {
         display: flex;
         .text-left{
@@ -690,7 +693,7 @@ export default {
           align-items: flex-end;
         }
       }
-      .viedo {
+      .viedo-btn-wrap {
         .call-btn{
           width: 173px;
           height: 38px;
@@ -703,6 +706,22 @@ export default {
         .calling1, .calling2 {
           background: #9FC8C0;
         }
+        .viedo-container{
+
+          width: 100px;
+          height:100px;
+          margin: auto;
+            margin-top: 15px;
+          // position: absolute;
+          // top: 0;
+          // left: 0;
+          // right: 0;
+          // bottom: 0;
+          // margin:  auto;
+        }
+      }
+      .viedowrap{
+        height: 180px;
       }
     }
     .vedio-man{
@@ -746,4 +765,5 @@ export default {
     margin: 15px auto 6%;
   }
 }
+
 </style>

src/components/common/consultation.vue

@@ -58,8 +58,10 @@ export default {
         pageSize: 6,
         returnStatus: 1
       };
+       this.$store.commit("clearRawCurrentCalList")
       this.POST('/diagnose/socket/condition/update', p).then(res=>{
          if(res.code == '000000'){
+
            this.$store.commit('updateSoketQuest', p)
            this.$router.push({path:'/workbench'})
          }else{

src/store/mutations/index.js

 import storejs from 'storejs';
-
 export default {
   updateCurrentDiagList(state, obj) {
     state.currentDiagList = obj;
   },
+  // 改变原数据
+  changeRawCurrentCalList(state,obj){
+    // console.log("obj",obj)
+
+    let index = state.RawCurrentCalList.findIndex(val=>{
+      return val.status==obj.status
+    })
+    if(index>-1){
+      state.RawCurrentCalList[index]=obj
+      state.currentCalList[index].is_dot=false
+    }
+  },
+  clearRawCurrentCalList(state){
+    state.RawCurrentCalList=[]
+  },
   updateCurrentCalList(state, obj) {
-    state.currentCalList = obj;
+    let NewData=obj
+    if(state.RawCurrentCalList.length==0){
+      state.RawCurrentCalList=obj
+    }
+    let RawData=state.RawCurrentCalList
+    for (let i = 0; i < NewData.length; i++) {
+        let is_dot = false;
+        if (RawData.length > 0) {
+          is_dot = NewData[i].count > RawData[i].count ? true: false;
+        }
+        NewData[i] = {
+            ...NewData[i],
+            is_dot: is_dot,
+        };
+    }
+    state.currentCalList = NewData;
   },
   updateCurrentChat(state, obj) {
     state.currentChat = obj;

src/store/state.js

@@ -3,6 +3,7 @@
 export default {
   currentDiagList:[],
   currentCalList:{},
+  RawCurrentCalList:[],
   currentChat: {},
   currentAdvice: {},
   soketQuest: {},

src/utils/utils.js

@@ -816,7 +816,7 @@ const change = (num) => {
     }
     return num;
 }
-
+// 拖拽
 export const bindDragHeader = (classname,content) =>{
   const dragDom = document.querySelector(classname);
   const con = document.querySelector(content);

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

@@ -29,7 +29,7 @@
           :label="item.status"
         >
           {{ item.statusStr }}({{ item.count }})
-          <i class="circle-red"></i>
+          <i class="circle-red" v-if="item.is_dot"></i>
         </el-radio-button>
         <!--    <el-radio-button label="1">待处理({{currentCalList}})</el-radio-button>-->
       </el-radio-group>
@@ -80,6 +80,7 @@ export default {
   },
   watch: {
     isSuperAdmin(newdata, olddata) {
+      // console.log("ererer")
       if (newdata !== olddata && newdata.userID) {
         const s = storejs.get("soketQuest");
         const d = s ? s.dateTime : new Date().format("yyyy-MM-dd");
@@ -93,15 +94,14 @@ export default {
           returnStatus: s ? s.returnStatus : 1,
         };
         this.searchParam = p;
-        this.inquirySearch();
+        this.inquirySearch("clear");
       }
     },
   },
   data() {
     const s = storejs.get("soketQuest");
     const d = s ? s.dateTime : new Date().format("yyyy-MM-dd");
-    let id =
-      s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
+    let id = s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
     return {
       tabPosition: "1",
       showChat: true,
@@ -145,18 +145,19 @@ export default {
     };
   },
   created() {},
+  mounted() {},
   methods: {
     tabChange(val) {
       const s = this.searchParam;
       s.returnStatus = val;
       this.searchParam = s;
-      this.inquirySearch();
+      this.inquirySearch("tab");
     },
     changeDatetime(val) {
       const s = this.searchParam;
       s.dateTime = val.format("yyyy-MM-dd");
       this.searchParam = s;
-      this.inquirySearch();
+      this.inquirySearch("clear");
     },
     handleSizeChange(val) {
       const s = this.searchParam;
@@ -169,11 +170,24 @@ export default {
       this.searchParam = s;
       this.inquirySearch();
     },
-    inquirySearch() {
+    inquirySearch(type) {
       const p = this.searchParam;
+      if (type == "clear") {
+        this.$store.commit("clearRawCurrentCalList");
+      }
+
       this.POST("/diagnose/socket/condition/update", p).then((res) => {
         if (res.code == "000000") {
           this.$store.commit("updateSoketQuest", p);
+          if (type == "tab") {
+            const returnStatus = p.returnStatus;
+            const RespList = res.data.list[0].recordResp.countRespList.filter(
+              (val) => {
+                return val.status == returnStatus;
+              }
+            );
+            this.$store.commit("changeRawCurrentCalList", RespList[0]);
+          }
         } else {
           this.$message({
             message: res.message,