From b5c6ce06a6ba994bbec9e28f6d35c7ee6689e0f5 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 七月 2023 13:13:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/indexMenu.html | 101 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 25 deletions(-)
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 79d019c..6d77817 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -48,7 +48,11 @@
</li>
</ul>
<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>
+ </a>
+ </li>
<li class="layui-nav-item" lay-unselect>
<a href="javascript:void(0);">
<!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="娑堟伅涓績">-->
@@ -181,31 +185,49 @@
// 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.html'
- }
- //鑾峰彇鑿滃崟鍒楄〃鏁版嵁
- $.ajax({
- url: GetWEBURL() + "/Web/MenuList",
- type: "GET",
- async: false,
- success: function (data) {
- var data = JSON.parse(data.data);
- console.log(data);
- MenuMain(data);
- },
- error: function (data) {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
+
+ //#region 椤甸潰鍒濆鍖�
+ set_sideMenuDisPlay();
+ //#endregion
+
+
+ //#region
+
+ //#endregion
+
+ //#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 ajaxLoad = layer.load();
+ //鑾峰彇鑿滃崟鍒楄〃鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + "/Web/MenuList",
+ type: "GET",
+ async: false,
+ data: { "HMakeName": sessionStorage["HUserName"] },
+ 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) {
@@ -215,7 +237,13 @@
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
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++) {
@@ -248,8 +276,31 @@
}
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
});
-
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
--
Gitblit v1.9.1