From cf8744e0819f7fef4d9870bcc064a8799b451ea7 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 01 四月 2025 11:06:38 +0800
Subject: [PATCH] 1
---
WebTM/layuiadmin/SetColumn.js | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index e92ab7a..588a8ce 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -4,8 +4,15 @@
for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["field"] + ",";
}
-
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ var contentUrl = "";
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -14,7 +21,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: [contentUrl, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -80,7 +87,7 @@
}
//#endregion
//#region 鏄剧ず鍒楁暟鎹�
-function DisPlay_HideColumn(HModName, user, option) {
+function DisPlay_HideColumn(HModName, user, option, titleData) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
@@ -89,7 +96,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];
+ /* var titleData = [];*/
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
@@ -303,6 +310,8 @@
colTitleName += option.cols[0][i]["title"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ colTitleName = encodeURI(colTitleName.substring(0, colTitleName.length - 1));
+ /*urlStr.replace(/%/g, '%25');*/
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -324,7 +333,7 @@
//#endregion
//#region 鏄剧ず鍒楁暟鎹紪杈戦〉闈�
-function DisPlay_HideColumnEdit(HModName, user, option,table) {
+function DisPlay_HideColumnEdit(HModName, user, option, table) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
--
Gitblit v1.9.1