Browse Source

Merge branch 'system-integration' of http://39.106.8.246:3003/web/ibms into system-integration

 Conflicts:
	src/views/point/config_point/steps/step1.vue
shaun-sheep 4 years ago
parent
commit
3c9d0a4603
2 changed files with 623 additions and 591 deletions
  1. 43 1
      src/utils/point_edit/handson_header.js
  2. 580 590
      src/views/point/config_point/steps/step1.vue

+ 43 - 1
src/utils/point_edit/handson_header.js

@@ -176,6 +176,48 @@ let common = [{
         FirstTag: ""
     },
     {
+        InfoPointName: "*数据类型",
+        InfoPointCode: "DataType",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
+        InfoPointName: "仪表ID",
+        InfoPointCode: "Meter",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
+        InfoPointName: "功能ID",
+        InfoPointCode: "Func",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
+        InfoPointName: "整合ID",
+        InfoPointCode: "Meterfunc",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
+        InfoPointName: "*获取方式",
+        InfoPointCode: "Method",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
+        InfoPointName: "读写",
+        InfoPointCode: "ReadWrite",
+        InputMode: "B1",
+        Visible: true,
+        FirstTag: ""
+    },
+    {
         InfoPointName: "位置标签",
         InfoPointCode: "LocationFlag",
         InputMode: "myOwn",
@@ -204,7 +246,7 @@ let common = [{
         FirstTag: ""
     },
     {
-        InfoPointName: "使用",
+        InfoPointName: "用",
         InfoPointCode: "Used",
         InputMode: "switchBtn",
         Visible: true,

File diff suppressed because it is too large
+ 580 - 590
src/views/point/config_point/steps/step1.vue