继电器相关字段修改--枚举

protos/relayCabinetLayoutGraphics.proto

@@ -19,9 +19,20 @@ message RelayCabinet {
 }
 
 message Relay {
+  enum ModelType {//型号中的-和/转换为_
+    JPXC_1000 = 0;
+    JPXC_1700 = 1;
+    JWJXC_480 = 2;
+    JWJXC_H125_80 = 3;
+    JWXC_1700 = 4;
+    JWXC_H340 = 5;
+    JYJXC_160_260 = 6;
+    JZXC_H18 = 7;
+  }
   graphicData.CommonInfo common = 1;
   string code = 2;//编号
   string model = 3;//型号
+  ModelType newModel = 4;//型号
 }
 
 /* 设备管理的继电器列表 */
@@ -31,6 +42,7 @@ message DeviceRelateRelay {
   string code = 3;//设备编号
   //repeated string refRelay = 4;//设备关联的继电器
   repeated Combinationtype combinationtypes = 5; //组合类型
+  graphicData.RelatedRef.DeviceType deviceType = 6;//设备类型
 }
 message Combinationtype {
   string code = 1;

protos/stationLayoutGraphics.proto

@@ -244,6 +244,7 @@ message RelatedRef {
     TrainWindow = 2;
     AxleCounting = 3;
     SectionLink = 4;
+    signal = 5;
   }
 
   enum DevicePort {