From d1b1e26890d2d0b9270370f1de8a53cd3c181e30 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 13:28:37 +0800
Subject: [PATCH] #
---
src/main/webapp/views/node/node.html | 10 +++++-----
src/main/webapp/views/home/map.html | 1 +
src/main/java/com/zy/asrs/entity/Node.java | 15 +++++++++++++++
src/main/webapp/views/home/map_edit.html | 2 ++
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Node.java b/src/main/java/com/zy/asrs/entity/Node.java
index 3f01a58..f408751 100644
--- a/src/main/java/com/zy/asrs/entity/Node.java
+++ b/src/main/java/com/zy/asrs/entity/Node.java
@@ -361,6 +361,21 @@
}
}
+ public String getRow1$(){
+ if (null == this.row1){ return null; }
+ return String.valueOf(this.row1);
+ }
+
+ public String getBay1$(){
+ if (null == this.lev1){ return null; }
+ return String.valueOf(this.lev1);
+ }
+
+ public String getLev1$(){
+ if (null == this.bay1){ return null; }
+ return String.valueOf(this.bay1);
+ }
+
public void setStatus(Integer status) {
this.status = status;
}
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 33085a6..8348e6d 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -44,6 +44,7 @@
color: #fff;
/*transform: perspective(130px) rotateX(30deg) translateZ(-20px);*/
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
+ border-radius: 50% 20% / 10% 40%;
}
.pointBox:hover{
diff --git a/src/main/webapp/views/home/map_edit.html b/src/main/webapp/views/home/map_edit.html
index 4a692d2..5f69d89 100644
--- a/src/main/webapp/views/home/map_edit.html
+++ b/src/main/webapp/views/home/map_edit.html
@@ -16,6 +16,8 @@
width: 30px;
height: 30px;
margin-right: 1px;
+ box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
+ /*border-radius: 10% / 50%;*/
}
.pointBoxGreen {
diff --git a/src/main/webapp/views/node/node.html b/src/main/webapp/views/node/node.html
index b9a3e70..91d2c76 100644
--- a/src/main/webapp/views/node/node.html
+++ b/src/main/webapp/views/node/node.html
@@ -173,8 +173,8 @@
pidName: 'parentId' // pid瀛楁鍚嶇О
},
cols: [[
- {type: 'checkbox'}
- ,{type: 'numbers'}
+ {type: 'checkbox'},
+ {type: 'numbers'}
,{field: 'name', align: 'left',title: '缂栧彿/鍚嶇О', minWidth: 150}
// ,{field: 'uuid', left: 'center',title: '缂栧彿/鍚嶇О', minWidth: 150}
,{field: 'type$', align: 'center',title: '绫诲瀷', templet: '#typeTpl'}
@@ -184,9 +184,9 @@
// ,{field: 'count', align: 'center',title: '鏁伴噺'}
// ,{field: 'sort', align: 'center',title: '鎺掑簭'}
,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
- ,{field: 'row1', align: 'center',title: '鎺�'}
- ,{field: 'bay1', align: 'center',title: '鍒�'}
- ,{field: 'lev1', align: 'center',title: '灞�'}
+ ,{field: 'row1$', align: 'center',title: '鎺�'}
+ ,{field: 'bay1$', align: 'center',title: '鍒�'}
+ ,{field: 'lev1$', align: 'center',title: '灞�'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
--
Gitblit v1.9.1