Bläddra i källkod

页面顺序微调

hjp 3 månader sedan
förälder
incheckning
f3a69b0b8d

+ 8 - 8
src/main/java/com/jg/util/GetStructure.java

@@ -323,10 +323,10 @@ public class GetStructure {
         //left
         Map<String,Object> left = new HashMap<>();
         List<ShowVo> left1 = new ArrayList<>();
-        left1.add(showVoMap.get(0));
-        left1.add(showVoMap.get(2));
-        left1.add(showVoMap.get(4));
-        left1.add(showVoMap.get(6));
+        left1.add(showVoMap.get(8));
+        left1.add(showVoMap.get(10));
+        left1.add(showVoMap.get(12));
+        left1.add(showVoMap.get(14));
         left.put("1",left1);
 
         List<ShowVo> left2 = new ArrayList<>();
@@ -355,10 +355,10 @@ public class GetStructure {
         left.put("6",left6);
 
         List<ShowVo> left7 = new ArrayList<>();
-        left7.add(showVoMap.get(8));
-        left7.add(showVoMap.get(10));
-        left7.add(showVoMap.get(12));
-        left7.add(showVoMap.get(14));
+        left7.add(showVoMap.get(0));
+        left7.add(showVoMap.get(2));
+        left7.add(showVoMap.get(4));
+        left7.add(showVoMap.get(6));
         left.put("7",left7);
         allMap.put("left",left);
 

+ 6 - 6
src/main/resources/jsons/北煤1tag.json

@@ -300,7 +300,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "温度",
+		"name": "温度",
 		"offset": 60,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -310,7 +310,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "温度",
+		"name": "温度",
 		"offset": 62,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -320,7 +320,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "热风温度",
+		"name": "热风温度",
 		"offset": 64,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -330,7 +330,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "热风温度",
+		"name": "热风温度",
 		"offset": 66,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -340,7 +340,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "废气温度",
+		"name": "废气温度",
 		"offset": 68,
 		"slaveId": 1,
 		"functionCode": 4,
@@ -350,7 +350,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "废气温度",
+		"name": "废气温度",
 		"offset": 70,
 		"slaveId": 1,
 		"functionCode": 4,

+ 1 - 1
src/main/resources/jsons/北煤3tag.json

@@ -300,7 +300,7 @@
 		"dataType": "int"
 	},
 	{
-		"name": "4",
+		"name": "4#温度",
 		"offset": 60,
 		"slaveId": 1,
 		"functionCode": 4,