From ea5ff87f1b222bca129b866d50aaf5402b69d42f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 18 十二月 2023 09:43:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/index_QiaoYi.html | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 6304075..4905919 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -12,7 +12,13 @@
<link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
-
+ <script language="JavaScript">
+ //灞忚斀鍚庨��鎸夐挳
+ history.pushState(null, null, document.URL);
+ window.addEventListener('popstate', function () {
+ history.pushState(null, null, document.URL);
+ });
+ </script>
<script>
/^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
</script>
@@ -831,15 +837,15 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "user/login.html"; });
}
- //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
- var judgeMorPCflag = judgeMorPC();
- if (!judgeMorPCflag) {//绉诲姩绔�
- var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
- $("#append").prepend(dd);
- }
- if (!judgeMorPCflag) {//绉诲姩绔�
- window.location.href = 'index_Mobile_QiaoYi.html'
- }
+ ////鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
+ //var judgeMorPCflag = judgeMorPC();
+ //if (!judgeMorPCflag) {//绉诲姩绔�
+ // var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+ // $("#append").prepend(dd);
+ //}
+ //if (!judgeMorPCflag) {//绉诲姩绔�
+ // window.location.href = 'index_Mobile_QiaoYi.html'
+ //}
/* $("#LAY_app_flexible").click();*/
});
--
Gitblit v1.9.1