Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

@@ -114,57 +114,60 @@ const warningTypeMapping = {
 }
 const warningSubclassTypeMapping = {
   1: {
-    1: '拥堵',
-    2: '缓行',
+    "1-1": "拥堵",
+    "1-2": "缓行",
   },
   2: {
-    1: '普通行人',
-    2: '工作人员',
+    "2-1": "普通行人",
+    "2-2": "工作人员",
   },
   3: {
-    1: '摩托车',
-    2: '自行车',
+    "3-1": "摩托车",
+    "3-2": "自行车",
+    "3-3": "三轮车",
   },
   4: {
-    1: '非工程车',
-    2: '工程车',
-    3: '主路有车',
-    4: '匝道有车',
-    5: '车辆故障',
-    6: '交通事故',
-    7: '应急车道被占用',
-    8: '车离开应急车道',
-    9: '其他',
+    "4-1": "非工程车",
+    "4-2": "工程车",
+    "4-3": "主路有车",
+    "4-4": "匝道有车",
+    "4-5": "车辆故障",
+    "4-6": "交通事故",
+    "4-7": "应急车道被占用",
+    "4-8": "车离开应急车道",
+    "4-9": "其他",
   },
   5: {
-    1: '倒车/逆行',
+    "5-1": "倒车/逆行",
   },
   6: {
-    1: '烟火',
+    "6-1": "烟火",
   },
   7: {
-    1: '撒落物',
+    "7-1": "撒落物",
   },
   8: {
-    1: '雨',
-    2: '冰雹',
-    3: '风',
-    4: '雾',
-    5: '高温',
-    6: '积水',
-    7: '路面湿滑',
-    8: '路面结冰',
-    9: '道路能见度低',
-    10: '道路团雾',
+    "8-1": "雨",
+    "8-2": "冰雹",
+    "8-3": "风",
+    "8-4": "雾",
+    "8-5": "高温",
+    "8-6": "积水",
+    "8-7": "路面湿滑",
+    "8-8": "路面结冰",
+    "8-9": "道路能见度低",
+    "8-10": "道路团雾",
   },
   9: {
-    1: '只碰撞不倾斜',
-    2: '只倾斜无碰撞',
-    3: '碰撞后倾斜',
+    "9-1": "只碰撞不倾斜",
+    "9-2": "只倾斜无碰撞",
+    "9-3": "碰撞后倾斜",
   },
   10: {},
   11: {},
-  99: {},
+  99: {
+    "99-1": "其他",
+  },
 }
 
 export default {
@@ -251,8 +254,8 @@ export default {
             it.stringDirection = gzDirectionMapping[it.direction] || it.direction;
 
             let strSub = '';
-            if (it.warningSource && warningSubclassTypeMapping[it.warningType][it.warningSource]) {
-              strSub = `(${warningSubclassTypeMapping[it.warningType][it.warningSource]})`
+            if (it.warningSubclass && warningSubclassTypeMapping[it.warningType][it.warningSubclass] || '') {
+              strSub = `(${warningSubclassTypeMapping[it.warningType][it.warningSubclass] || ''})`
             }
             it.stringEventType = warningTypeMapping[it.warningType] + strSub;