Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yangle

16 小时以前 76824fbc74817dc6a87cef54c2ab18705490356e

 WebTM/views/user/login.html

@@ -33,7 +33,7 @@
                            <select id="HTranSlate" style="width: 18%; margin-right: 1%; padding-left: 1px; font-size: 13px;">
                                <option value="1" selected>中文</option>
                                <option value="2">Eeglish</option>
                                <option value="3">Español</option>
                                <option value="3">Spanish</option>
                            </select>
                            <!--<li class="ax-col"></li>-->
                        </ul>
@@ -67,7 +67,7 @@
                                                    <input name="LAY-user-login-username" value="" placeholder="输入登录名称" type="text" id="LAY-user-login-username">
                                                    <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
                                                </div>
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer"></i>刷卡</button>
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer" style="width: 7px; margin-left: -4px"></i></button>
                                            </div>
                                        </div>
                                    </div>
@@ -285,7 +285,7 @@
            getBaseInfo(login_data2.HTranSlate);


            if (login_data == null) {
            if (login_data == null || login_data2.HTranSlate == undefined) {
                initFunction(1, "login", 1);
            } else {
                initFunction(1, "login", login_data2.HTranSlate);
@@ -325,6 +325,10 @@

            //提交
            form.on("submit(LAY-user-login-submit)", function (obj) {
                if ($("#HTranSlate").val() == null) {
                    layer.msg("请选择语言!");
                    return false;
                }
                loging();
            })

@@ -338,6 +342,10 @@
            //密码框回车执行登录
            $('#LAY-user-login-password').on('keydown', function (e) {
                if (e.keyCode == 13) {
                    if ($("#HTranSlate").val() == null) {
                        layer.msg("请选择语言!");
                        return false;
                    }
                    loging();
                    //playSound();
                }
@@ -364,7 +372,7 @@
                    var data2 = JSON.parse(data);
                    $("#LAY-user-login-username").val(data2["UserID"]);
                    $("#Organization").val(data2["OrgID"]);
                    $("#HTranSlate").val(data2["HTranSlate"]);
                    $("#HTranSlate").val(data2["HTranSlate"] == undefined ? 1 : data2["HTranSlate"]);
                    form.render('select');
                }
            }
@@ -542,9 +550,13 @@

            //获取基础信息
            function getBaseInfo(HTranSlate) {
                if (HTranSlate == undefined) {
                    HTranSlate = "1";
                }

                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/BaseInfo",
                    url: GetWEBURL() + "Web/BaseInfo",
                    async: false,
                    data: {},
                    success: function (res) {