shenzaixin 5 years ago
parent
commit
62521a8f64

+ 8 - 2
src/Main.vue

@ -53,6 +53,8 @@ export default {
    };
  },
  mounted() {
    let loginDoctor = storage.getItem(storage.API_LOGIN_DOCTOR)
    let socket2 = SocketService.loginLocalSocket();
    // let socket2 = new WebSocket("ws://localhost:30001/socket.io/?EIO=3&transport=websocket&sid=EP0Cejs68HHAXmcGn19z&t=MTIiRCK");
@ -74,16 +76,18 @@ export default {
    socket2.on("syncServerHost", data => {
      console.log("syncServerHost", data);
      ajaxUrl.socketUrl = "https://" + data.server_host + ":9000";
      ajaxUrl.socketUrl = "https://" + data.server_host + ":443";
      ajaxUrl.imServer =
        "https://" + data.server_host + ":" + data.port + "/api/v2";
      ajaxUrl.videoScoketUrl = data.server_host + ":9000/groupcall";
      //ajaxUrl.videoScoketUrl = data.server_host + ":8443/groupcall";
      ajaxUrl.videoScoketUrl = data.server_host + "/groupcall";
      window.localStorage.setItem(
        "serverUrl",
        "https://" + data.server_host + ":" + data.port
      );
      vm.loginIM();
      this.$router.replace("/message");
      this.$root.bus.$emit("loadSessionDoctor");
    });
    // 错误提醒
@ -93,6 +97,8 @@ export default {
    // scoket连接成功
    socket2.on("ack", function(data) {});
    //socket2.emit('login', { userId: loginDoctor.uid ,client_system: "cityihealth"})
    this.$root.bus.$on("app:imlogout", function() {
      socket.close();
    });

+ 3 - 1
src/assets/js/ajaxurl.js

@ -2,7 +2,9 @@ import store from '../../store'
// var NODE_ENV=process.env.NODE_ENV
let imgUploadUrl = process.env.VUE_APP_IMG_UPLOAD_URL
let serverUrl = window.localStorage.getItem("serverUrl");
if(!serverUrl){
  serverUrl = "http://172.16.1.42:9000";
}
export default {
  useServer: serverUrl,
  imServer: serverUrl + "/api/v2",

+ 2 - 1
src/assets/js/apis/api-p2psocket.js

@ -24,7 +24,8 @@ function mesPushLogin() {
//登录本地的托盘socket
function loginLocalSocket() {
  let socket = io.connect(ajaxurl.localSocket)
  socket.emit('login', { userId: loginDoctor.uid })
  socket.emit('login', { userId: loginDoctor.uid ,client_system: "cityihealth"})
  socket.emit('getServerHost', {})
  return socket
}

+ 6 - 2
src/components/messagePage.vue

@ -44,7 +44,7 @@ export default {
        messageContent,
    },
    mounted() {
        this.getSessionsDoctor()
        //this.getSessionsDoctor()
    },
    // 发送消息通过全局传参过来的信息
    created() {
@ -58,6 +58,10 @@ export default {
        this.isleader = loginDoctor.isLeader
        this.authOperate = authOperate
        this.$root.bus.$on('loadSessionDoctor', value => {
            this.getSessionsDoctor()
        })
        this.$root.bus.$on('translateDocMSg', value => {
            // this.translateDocMsg(value)
        })
@ -274,7 +278,7 @@ export default {
                            '</div>'
                } else {
                    images += '<div class="div-image" style="' + cssArr[i] + '">' +
                                    '<img src=".images/d-male.png"/>' +
                                    '<img src="./images/d-male.png"/>' +
                                '</div>'
                }
            }

+ 0 - 1
src/components/messagePage/message-list.vue

@ -137,7 +137,6 @@ export default {
    props: ['records', 'readJudge', 'dialogIndex'],
    components: {},
    mounted() {
    },
    computed: {
    },

+ 1 - 1
src/components/videoChat/video-chat.vue

@ -229,7 +229,7 @@ export default {
    watch:{
        chatMembers1(){
            var vm = this
            this.ws = new WebSocket('wss://'+ ajaxUrl.videoScoketUrl);
            this.ws = new WebSocket('wss://'+ ajaxUrl.videoScoketUrl.replace("https://",""));
            this.initWS();
            if(this.createChat){
                //发起视频聊天