From e517f57a0b0489165012283c5ea40887fa84c943 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 20 十一月 2025 16:59:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/PublicPage/PowerInformation.html |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index 182ea2f..a5b4d60 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -75,6 +75,8 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細linterid 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+            linterid = getParams("linterid");
         }
 
         var treeCkData = { id: 0 };
@@ -189,6 +191,21 @@
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             get_Display(sGnbm);
 
+            //#region 榛樿灞曞紑绗竴涓妭鐐规暟鎹垪琛�
+            var treeData_bak = getData();
+            if (treeData_bak) {
+                var data = treeData_bak[0];
+                //鐐瑰嚮楂樺厜
+                $('div[data-id="' + data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                treeCkData = data;
+                TagId = data.id;
+                TagParentId = data.ParentID;
+
+                sGnbm = data.id;
+                get_Display(sGnbm);
+            }
+            //#endregion
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
@@ -318,6 +335,7 @@
 
             $.ajax({
                 url: GetWEBURL() + '/Gy_MaintenanceMode/PowerLoadTree',
+                async:false,
                 type: "GET",
                 //data: { "sWhere": sWhere },
                 async: false,
@@ -346,20 +364,21 @@
                 } else {
                     treeData.push(it)
                 }
-            })
-            // 閫掑綊杩囨护鎺夋病鏈夊瓙鑺傜偣鐨勯」
-            function filterTree(node) {
-                if (!node.children || node.children.length === 0) {
-                    return null; // 杩囨护鎺夋病鏈夊瓙鑺傜偣鐨勯」
-                }
-                node.children = node.children.map(filterTree).filter(n => n !== null);
-                return node;
-            }
-            // 瀵规瘡涓牴鑺傜偣搴旂敤杩囨护
-            treeData = treeData.map(filterTree).filter(n => n !== null);
+            })                      
             return treeData;
         }
 
+        //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+        function getParams(key) {
+            var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+            //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�    
+            var r = encodeURI(window.location.search).substr(1).match(reg);
+            if (r != null) {
+                //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+                return decodeURI(unescape(r[2]));
+            }
+            return null;
+        };
     </script>
 
 </body>

--
Gitblit v1.9.1