Authored by xwx

拓补视图-【1093】-新增数据无法保存

@@ -144,98 +144,96 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli @@ -144,98 +144,96 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
144 //保存 144 //保存
145 $("#jgraph-form-save-id").on("click", function (e, flag) { 145 $("#jgraph-form-save-id").on("click", function (e, flag) {
146 //当flag为true,为保存并设计,当flag为false时,为保存 146 //当flag为true,为保存并设计,当flag为false时,为保存
147 - form.on('submit(form-grapheditor)', function () {  
148 - var topoTitle = $("#jgraph_topo_name").val();  
149 - if (!topoTitle) {  
150 - layer.msg('请输入拓扑名称!', {icon: 7, time: 3000});  
151 - return false;  
152 - }  
153 - //获取Users值  
154 - var userflag = 0;  
155 - //新增时必须用户授权包换登录用户的  
156 - if (id) {  
157 - userflag = 1;  
158 - }  
159 - var userNow = localStorage.getItem("lgn");  
160 - var topoUsers = [];  
161 - var selectedUsers = xmSelectUsers.getValue();  
162 - if (selectedUsers != null && selectedUsers.length > 0) {  
163 - $.each(selectedUsers, function (i, v) {  
164 - if (v.value == userNow) {  
165 - userflag = 1;  
166 - }  
167 - topoUsers.push(v.value + "#" + v.name);  
168 - });  
169 - }  
170 - if (userflag == 0) {  
171 - layer.msg('保存失败,用户权限必须包含当前登录账户!', {icon: 2, time: 3000});  
172 - return false;  
173 - }  
174 - //获取Roles值  
175 - var topoRoles = [];  
176 - var isExistAdmin = false;  
177 - var selectedRoles = xmSelectRoles.getValue();  
178 - if (selectedRoles != null && selectedRoles.length > 0) {  
179 - $.each(selectedRoles, function (i, v) {  
180 - topoRoles.push(v.value + "#" + v.roleName);  
181 - if (v.code == 'ADMIN') {  
182 - isExistAdmin = true;  
183 - }  
184 - });  
185 - }  
186 - // 必须要选管理员  
187 - if (!isExistAdmin) {  
188 - layer.msg('保存失败,角色必须包含当管理员权限(ADMIN)!', {icon: 2, time: 3000});  
189 - return false;  
190 - } 147 + var topoTitle = $("#jgraph_topo_name").val();
  148 + if (!topoTitle) {
  149 + layer.msg('请输入拓扑名称!', {icon: 7, time: 3000});
  150 + return false;
  151 + }
  152 + //获取Users值
  153 + var userflag = 0;
  154 + //新增时必须用户授权包换登录用户的
  155 + if (id) {
  156 + userflag = 1;
  157 + }
  158 + var userNow = localStorage.getItem("lgn");
  159 + var topoUsers = [];
  160 + var selectedUsers = xmSelectUsers.getValue();
  161 + if (selectedUsers != null && selectedUsers.length > 0) {
  162 + $.each(selectedUsers, function (i, v) {
  163 + if (v.value == userNow) {
  164 + userflag = 1;
  165 + }
  166 + topoUsers.push(v.value + "#" + v.name);
  167 + });
  168 + }
  169 + if (userflag == 0) {
  170 + layer.msg('保存失败,用户权限必须包含当前登录账户!', {icon: 2, time: 3000});
  171 + return false;
  172 + }
  173 + //获取Roles值
  174 + var topoRoles = [];
  175 + var isExistAdmin = false;
  176 + var selectedRoles = xmSelectRoles.getValue();
  177 + if (selectedRoles != null && selectedRoles.length > 0) {
  178 + $.each(selectedRoles, function (i, v) {
  179 + topoRoles.push(v.value + "#" + v.roleName);
  180 + if (v.code == 'ADMIN') {
  181 + isExistAdmin = true;
  182 + }
  183 + });
  184 + }
  185 + // 必须要选管理员
  186 + if (!isExistAdmin) {
  187 + layer.msg('保存失败,角色必须包含当管理员权限(ADMIN)!', {icon: 2, time: 3000});
  188 + return false;
  189 + }
191 190
192 191
193 - var targetId = '';  
194 - var topoType = $("#jgraph-topo_type").val();//拓扑类型  
195 - if (topoType && topoType === '1') {//业务拓扑  
196 - targetId = bizId;  
197 - }  
198 - if (topoType && topoType === '2') {//资源拓扑  
199 - targetId = $("#jgraph-topo_resid").val();  
200 - }  
201 - if (topoType && topoType === '4') {//机房拓扑  
202 - targetId = $("#jgraph-topo_room").val();  
203 - }  
204 - var jtopo = {  
205 - topoName: topoTitle, //拓扑名称  
206 - jtopoId: $("#jgraph-topoId").val(),  
207 - isDefault: $('input[name="isDefault"]:checked').val(), //是否默认,0否 1是  
208 - topoType: topoType,  
209 - targetId: targetId,  
210 - userIds: topoUsers.toString(),  
211 - roleIds: topoRoles.toString(),  
212 - remark: $("#jgraph_remark").val(),  
213 - };  
214 - admin.req({  
215 - url: common.domainName + '/api-web/mxgraph/save?access_token=' + access_token  
216 - , type: 'post'  
217 - , async: false  
218 - , contentType: "application/json;charset=UTF-8"//指定消息请求类型  
219 - , data: JSON.stringify(jtopo)  
220 - }).done(function (res) {  
221 - if (res.success) {  
222 - layer.msg('保存成功', {icon: 1, time: 2000}, function () {  
223 - layer.closeAll()  
224 - if (flag) {  
225 - if (!id) {  
226 - id = res.str;  
227 - }  
228 - //http://192.168.0.247:8085  
229 - var url = common.graphEditorOrigin + "/jgraph/grapheditor/index.html?access_token=" + access_token + '&id=' + id;  
230 - window.open(url); 192 + var targetId = '';
  193 + var topoType = $("#jgraph-topo_type").val();//拓扑类型
  194 + if (topoType && topoType === '1') {//业务拓扑
  195 + targetId = bizId;
  196 + }
  197 + if (topoType && topoType === '2') {//资源拓扑
  198 + targetId = $("#jgraph-topo_resid").val();
  199 + }
  200 + if (topoType && topoType === '4') {//机房拓扑
  201 + targetId = $("#jgraph-topo_room").val();
  202 + }
  203 + var jtopo = {
  204 + topoName: topoTitle, //拓扑名称
  205 + jtopoId: $("#jgraph-topoId").val(),
  206 + isDefault: $('input[name="isDefault"]:checked').val(), //是否默认,0否 1是
  207 + topoType: topoType,
  208 + targetId: targetId,
  209 + userIds: topoUsers.toString(),
  210 + roleIds: topoRoles.toString(),
  211 + remark: $("#jgraph_remark").val(),
  212 + };
  213 + admin.req({
  214 + url: common.domainName + '/api-web/mxgraph/save?access_token=' + access_token
  215 + , type: 'post'
  216 + , async: false
  217 + , contentType: "application/json;charset=UTF-8"//指定消息请求类型
  218 + , data: JSON.stringify(jtopo)
  219 + }).done(function (res) {
  220 + if (res.success) {
  221 + layer.msg('保存成功', {icon: 1, time: 2000}, function () {
  222 + layer.closeAll()
  223 + if (flag) {
  224 + if (!id) {
  225 + id = res.str;
231 } 226 }
232 - });  
233 - } else {  
234 - layer.msg('拓扑保存失败,请与管理员联系!', {icon: 7, time: 3000});  
235 - }  
236 - });  
237 - return false;//必须要写,解决禁用submit提交,ajax方法才能正确执行,且表单不会自动刷新  
238 - }) 227 + //http://192.168.0.247:8085
  228 + var url = common.graphEditorOrigin + "/jgraph/grapheditor/index.html?access_token=" + access_token + '&id=' + id;
  229 + window.open(url);
  230 + }
  231 + });
  232 + } else {
  233 + layer.msg('拓扑保存失败,请与管理员联系!', {icon: 7, time: 3000});
  234 + }
  235 + });
  236 + return false;//必须要写,解决禁用submit提交,ajax方法才能正确执行,且表单不会自动刷新
239 form.render(); 237 form.render();
240 }); 238 });
241 renderGraphTopoInfo(); 239 renderGraphTopoInfo();