Merge branch 'feature/zl' into 'release'

Feature/zl

See merge request !152

imgMd5List.json

+{"04094c981e19b077458ac5d414185112":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/logo.png","1211365adaf1b4ec771bd88c833a880b":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/default.png","ce61da2f6bf1eb6459e85af50b359bc4":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/footer-icon.png","739c4ef79f68611bf4e43c7b981620b2":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/mm.jpg","8c330ac70b9272095e71ee97bf5afd4b":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/index_logoicon.png","523e94358197546c40edadc921593dfb":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/menu1.png","865c6c5fbbbf7050048aeccb3017e911":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/menu2.png","527810387384d793b6ab6eef46156ffb":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/no-content.png","209cb91fc2fd3cd3ed3ee0a8dbcf9c1d":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/no-content1.png","6599b1e484f5af49bf4cebca0e799812":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/noData.png","c854111e04d168e522281c3fbfe72df5":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/small.png","f94996a13b960effe94989c5957e4b42":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/close-call.png","44ccf56a79c8edb3a5ce8fef6a26a231":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/no-camera.png","04c83af49218fafe8d8c6089c2ea217a":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/voice-close.png","fe7ab70abde84f7ac1ae6313f9645b0b":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/voice-small.png","25a8e68f45ec649c79248db1fe31e8c9":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/voice.png","1faf0833ebbedfda6d17955f8e28594c":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/waiting-call.png","f98a82b4194f76eab457b06e3d2e7c66":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/live/warning.png","6ec04aa3b33066f2c68569ba58bc4ca6":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/Icon-calendar.png","ccce5124739cb6198824c9540d3fadef":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/Icon-search.png","8e3527f62dcd15391482e9b73bfeeba2":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/Icon-sel-no.png","a91444748c06325ea33d001995782e5e":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/check-no.png","7d962f5e778d83fdaa29996b166bfc37":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/check-yes.png","2eb4cd4f705b890049038538332dfe6b":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/down-2.png","8509ab20474be1d2b45a2307e879335a":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/down.png","69460ac3712a98af9673b0b729f722e7":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/file-text-2.png","13a22959d620da58bf617c2158fea27c":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/folder-open-2.png","9f7e069aa42684d54ce62240135e5e7a":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-comment.png","f2a3ffe7ba3ec3df2db7f14bbf7f4815":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-contacts.png","c6ddf67990cac1414a14e1a98e9722fa":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-download.png","cc58a2a3f8868ca13d567fbe117de2f1":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-exit.png","0efa6485aacd1cac491c3f1313f348ad":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-file-search.png","67c06d425d6db623e264c3ac2f08da49":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-folder-open.png","ff1499485988321abbf2657a9e18b4cf":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-fresh-2.png","17ec7d4e0499ff61d4ef9939a5e6428f":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-home.png","698d2d257867569ec399c08468ed5303":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-id-card.png","f2f90f4dcd14190d1f2bd86f54b2cf13":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-link.png","065b545d1d83e0456f0e1daa53597a83":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-minus.png","a4cc9df6601a1c5090cf2168dcc7dbde":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-no-send.png","fb3677a52cceb986a3f3343e07a3e2db":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-org.png","8b6e74338243db8bcdea35be8e5a5e38":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-pdf.png","17d834654243c38a199635a00dd7446c":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-phone-no.png","a6b6cc69354232c8d3050cc620e76198":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-plus.png","5f8600eefac5efecdcdf54826b2ef241":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-right-gray.png","89aa7e4d0f1e366395f55e9970ad3cbf":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-sel-checked.png","c645c2246f82d6d03a2fc3bc3f0784f4":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-team.png","6397dbfdf90559f8a4bd8232ae07de75":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-time-circle.png","293003bc154df60b8246a2b1a9d7c37d":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/icon-warning-circle.png","952c520ede22bc3b7acfcdadcf275616":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_close.png","b52e26837623d200333631f103d98b3d":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_close2.png","fa72624d8fc22600303284d811b2eba1":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_man1.png","1ee9e967594f2431cc2d5b488fdef1a2":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_man2.png","2cf21b4a08769bce649212cd664c7aec":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_sendfile.png","46c7f58b6ecc1b9131cdaeb16e8fdb46":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_sendvedio.png","3fc6108bdbb192a275c93c81b68df045":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_small.png","d6a21a2a70672a21e71f4f9a012017ea":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_text.png","c524f8dc61fb177e2c0ec6ba583e16cb":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_time.png","34a79d4b3e08fa1975c4d6907564228c":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/im_video.png","fa9d7d646a9a69b71fae713831df6a66":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/kf-avatar.png","bfc960810928cdee01b2ed84a7c06e2b":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/link-2.png","b980d3476ef41c82308f8c5cdad88531":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/loading-icon-new.png","32925e323462fe90f4882878e0e06557":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/loading-icon.png","d73985857b58cabaec3d78a75306b65c":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/logo-small.png","66e2b7f6f6afdb328dfe2fb0fe271fb5":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/no-search-list.png","f961abf468fe062cc8c6cb5af0a8695d":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/plus-task.png","c23e76ce2fa154090c58e27cd95e83f4":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/right-no.png","aee074558d02e3f5abea690b75337be3":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/right-yes.png","729084b7e8114c57146907d1cd1885df":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/send-no.png","cb4afae3d4197d8991c3d210ce6b86b4":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/send-yes.png","131b8e5595a9eae4b152d0aff5de1185":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/upload-2.png","4107110c540e0357837f881d536548b7":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/upload.png","ce46719d7b61c94af00a5fbe9e7d2e9f":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/voice.png","5c402aef9047604682ddf89f6800f587":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/IM/wenzhenicon.png","46138f4da71d22ea9f52b96381d2b488":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/appointment.png","700baa3be1ed6ed0d15aed0a567ffcc9":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/calling.png","2b73b262d39408258813f8a9799a1d9f":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callout.png","529313b564b3c06e4cdcf5fda56b62b3":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/callouting.png","4f11e4aa938f3f7e6d3e5ee1c2e6ca22":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/consulting hours.png","250afe058cb804b2c1a9d14dbf5f76fd":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/doctorCallcustomer.gif","4dd8e00757b8abe9b0d82ddac09f30a8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/no_data_wz.png","2dc933e1793141de0879ee694f7b2901":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/offline.png","203dd7fbdb3c43eb3a0fe48946321f64":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/photo.png","3cb41883c5525e3ff1e48f2636de8de8":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/video.png","cc6f11704c4393870abe9065d85f7244":"/Users/evan/Desktop/pica/pica-admin-consultation/src/assets/image/workbench/voice.png"}
\ No newline at end of file

src/components/IM/diagnosis-live.vue

@@ -304,7 +304,7 @@
           .catch(() => {
             this.$message.error('未获取到相关信息');
             this.memberList = [];
-            // this.getErr();
+          // this.getErr();
           });
       },
       // 获取AppId
@@ -548,8 +548,8 @@
         this.muteLocalAudio();
         this.rtc.leave();
         this.clearSession();
-        window.location.href = 'about:blank';
-        window.close();
+      // window.location.href = 'about:blank';
+      // window.close();
       },
       // 结束会话
       overFn() {

src/store/modules/main.js

@@ -21,6 +21,7 @@ const main = {
       isSuper: false,
       userID: '',
     },
+    currentTabStatus: '',
   },
   mutations: {
     updateCurrentDiagList(state, obj) {
@@ -84,9 +85,11 @@ const main = {
       state.noticeList = obj;
     },
     updateIsSuperAdmin(state, obj) {
-      console.log('obj----11111-----', obj);
       state.isSuperAdmin = obj;
     },
+    updateCurrentTabStatus(state, obj) {
+      state.currentTabStatus = obj;
+    },
   },
   actions: {
     gotoInquiry({ commit }, current) {

src/store/modules/socket.js

@@ -27,11 +27,31 @@ const socket = {
       });
       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/updateCurrentDiagList', list, { 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) => {
         const l = window._VM.$store.state.main.noticeList;

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

@@ -112,34 +112,6 @@
           pageSize: 6,
           pageNo: 1,
         },
-        testlistdata: [
-          {
-            appointBeginTime: '2021-07-29T05:28:57.396Z',
-            appointEndTime: '2021-07-29T05:28:57.396Z',
-            department: '内科',
-            departmentId: 3876,
-            diagnoseLogId: 38,
-            diagnoseType: 1,
-            doctorCallKfStatus: 1,
-            doctorCallTime: '',
-            doctorId: 0,
-            doctorMobile: '16789987665',
-            doctorName: '孙思邈',
-            doctorTrtcEntryStatus: 1,
-            imStatus: 0,
-            imTeamId: '',
-            returnStatus: 1,
-            roomId: 'string',
-            sort: 0,
-            status: 0,
-            userCallKfStatus: 0,
-            userCallTime: '',
-            userId: 0,
-            userMobile: '12343123233',
-            userName: '孙思邈',
-            userTrtcEntryStatus: 0,
-          },
-        ],
       };
     },
     computed: {
@@ -168,6 +140,7 @@
           };
           this.searchParam = p;
           this.tabPosition = s ? s.returnStatus : 1;
+          this.$store.commit('main/updateCurrentTabStatus', s);
           this.inquirySearch('clear');
         }
       },
@@ -179,6 +152,7 @@
       const s = storejs.get('soketQuest');
       const t = s ? s.returnStatus : 1;
       this.tabPosition = t;
+      this.$store.commit('main/updateCurrentTabStatus', t);
       const d = s ? s.dateTime : new Date().format('yyyy-MM-dd');
       this.searchParam.dateTime = d;
       const id =
@@ -191,6 +165,8 @@
         s.returnStatus = val;
         this.searchParam = s;
         s.pageNo = 1;
+
+        this.$store.commit('main/updateCurrentTabStatus', val);
         this.inquirySearch('tab');
       },
       changeDatetime(val) {

vue.config.js

@@ -12,7 +12,7 @@ module.exports = {
       dpsLimit: 5,
     },
     tinypng: {
-      key: '',
+      key: 'MNf7Lv3sWXvJMl7lBtXncb6WRLfCjcYn',
     },
   },
   // assetsDir: 'static',