Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

cp

2023-02-13 8730e273d5dbf1de6438c12882e69549cf44faf3

Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

 src/main/java/com/zy/core/MainProcess.java

@@ -69,8 +69,8 @@

                    //启动、完成、暂停测试系统测试
                    mainService.packTest();
                    //火警，给堆垛机发送火警警报
                    mainService.fierCrn();
//                    //火警，给堆垛机发送火警警报
//                    mainService.fierCrn();

                } catch (Exception e) {
                    e.printStackTrace();

 src/main/webapp/views/login.html

@@ -212,7 +212,12 @@
                    if (res.code === 200){
                        localStorage.setItem("token", res.data.token);
                        localStorage.setItem("username", res.data.username);
                        window.location.href = "index.html";
                        if (mobile==="dsj1"){
                            window.location.href = "index.html";
                        }else {
                            window.location.href = "index2.html";
                        }

                    } else {
                        layer.msg(res.msg, {offset: '150px'});
                    }