20210412 tqq环境

xiaoyong931011

2021-04-12 a13a93a493e7e94e28b2225c26e7e13b52d3288c

 zq-erp/src/main/resources/templates/views/common/login.html

@@ -205,7 +205,7 @@
                        src="../../images/qrcode.png"></div>
                <form method="post" class="dataForm">
                    <h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">
                        欢迎登录</h3>
                        密码登录</h3>
                    <div>
                        <input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
                               class="form-control uname"/>
@@ -228,7 +228,7 @@
                </form>
            </div>
            <div id="qrCodeWarp">
                <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">账号登录</span><img
                <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">密码登录</span><img
                        class="qrImg"
                        src="../../images/pc.png"></div>
                <div style="border-radius: 3px;
@@ -260,7 +260,7 @@

    </div>
    <div class="signup-footer" style="color: #4968bd;">
        <div class="" style="font-size: 16px;">HIVE管理系统V2.2.0</div>
        <div class="" style="font-size: 16px;">讯聪管理系统V2.3.0</div>
        <div class="">

            <p class="download-bar" style="font-size: 12px;"><strong>浏览器：</strong>Win7以上<a
@@ -312,7 +312,6 @@
        });
        loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
        let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
        console.log(qrInfo);
        qrcode.makeCode(JSON.stringify(qrInfo));
        $('#qrCodeIcon canvas').show();

@@ -390,7 +389,7 @@
            //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
            let  wsPath= getRootPath();
            var socketUrl=  wsPath.replace("http","ws")+ "/webSocketServer?userId="+webClientId;
            console.log(socketUrl);

            if(socket!=null){
                socket.close();
                socket=null;
@@ -403,7 +402,7 @@
            };
            //获得消息事件
            socket.onmessage = function(msg) {
                console.log(msg);

                var serverMsg = JSON.parse(msg.data);

                if(serverMsg.msgType==1){