diff --git a/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js b/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
index d6d4dcd..8b10f80 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/threeSpanList.js
@@ -93,20 +93,20 @@ function initTable(dataList, limit, page) {
html+="上层线路:" + d.upperLine + "
";
html+="下层线路:" + d.lowerLine + "
";
html+="交叉角度:" + d.intersectionAngle + "
";
- html+="垂直距离:" + d.verticalDistance + "
";
- html+="安全裕度:" + d.safetyMargin + "
";
+ html+="垂直距离:" + d.verticalDistance + "(m)
";
+ html+="安全裕度:" + d.safetyMargin + "(°)
";
return html;
}else if(d.spanType == 2){
var html = '';
- html+="垂直净距:" + d.verticalClearDistance + "
";
- html+="杆塔间距:" + d.towerSpacing + "
";
- html+="公路宽度:" + d.highwayWidth + "
";
+ html+="垂直净距:" + d.verticalClearDistance + "(m)
";
+ html+="杆塔间距:" + d.towerSpacing + "(m)
";
+ html+="公路宽度:" + d.highwayWidth + "(m)
";
return html;
}else if(d.spanType == 3){
var html = '';
- html+="垂直净距:" + d.verticalClearDistance + "
";
- html+="杆塔间距:" + d.towerSpacing + "
";
- html+="交叉角度:" + d.intersectionAngle + "
";
+ html+="垂直净距:" + d.verticalClearDistance + "(m)
";
+ html+="杆塔间距:" + d.towerSpacing + "(m)
";
+ html+="交叉角度:" + d.intersectionAngle + "(°)
";
return html;
}
}
diff --git a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
index 77abd60..17c4eb6 100644
--- a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
+++ b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js
@@ -52,6 +52,7 @@ function setParams(params) {
// $('input[name^="longitude2000"], input[name^="latitude2000"], input[name="centralMeridian"]').attr('lay-verify', 'required|number');
$('input[name="longitude2000"]').attr('lay-verify', 'required|longitude');
$('input[name="latitude2000"]').attr('lay-verify', 'required|latitude');
+ $('input[name="centralMeridian"]').attr('lay-verify', 'required');
}
});
diff --git a/src/main/resources/static/js/basic/proManagement/proList.js b/src/main/resources/static/js/basic/proManagement/proList.js
index 3557aa0..eea752d 100644
--- a/src/main/resources/static/js/basic/proManagement/proList.js
+++ b/src/main/resources/static/js/basic/proManagement/proList.js
@@ -41,15 +41,47 @@ function showRenameBtn(treeId, treeNode){
return true;
}
-// 修改完时处理 不进行后台数据处理
+// 检查同级节点是否有重名
+function checkDuplicateName(treeNode, newName) {
+ var parentNode = treeNode.getParentNode();
+ if (!parentNode) return false;
+
+ var children = parentNode.children;
+ if (!children) return false;
+
+ for (var i = 0; i < children.length; i++) {
+ if (children[i].id !== treeNode.id && children[i].name === newName) {
+ return true; // 存在重名
+ }
+ }
+ return false; // 不存在重名
+}
+
+// 修改完时处理
function beforeRename(treeId, treeNode, newName) {
if (newName.length < 1) {
layer.alert('节点名称不能为空!',function(){
- layer.closeAll(); //再执行关闭
- // parent.location.reload();
- })
+ layer.closeAll();
+ });
return false;
}
+
+ // 添加长度限制
+ if (newName.length > 50) {
+ layer.alert('节点名称不能超过50个字符!',function(){
+ layer.closeAll();
+ });
+ return false;
+ }
+
+ // 检查同级是否重名
+ if (checkDuplicateName(treeNode, newName)) {
+ layer.alert('同级目录下已存在相同名称!',function(){
+ layer.closeAll();
+ });
+ return false;
+ }
+
return true;
}
@@ -139,18 +171,26 @@ function addNode(treeNode){
//修改节点名称
function updateNode(treeNode){
+ // 再次检查同级是否重名(防止并发操作)
+ if (checkDuplicateName(treeNode, treeNode.name)) {
+ layer.alert('同级目录下已存在相同名称!',function(){
+ layer.closeAll();
+ refreshTree(); // 刷新树以恢复原状
+ });
+ return;
+ }
//此处进行ajax后台数据处理
- $.post(ctxPath +'/proManagement/updatePro', //数据提交的地址
- {"id" : treeNode.id, //提交的数据
- "name" : treeNode.name},
- function(data){
- layer.alert(data.resMsg,{
- icon: 0,
- time: 2000
- });
- refreshTree();
- },"json");//预期返回的数据类型
+ $.post(ctxPath +'/proManagement/updatePro',
+ {"id" : treeNode.id,
+ "name" : treeNode.name},
+ function(data){
+ layer.alert(data.resMsg,{
+ icon: 0,
+ time: 2000
+ });
+ refreshTree();
+ },"json");
}
// 不允许拖拽
@@ -176,7 +216,6 @@ function removeHoverDom(treeId, treeNode) {
// 添加新增按钮
function addHoverDom(treeId, treeNode) {
- console.info("sss1",treeNode);
if(treeNode.type!=3){
if (treeNode.editNameFlag || $("#addBtn_" + treeNode.id).length > 0)
return;
@@ -195,15 +234,17 @@ function addHoverDom(treeId, treeNode) {
parentId : treeNode.id,
name : "新增",
icon : ctxPath + "/static/css/ztree/images/user_group.gif",
+ maxLength: 50
});
if (newNode) {
+ // 设置新节点为编辑状态
zTree.editName(newNode[0]);
}
return false;
});
}
}
-};
+}
// 定义树节点初始数据
var zNodes1 = [];