Browse Source

解决咨询页面中socket功能不能生效的问题

raolu 7 years ago
parent
commit
a384d4540f
3 changed files with 51 additions and 21 deletions
  1. 21 17
      js/api-service.js
  2. 18 1
      js/buz/index.js
  3. 12 3
      js/buz/prescription-consulting.js

+ 21 - 17
js/api-service.js

@ -14,10 +14,14 @@
        imgServer = "";
    } else { // 测试环境配置
        server = "http://172.19.103.88:9092/wlyy/"
        // server = "http://192.168.131.127:8060/"; //逸祥
        // server = "http://192.168.131.24:8080/"; //仕杰
        imserver = "http://172.19.103.88:3000/api/v2";
        socketUrl = "http://172.19.103.88:3000";
        // server = "http://192.168.131.127:8060/"; //逸祥
        //      server = "http://192.168.131.24:8080/"; //仕杰
        //      imserver = "http://192.168.131.24:3000/api/v2"
        //      socketUrl = "http://192.168.131.24:3000";
        loginUrl = "login.html";
        imgServer = "http://172.19.103.54/";
    }
@ -42,12 +46,12 @@
    } else {
        toLoginPage()
    }
	
	var isRelogined = sessionStorage.getItem('wlyy_relogin')
	if(isRelogined && top !== window && location.href.indexOf("login.html") < 0) {
		sessionStorage.removeItem('wlyy_relogin')
		top.location.reload(true)
	}
    var isRelogined = sessionStorage.getItem('wlyy_relogin')
    if(isRelogined && top !== window && location.href.indexOf("login.html") < 0) {
        sessionStorage.removeItem('wlyy_relogin')
        top.location.reload(true)
    }
    function httpGet(url, options) {
        //发送ajax请求
@ -145,7 +149,7 @@
            return;
        }
        setTimeout(function() {
        	sessionStorage.setItem("wlyy_relogin",1)
            sessionStorage.setItem("wlyy_relogin", 1)
            top.location.replace(loginUrl + '?redirect_url=' + encodeURIComponent(location.href))
        }, 2000)
    }
@ -194,23 +198,23 @@
        return uuid.join('');
    }
    
    /*
     * 获取图片路径方法修改
     */
    function getImgUrl(str){
        if(typeof str != 'string'){
    function getImgUrl(str) {
        if(typeof str != 'string') {
            return "";
        }
        if(str.length == 0){
        if(str.length == 0) {
            return "";
        }else{
            if(str.indexOf("../")>-1){
        } else {
            if(str.indexOf("../") > -1) {
                //访问本地路径
                return str;
            }else if((str.indexOf("http://")>-1) || (str.indexOf("https://")>-1)){
            } else if((str.indexOf("http://") > -1) || (str.indexOf("https://") > -1)) {
                return str;
            }else{
            } else {
                //服务器上的图片路径
                return imgServer + str;
            }

+ 18 - 1
js/buz/index.js

@ -53,6 +53,11 @@ function getTeamInfo(){
            $("#manageTeams").empty().append(manageTeams);
            $("#orderTeams").empty().append(orderTeams);
            
            //如果有显示咨询,则登录IM
            if(isLeader){
                loginIm();
            }
            
            if(target_url) {
            	var url = decodeURIComponent(target_url)
            	$('#content-main .J_iframe').eq(0).attr('src', url)
@ -69,4 +74,16 @@ function getTeamInfo(){
            toastr && toastr.warning(res.msg)
        }
    });
}
}
function loginIm(){
    var params = {
        user_id: docInfo.code,
        token: '',
        client_id: '',
        platform: 3
    }
    APIService.loginIm({data: params}).then(function(res){
        console.log("im 登录成功");
    })
}

+ 12 - 3
js/buz/prescription-consulting.js

@ -85,7 +85,9 @@ function getMessage(isInit){
                });
            }else{
                $("#talkBox").prepend(html);
                $("#talkBox").slimScroll();
                $("#talkBox").slimScroll({
                    scrollTo: 'bottom'
                });
            }
            
            $(".fancybox").fancybox({openEffect:"none",closeEffect:"none"});
@ -203,9 +205,14 @@ function connectSocket(){
        });
        socket.on('message', function (data) {
            console.log(data);
            if(data.read && data.read == "all"){
                return ;
            }
            var html = formatMsg(data);
            $("#talkBox").append(html);
            $("#talkBox").slimscroll();
            $("#talkBox").slimscroll({
                scrollTo: 'bottom'
            });
        });
        socket.on('error', function (data) {
            console.log(data)
@ -265,7 +272,9 @@ function finish(){
                    var content = docInfo.name+'结束了咨询',
                        html = template('sys_msg_tmp', {content: content});
                    $("#talkBox").append(html);
                    $("#talkBox").slimScroll();
                    $("#talkBox").slimScroll({
                        scrollTo: 'bottom'
                    });
                    $('.info-panel').html("咨询求助已结束");
                    $(".send-btn").addClass("disabled");
                    $("#file_head").attr("disabled", true);