Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

src/graphic/Constant.js

@@ -38,7 +38,7 @@ const Constant = {
   defaultMidDivideWidth: 2, //隔离带的宽度
   angleLocationMode: "AngleLocationMode", //直角定位
   allLocationMode: "AllLocationMode", //综合定位
-  normalLocationMode: "NormalLocationMode", //自由测量
+  normalLocationMode: "NormalLocationMode", //垂线定位
   freeLocationMode: "FreeLocationMode", //自由测量
 };
 export default Constant;

src/graphic/Service/LineService.js

@@ -72,6 +72,12 @@ export default class LineService {
     endPoint = uiService.getNewPositionForPop(endPoint);
     let newLine = this.create(startPoint, endPoint, line.category);
     newLine.setColor(line.color);
+    if(line.weight){
+      newLine.setWeight(line.weight);
+    }
+    if(line.style){
+      newLine.setStyle(line.style);
+    }
     return newLine;
   }
 

src/views/graphic/menus.ts

@@ -68,11 +68,11 @@ export const templateMenusRaw = [
   { key: RoadTemplate.Bend, icon: 'mb_wd', text: '弯道' },
   { key: RoadTemplate.SharpCurve, icon: 'mb_jzwd', text: '急转弯道' },
   { key: RoadTemplate.SixForkIntersection, icon: 'mb_lclk', text: '六岔路口' },
-  { key: RoadTemplate.WideNarrowRoad, icon: 'mb_kbzld', text: '宽变窄路段' },
+  // { key: RoadTemplate.WideNarrowRoad, icon: 'mb_kbzld', text: '宽变窄路段' },
   { key: RoadTemplate.Corner, icon: 'mb_zjwd', text: '直角弯道' },
   { key: RoadTemplate.ImportSmashedRoad, icon: 'mb_jkzd', text: '进口匝道' },
   { key: RoadTemplate.HighSpeedTollBooth, icon: 'mb_gssfz', text: '高速收费站' },
-  { key: RoadTemplate.HighSpeedHarbor, icon: 'mb_gsgw', text: '高速港湾' },
+  // { key: RoadTemplate.HighSpeedHarbor, icon: 'mb_gsgw', text: '高速港湾' },
   { key: RoadTemplate.HighwaySection, icon: 'mb_gsld', text: '高速路段' },
 ];