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/indexMenu.html | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 6d77817..30c7c5a 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -11,7 +11,12 @@
<link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
<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>
@@ -50,7 +55,7 @@
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
<li class="layui-nav-item" lay-unselect>
<a href="javascript:void(0);">
- <cite id="MenuDefineID">鑿滃崟鑷畾涔�</cite>
+ <i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
</a>
</li>
<li class="layui-nav-item" lay-unselect>
@@ -163,9 +168,9 @@
</div>
<script src="../layuiadmin/layui/layui.js"></script>
- <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../layuiadmin/Scripts/webConfig.js"></script>
<script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../layuiadmin/PubCustom.js"></script>
<script>
// 瀵艰埅鑿滃崟鐨勯棿闅斿儚绱�
var menuCell = 5;
@@ -179,6 +184,7 @@
var element = layui.element;
var $ = layui.jquery;
+ var HType = "PC"; //鐧诲綍骞冲彴锛歅C绔�佹墜鏈虹
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -200,14 +206,14 @@
//鏄剧ず渚ц竟鑿滃崟
function set_sideMenuDisPlay() {
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸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.html'
- }
+ //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.html'
+ //}
var ajaxLoad = layer.load();
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
@@ -215,7 +221,7 @@
url: GetWEBURL() + "/Web/MenuList",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"] },
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
success: function (data) {
var data = JSON.parse(data.data);
console.log(data);
--
Gitblit v1.9.1