update

2 files changed, 56 insertions, 62 deletions

diff --git a/nezha-admin/src/main/resources/templates/js/modules/node/nodeGroup.js b/nezha-admin/src/main/resources/templates/js/modules/node/nodeGroup.js
index 2b269e3e..b5591303 100644
--- a/nezha-admin/src/main/resources/templates/js/modules/node/nodeGroup.js
+++ b/nezha-admin/src/main/resources/templates/js/modules/node/nodeGroup.js
@@ -235,8 +235,8 @@ var vue = new Vue({
         },
         add: function (node, isRoot) {
             vue.$v.nodeGroup.$reset();
+            vue.showForm = true;
             if (isRoot) { // 添加根节点组
-                vue.showForm = true;
                 // 获取当前权限
                 vue.system = node;
                 vue.nodeGroup = {
@@ -251,7 +251,6 @@ var vue = new Vue({
             } else {
                 // 获取节点组的业务系统 作为子节点组的业务系统
                 vue.getParentSystem(node.systemId);
-                vue.showForm = true;
                 vue.nodeGroup = {
                     name: null,
                     id: null,
@@ -261,7 +260,7 @@ var vue = new Vue({
                     parentGroup: null
                 };
                 vue.nodeGroup.parentGroup = node;
-                vue.$set(vue.nodeGroup.parentGroup,"name",node.nodeTitle);
+                vue.$set(vue.nodeGroup.parentGroup, "name", node.nodeTitle);
             }
             vue.count = 1;
             this.open("<@spring.message 'common.add'/>");
@@ -353,13 +352,12 @@ var vue = new Vue({
                 shade: 0,
                 title: title,
                 type: 1,
-                fixed: false,
                 maxmin: false,
                 scrollbar: false,
                 offset: 'r',
                 closeBtn: 1,
                 move: false,
-                content: $("#form") // 本页面的元素
+                content: $("#nodeGroupForm") // 本页面的元素
             });
         },
         validate: function () {
@@ -431,8 +429,6 @@ var vue = new Vue({
             form.append("id", vue.selectedNodeGroup.id);
             form.append("addUuids", vue.addUuids);
             form.append("removeUuids", vue.removeUuids);
-            console.log(vue.addUuids)
-            console.log(vue.removeUuids)
             $.ajax({
                 type: "POST",
                 url: baseURL + "nodegroup/assignNode",
diff --git a/nezha-admin/src/main/resources/templates/modules/node/nodeGroup.html b/nezha-admin/src/main/resources/templates/modules/node/nodeGroup.html
index 3dfb9920..b31888b4 100644
--- a/nezha-admin/src/main/resources/templates/modules/node/nodeGroup.html
+++ b/nezha-admin/src/main/resources/templates/modules/node/nodeGroup.html
@@ -53,70 +53,68 @@
     </div>
 
     <!-- 添加 / 修改 表单 -->
-    <div v-show="showForm" id="form" style="overflow-x: hidden  ">
-        <div class="">
-            <form class="form-horizontal">
-
-                <!-- 上级节点组 -->
-                <div class="form-group">
-                    <div class="col-sm-2 control-label"><@spring.message 'nodegroup.parent.group'/></div>
-                    <div class="col-sm-9">
-                        <input disabled type="text" class="form-control"
-                               v-model.trim="nodeGroup.parentGroup.name"
-                               placeholder="<@spring.message 'nodegroup.parent.group'/>"/>
-                        <span class="required-symbol">*</span>
-                    </div>
-                </div>
+    <div v-show="showForm" id="nodeGroupForm" style="overflow-x: hidden">
+        <form class="form-horizontal">
 
-                <!-- 业务系统 -->
-                <div class="form-group">
-                    <div class="col-sm-2 control-label"><@spring.message 'system.system'/></div>
-                    <div class="col-sm-9">
-                        <input disabled type="text" class="form-control" v-model.trim="system.name"
-                               placeholder="<@spring.message 'system.system'/>"/>
-                    </div>
+            <!-- 上级节点组 -->
+            <div class="form-group">
+                <div class="col-sm-2 control-label"><@spring.message 'nodegroup.parent.group'/></div>
+                <div class="col-sm-9">
+                    <input disabled type="text" class="form-control"
+                           v-model.trim="nodeGroup.parentGroup.name"
+                           placeholder="<@spring.message 'nodegroup.parent.group'/>"/>
+                    <span class="required-symbol">*</span>
                 </div>
+            </div>
 
-                <!-- 节点组名称 -->
-                <div class="form-group">
-                    <div class="col-sm-2 control-label"><@spring.message 'nodegroup.name'/></div>
-                    <div class="col-sm-9">
-                        <input type="text" class="form-control"
-                               :class="{'form-control--error': $v.nodeGroup.name.$dirty && (!$v.nodeGroup.name.required || !$v.nodeGroup.name.nameCheck)}"
-                               v-model.trim="$v.nodeGroup.name.$model"
-                               placeholder="<@spring.message 'nodegroup.name'/>"/>
-                        <span class="required-symbol">*</span>
-                        <div class="form-control_error-msg"
-                             v-if="$v.nodeGroup.name.$dirty && !$v.nodeGroup.name.required">
-                            <@spring.message 'validate.common.required'/>
-                        </div>
-                        <div class="form-control_error-msg"
-                             v-if="$v.nodeGroup.name.$dirty && !$v.nodeGroup.name.nameCheck">
-                            <@spring.message 'validate.common.name.repeat'/>
-                        </div>
-                    </div>
+            <!-- 业务系统 -->
+            <div class="form-group">
+                <div class="col-sm-2 control-label"><@spring.message 'system.system'/></div>
+                <div class="col-sm-9">
+                    <input disabled type="text" class="form-control" v-model.trim="system.name"
+                           placeholder="<@spring.message 'system.system'/>"/>
                 </div>
+            </div>
 
-                <!-- 备注 -->
-                <div class="form-group">
-                    <div class="col-sm-2 control-label"> <@spring.message 'common.remark'/></div>
-                    <div class="col-sm-9">
-                        <input type="text" class="form-control" v-model.trim="nodeGroup.remark"
-                               placeholder="<@spring.message 'common.remark'/>"/>
+            <!-- 节点组名称 -->
+            <div class="form-group">
+                <div class="col-sm-2 control-label"><@spring.message 'nodegroup.name'/></div>
+                <div class="col-sm-9">
+                    <input type="text" class="form-control"
+                           :class="{'form-control--error': $v.nodeGroup.name.$dirty && (!$v.nodeGroup.name.required || !$v.nodeGroup.name.nameCheck)}"
+                           v-model.trim="$v.nodeGroup.name.$model"
+                           placeholder="<@spring.message 'nodegroup.name'/>"/>
+                    <span class="required-symbol">*</span>
+                    <div class="form-control_error-msg"
+                         v-if="$v.nodeGroup.name.$dirty && !$v.nodeGroup.name.required">
+                        <@spring.message 'validate.common.required'/>
+                    </div>
+                    <div class="form-control_error-msg"
+                         v-if="$v.nodeGroup.name.$dirty && !$v.nodeGroup.name.nameCheck">
+                        <@spring.message 'validate.common.name.repeat'/>
                     </div>
                 </div>
-            </form>
-
-            <!-- 保存 / 返回 -->
-            <div class="form-group_opbox" style="margin-bottom: 20px">
-                <div>
-                    <button title="<@spring.message 'common.submit'/>" type="button" class="btn btn-primary"
-                            style="width: 55px" @click="saveOrUpdate"><i class="fa fa-check"></i></button>
-                    <div style="display:inline-block;width:10px;"></div>
-                    <button title="<@spring.message 'common.back'/>" type="button" class="btn btn-warning"
-                            style="width: 55px" @click="reload"><i class="fa fa-reply"></i></button>
+            </div>
+
+            <!-- 备注 -->
+            <div class="form-group">
+                <div class="col-sm-2 control-label"> <@spring.message 'common.remark'/></div>
+                <div class="col-sm-9">
+                    <input type="text" class="form-control" v-model.trim="nodeGroup.remark"
+                           placeholder="<@spring.message 'common.remark'/>"/>
                 </div>
             </div>
+        </form>
+
+        <!-- 保存 / 返回 -->
+        <div class="form-group_opbox" style="margin-bottom: 20px">
+            <div>
+                <button title="<@spring.message 'common.submit'/>" type="button" class="btn btn-primary"
+                        style="width: 55px" @click="saveOrUpdate"><i class="fa fa-check"></i></button>
+                <div style="display:inline-block;width:10px;"></div>
+                <button title="<@spring.message 'common.back'/>" type="button" class="btn btn-warning"
+                        style="width: 55px" @click="reload"><i class="fa fa-reply"></i></button>
+            </div>
         </div>
     </div>