节点分发中打开控制台和文件管理交互方式调整

modules/server/src/main/java/cn/keepbx/jpom/model/data/OutGivingModel.java

@@ -236,7 +236,7 @@ public class OutGivingModel extends BaseModel {
                     }
                 }
             });
-        } else if (afterOpt == AfterOpt.Restart) {
+        } else if (afterOpt == AfterOpt.Restart || afterOpt == AfterOpt.No) {
             outGivingNodeProjects.forEach(outGivingNodeProject -> ThreadUtil.execAsync(new OutGivingRun(id, outGivingNodeProject, file, afterOpt, userModel)));
         } else {
             //

modules/server/src/main/resources/vm/common/head.vm

@@ -109,7 +109,11 @@
     }
 
     function getTopQueryString(name) {
-        return getQueryStringByUrl(top.location.search.substr(1), name);
+        var val = getQueryStringByUrl(top.location.search.substr(1), name);
+        if (!val) {
+            val = getQueryString(name);
+        }
+        return val;
     }
 
     function getQueryString(name) {

modules/server/src/main/resources/vm/node/index.vm

@@ -101,7 +101,7 @@
 <script type="text/javascript">
     function loadSuccess() {
         #if($installed)
-           
+
         #else
             layui.use(['carousel'], function () {
                 var carousel = layui.carousel;
@@ -131,25 +131,6 @@
                 });
             });
         #end
-        // 自动打开控制台
-        var toConsole = getTopQueryString("toConsole");
-        if (toConsole) {
-            var url = './manage/console?id=' + toConsole;
-            tabChange({
-                id: toConsole,
-                url: url,
-                title: toConsole + ' - 管理',
-            });
-        }
-        // 自动文件管理
-        var toFile = getTopQueryString("toFile");
-        if (toFile) {
-            tabChange({
-                id: toFile,
-                url: './manage/file/list.html?id=' + toFile,
-                title: toFile + ' - 文件',
-            });
-        }
 
         #if($tipUpdate)
             layer.alert("当前节点和服务端版本不一致，请检查更新")

modules/server/src/main/resources/vm/outgiving/addOutgiving.vm

@@ -77,7 +77,7 @@
                 layer.load();
             },
             done: function (res) {
-                // layer.closeAll('loading');
+                layer.closeAll('loading');
                 layer.msg(res.msg);
                 if (200 == res.code) {
                     autoClose();

modules/server/src/main/resources/vm/outgiving/list.vm

@@ -150,13 +150,18 @@
             if ("conslone" == op || "file" == op) {
                 var nodeId = $(this).attr("nodeId");
                 var projectId = $(this).attr("projectId");
-                var parName = "file" == op ? "toFile" : "toConsole";
-                //
-                var url = "/node/index.html";
+                var url = "file" == op ? "/node/manage/file/list.html" : "/node/manage/console";
                 url = urlUpdateParams(url, "nodeId", nodeId);
-                url = urlUpdateParams(url, parName, projectId);
-                var win = top.window.open(url, nodeId + projectId);
-                win.focus();
+                url = urlUpdateParams(url, "id", projectId);
+                var index = layer.open({
+                    type: 2,
+                    title: "file" == op ? '文件管理' : '控制台',
+                    shade: [0.4, '#fff'],
+                    maxmin: true,
+                    area: ['80%', '90%'],
+                    content: url
+                });
+                layer.full(index);
                 return false;
             }
             if ("edit" == op) {