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/系统管理/菜单自定义/Xt_DefineMenuDisplay.html | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
index c3fd0db..34c0f31 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\217\234\345\215\225\350\207\252\345\256\232\344\271\211/Xt_DefineMenuDisplay.html"
@@ -18,6 +18,7 @@
<script src="//unpkg.com/layui@2.8.8/dist/layui.js"></script>
<script src="../../../layuiadmin/Scripts//jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
layui.use(function () {
var tree = layui.tree;
@@ -29,6 +30,8 @@
var option = {}; //鏍戠粍浠剁殑娓叉煋鍙傛暟锛屼繚瀛樻爲缁勪欢娓叉煋鐨勪俊鎭�
var saveData = []; //瀛樺偍鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鏁版嵁锛屼紶閫掔粰鍚庣杩涜淇濆瓨
var menuDefineData = []; //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鏍戠粍浠剁殑鑷畾涔夋暟鎹紝鐢ㄦ潵璧嬬粰option
+ //鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
+ var HType = "PC";
//#endregion
//#region 鍒濆鍖栭〉闈�
@@ -50,6 +53,9 @@
//#region 鐣岄潰鍒濆鍖栨柟娉�
//鍒濆鍖栫晫闈㈡柟娉�
function set_ClearBill() {
+ if (!judgeMorPC()) {
+ HType = "mobile";
+ }
set_InitGrid();
get_Display();
}
@@ -79,10 +85,10 @@
saveData = []; //娓呯┖淇濆瓨鑷畾涔夋暟鎹殑鍒楄〃鐨勬暟鎹�
getSelectedData(checkedData); //灏嗛�変腑鐨勮妭鐐圭殑淇℃伅浠ュ垪琛ㄧ殑褰㈠紡淇濆瓨鍦╯aveData涓�
- var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"];
+ var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType;
var index = layer.load();
$.ajax({
- url: "http://localhost:8082/API//Web/SaveMenuDefineSet",
+ url: GetWEBURL() + "/Web/SaveMenuDefineSet",
type: "POST",
data: { "sMainSub": sMainSub }, //灏嗗綋鍓嶇敤鎴峰拰鍏惰嚜瀹氫箟鏁版嵁浼犻�掔粰鍚庣锛屼繚瀛樺埌鏁版嵁搴�
success: function (data) {
@@ -118,10 +124,10 @@
//浼樺寲鑷畾涔夎彍鍗曟樉绀虹殑瀹為獙
function get_Display() {
$.ajax({
- url: "http://localhost:8082/API//Web/MenuDefineSet",
+ url: GetWEBURL() + "/Web/MenuDefineSet",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"]},
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
success: function (res) {
var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌
var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐�
@@ -150,6 +156,9 @@
}
}
tree[i].children = children; //灏嗘敹闆嗙殑瀛愯妭鐐瑰垪琛ㄨ祴缁欏綋鍓嶈妭鐐圭殑children锛屽嵆娣诲姞褰撳墠鑺傜偣鐨勫瓙鑺傜偣鍒楄〃
+ if (tree[i].children.length > 0) {
+ tree[i].checked = false;
+ }
for (var j = 0; j < tree[i].children.length; j++) {
getDefineData(dt, tree[i].children);
}
--
Gitblit v1.9.1