From 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:41:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/indexMenu.html | 109 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 29 deletions(-)
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 0a04a52..81b80c7 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -4,14 +4,19 @@
<html>
<head>
<meta charset="utf-8">
- <title>LMES绠＄悊绯荤粺</title>
+ <title id="HCusName"></title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<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>
@@ -49,7 +54,9 @@
</ul>
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
<li class="layui-nav-item" lay-unselect>
- <a href="绯荤粺绠＄悊/鑿滃崟鑷畾涔�/Xt_DefineMenuDisplay.html">鑿滃崟鑷畾涔�</a>
+ <a href="javascript:void(0);">
+ <i id="MenuDefineID" class="layui-icon layui-icon-app"></i>
+ </a>
</li>
<li class="layui-nav-item" lay-unselect>
<a href="javascript:void(0);">
@@ -75,7 +82,7 @@
<i class="layui-icon layui-icon-screen-full"></i>
</a>
</li>
- <li class="layui-nav-item" lay-unselect>
+ <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
<a href="javascript:;">
<cite>
<label name="UserName" id="UserName"></label>
@@ -84,14 +91,13 @@
<dl class="layui-nav-child">
<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>
<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
- <hr>
<dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
- <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
- </li>
+ </li>-->
<li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
<a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
</li>
@@ -103,7 +109,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
<img src="../layuiadmin/myicon/win.svg" alt="PC绔�" style="width:25px;height:25px;margin-right: 5px;" />
- <span>LMES绠＄悊绯荤粺</span>
+ <span id="HMenuLabel"></span>
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
@@ -118,7 +124,6 @@
</dd>
</dl>
</li>-->
-
</ul>
</div>
@@ -151,7 +156,7 @@
<!-- 涓讳綋鍐呭 -->
<div class="layui-body" id="LAY_app_body">
<div class="layadmin-tabsbody-item layui-show">
- <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+ <iframe src="home/console.html" frameborder="0" class="layadmin-iframe" name="mainIFrame"></iframe>
</div>
</div>
@@ -161,9 +166,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;
@@ -177,6 +182,7 @@
var element = layui.element;
var $ = layui.jquery;
+ var HType = "PC"; //鐧诲綍骞冲彴锛歅C绔�佹墜鏈虹
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -189,50 +195,56 @@
set_sideMenuDisPlay();
//#endregion
-
- //#region
-
- //#endregion
+ //鑿滃崟鏍忓懡鍚�
+ setMenuLabel();
//#region 椤甸潰鍏跺畠鏂规硶
//鏄剧ず渚ц竟鑿滃崟
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();
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
$.ajax({
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);
MenuMain(data);
+ layer.close(ajaxLoad);
},
error: function (data) {
+ layer.close(ajaxLoad);
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
}
//閬嶅巻鐢熸垚涓昏彍鍗�
function MenuMain(data) {
-
var liStr = '';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
if (data[i].childMenus != null && data[i].childMenus.length > 0) {
liStr += '<li data-name="set" class="layui-nav-item">';
- liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
+ //璁剧疆涓�绾ц彍鍗曞浘鏍�
+ if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") {
+ liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
+ } else {
+ liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>';
+ }
+
liStr += '<dl class="layui-nav-child">';
// 閬嶅巻鑾峰彇瀛愯彍鍗�
for (var k = 0; k < data[i].childMenus.length; k++) {
@@ -240,7 +252,7 @@
}
liStr += '</dl></li>';
} else {
- liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
+ liStr += '<li class="layui-nav-item"><a class="" id = "' + data[i].Hurl + '" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
}
};
$(".layui-nav-tree").html(liStr);
@@ -261,15 +273,54 @@
subStr += '</dl>';
subStr += '</dd>';
} else {
- subStr += '<dd><a lay-href="' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
+ subStr += '<dd><a lay-href="' + subMenu.Hurl + '" id = "' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
}
return subStr;
}
+
+ //鑿滃崟鑷畾涔夛細寮瑰嚭鑿滃崟鑷畾涔夊瓙椤甸潰
+ Ul = document.getElementById("MenuDefineID");
+ Ul.addEventListener("click", function (event) {
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']
+ , title: '鑿滃崟鑷畾涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '绯荤粺绠＄悊/鑿滃崟鑷畾涔�/Xt_DefineMenuDisplay.html'
+ , resize: false
+ , btn: ["纭畾"]
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }, false);
//#endregion
});
+ //鑿滃崟鏍忓懡鍚�
+ function setMenuLabel() {
+ console.log(sessionStorage["HMenuLabel"]);
+ $("#HMenuLabel").html(sessionStorage["HMenuLabel"]);
+ $("#HCusName").text(sessionStorage["HCusName"]);
+ };
+
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
+
+ function openChildPage(id) {
+ //鑾峰彇椤甸潰
+ var num = document.getElementById(id);
+ num.href = id;
+ num.target = "mainIFrame";
+ num.click();
+
+ console.log(num);
+
+ }
</script>
<!--<script>
--
Gitblit v1.9.1