From a5ef49c0913126bc4fbb5a09736ddcb05273e1e7 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 24 九月 2025 17:19:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/user/login.html | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 16a66a4..c51ad35 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -29,11 +29,11 @@
<ul class="ax-row ax-tab-nav ax-menu-tab">
<a href="###" class="ax-item ax-col" style="font-size: 20px;" id="HLogoLabel">鏅轰簯杩堟�滾-MES</a>
- <a class="ax-item FY_BT" id="Hlanguage" >璇█</a>
+ <a class="ax-item FY_BT" id="Hlanguage">璇█</a>
<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>
@@ -223,7 +223,7 @@
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/zgqCustom/zgqCustom.js" type="text/javascript"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/MESLanguage.js"></script>
<script>
layui.config({
@@ -284,15 +284,15 @@
//鑾峰彇鍩虹淇℃伅
getBaseInfo(login_data2.HTranSlate);
-
- if (login_data == null) {
- initFunction(1,"login", 1);
+
+ if (login_data == null || login_data2.HTranSlate == undefined) {
+ initFunction(1, "login", 1);
} else {
- initFunction(1,"login", login_data2.HTranSlate);
+ initFunction(1, "login", login_data2.HTranSlate);
}
-
-
+
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
@@ -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();
}
@@ -352,7 +360,7 @@
$("#HTranSlate").change(function () {
var select = $("#HTranSlate").val();
getBaseInfo(select);
- initFunction(1,HModName, select);
+ initFunction(1, HModName, select);
//sessionStorage["HTranSlate"] = select;
})
@@ -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');
}
}
@@ -448,7 +456,7 @@
} else {//PC绔�
window.location.href = '../../views/indexMenu.html'
}
-
+
}
else {
// $("#verifycode").click();
@@ -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) {
--
Gitblit v1.9.1