doctor list

package.json

@@ -26,7 +26,7 @@
     "js-cookie": "^2.2.0",
     "qiniu-js": "^3.1.2",
     "showdown": "^1.6.4",
-    "socket.io-client": "^4.1.3",
+    "socket.io-client": "2.2.0",
     "vue": "^2.1.0",
     "vue-router": "^2.1.1",
     "vuex": "^2.0.0"

src/App.vue

@@ -31,7 +31,7 @@ import {
   bindDragHeader
 } from "./utils/utils.js";
 import { mapActions, mapGetters } from "vuex";
-import { getLoginUrl, getInnerLoginUrl } from "./utils/index.js";
+import { getInnerLoginUrl } from "./utils/index";
 let vm = null;
 export default {
   components: {
@@ -46,7 +46,7 @@ export default {
       userName: "",
 			authList: [],
 			systemType: 0,
-      showChat:true
+      showChat:false
     };
   },
   computed: {
@@ -60,8 +60,13 @@ export default {
     setTimeout( function () {
       bindDragHeader('.c-header', '.chat-wrap');
     }, 1000)
+
+    this.$store.dispatch( 'socket/initSocket',{url: 'http://10.177.11.251:15202'})
+
   },
   methods: {
+    // 修改token
+    ...mapActions(["changeToken"]),
     // 解密token
     getToken() {
       let href = window.location.href;
@@ -94,8 +99,7 @@ export default {
       vm.changeToken(vm.token);
       vm.getUserAuth();
     },
-    // 修改token
-    ...mapActions(["changeToken"]),
+
     // 获取用户权限
     getUserAuth(token) {
       let req = null;

src/components/IM/diagnosis-live.vue

@@ -287,7 +287,6 @@ export default {
         userSig: this.userSig,
         vueInstance: this,
       };
-      console.log('--=-123123-', obj, RtcClient );
       this.rtc = new RtcClient(obj);
       this.$nextTick(() => {
         this.$refs.alert

src/components/common/inquirylist.vue

@@ -80,7 +80,7 @@ export default {
   props:{
     item:{
       type:Object,
-      default:0
+      default:{}
     }
   },
   created() {
@@ -119,9 +119,11 @@ export default {
       }
     },
     appointBeginTime() {
+      if(this.item.appointBeginTime) {
         let starttime =this.item.appointBeginTime.slice(0,10)
         let endtime = `${this.item.appointBeginTime.slice(11,16)}-${this.item.appointEndTime.slice(11,16)}`
         return starttime +' '+ endtime
+      }
     },
   },
   methods: {

src/store/getters.js

-import education from './im/getters'
-
-import { containObject }  from '../utils/utils'
-
-const getters = containObject(education)
-
+const getters = {
+  _token: state => state.common._token,
+  isFromAssignTask: state => state.common.isFromAssignTask,
+  time:state => state.common.time,
+}
 
 export default getters

src/store/im/getters.js

-
-const getters = {
-    _token: state => state.common._token,
-    isFromAssignTask: state => state.common.isFromAssignTask,
-    time:state => state.common.time,
-}
-
-export default getters

src/store/index.js

 import Vue from 'vue'
 import Vuex from 'vuex'
-import common from './im/common'
+import common from './module/common'
+import socket from './module/socket'
 import getters from './getters'
+import state from './state';
+import mutations from './mutations/index';
+import actions from './actions/index';
 
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
+  state,
+  getters,
+  mutations,
+  actions,
   modules: {
-    common
+    common,
+    socket
   },
-  getters
 })
 

src/store/modules/loginUser.js → src/store/module/socket.js

-import { io } from "socket.io-client";
+// ES6 import
+import io from 'socket.io-client';
 
 export default {
   namespaced: true,
@@ -7,39 +8,45 @@ export default {
   },
   actions: {
     initSocket ({ commit, rootState }, payload) {
-      const socket = io("https://example.com", {
-        reconnectionDelayMax: 10000,
-        reconnectionAttempts:'Infinity',
-        reconnection: true,
-        transports: ["websocket"], // use WebSocket first, if available
-        extraHeaders: {"my-custom-header": "1234"},
+      const socket = io.connect(payload.url, {
         query: {
-          x: 42
+          // loginUserNum: `diagnose_list_socket_${userId}`
+          loginUserNum: `diagnose_list_socket_888`
         }
       });
+      console.log('-=-=-=-=',socket)
       commit('SET_SOCKET', socket);
+      commit('SET_IOLISTION');
     },
   },
   mutations: {
     SET_SOCKET: (state, payload) => {
+      window.socketClient = payload;
       state.socketClient = payload;
+
     },
     SET_IOLISTION: (state, payload) => {
       if(!state.socketClient){
         return false;
       }
       state.socketClient.on("connection", (socket) => {
-        console.log(socket);
+        console.log ('socket 链接成功',socket);
       });
       state.socketClient.on("connect_error", (err) => {
-        if (err.message === "invalid credentials") {
-        }
+        console.log ('socket connect_error',err);
       });
       state.socketClient.on("disconnect", (socket) => {
-        console.log(socket);
+        console.log ('socket disconnect',socket);
+      });
+      state.socketClient.on("diagnose_push_event", (socket) => {
+        console.log('diagnose_push_event---', socket);
+      });
+      state.socketClient.on('ping', function () {
+        console.log('[E] 心跳请求已发出 →', true);
       });
-      state.socketClient.on("data", (socket) => {
-        console.log(socket);
+      //收到
+      state.socketClient.on('pong', function () {
+        console.log('[E] 心跳响应已收到 ←', true);
       });
     },
   },

src/store/state.js

+/* 内存数据状态 */
+
+export default {
+};

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

@@ -18,7 +18,7 @@
          </div>
         </el-row>
         <!-- tab栏 -->
-      <div id="radio" v-if="isdon ==='1'">
+      <div id="radio">
       <el-radio-group v-model="tabPosition" style="margin-bottom: 30px;" >
       <el-radio-button label="all">全部(0)</el-radio-button>
       <el-radio-button label="abnormal">异常(0)</el-radio-button>
@@ -30,53 +30,14 @@
       <el-row :gutter="25">
         <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 9 " :key="item">
             <div class="grid-content bg-purple">
-                <div class="for"></div>
+                <div class="for">
+                  <inquiryList-component></inquiryList-component>
                 </div>
-         </el-col>
-      </el-row>
-     
-      </div>
-
-      <div class="lfet" v-else >
-        <el-row :gutter="20">
-        <el-col :span="6"><div class="grid-content bg-purple">
-            <span>总问诊数</span>
-            <span>0单</span>
-          </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <span>已问诊数</span>
-          <span>0单</span>
-          </div></el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-          <span>问诊中</span>
-          <span>0单</span>
-        </div>
-        </el-col>
-        <el-col :span="6"><div class="grid-content bg-purple">
-        <span>未问诊</span>
-        <span>0单</span>
-        </div>
-        </el-col>
-        </el-row>
-        <div ><i class="el-icon-s-custom"> 运营A成员(6单)</i></div>
-        <el-row :gutter="25">
-        <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 6 " :key="item">
-            <div class="grid-content bg-purple">
-                <div class="for"></div>
-             </div>
-         </el-col>
-      </el-row>
-        <div ><i class="el-icon-s-custom">运营B成员(2单)</i></div>
-        <el-row :gutter="25">
-        <el-col style="margin-bottom: 20px;" :span="8" v-for="item in 6 " :key="item">
-            <div class="grid-content bg-purple">
-                <div class="for"></div>
              </div>
          </el-col>
       </el-row>
+
       </div>
-      <!-- <el-empty :image-size="200" description="描述文字"></el-empty> -->
-      <!-- 分页 -->
       <el-row type="flex" justify="end" >
         <el-pagination
         background
@@ -95,16 +56,17 @@
 </template>
 
 <script>
+import InquiryListComponent from '../../../components/common/inquirylist.vue';
+console.log('---InquiryList', InquiryListComponent);
 export default {
   components: {
+    InquiryListComponent
   },
    data(){
      return {
        tabPosition:"all",
        value1:Date.now(),
        currentPage4:0,
-       // 判断是否是管理员
-       isdon:'1',
        showChat: true
      }
    },