bug

11 months ago · c08f1e58cb
6 changed files with 59 additions and 110 deletions
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
@ -36,8 +36,8 @@ export const formList = [
    },
  },
  {
-    label: "事件原因:",
-    key: "eventCause",
+    label: "高速名称:",
+    key: "roadName",
    type: "input",
    options: {
      disabled: true,
@ -71,15 +71,15 @@ export const formList = [
      placeholder: "",
    },
  },
-  // {
-  //   label: "完结时间:",
-  //   key: "endTime",
-  //   type: "input",
-  //   options: {
-  //     disabled: true,
-  //     placeholder: "",
-  //   },
-  // },
+  {
+    label: "预计结束时间:",
+    key: "estimatedEndTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
  {
    label: "水膜厚度(mm):",
    key: "waterFilmThickness",
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@ -4,10 +4,10 @@
      <Form :formList="formList" :dFormData="formData" label-width="100px" />

      <div class="video-pic">
-        <Video style="height: 100%; width: 380px;" :showHeader="activeName != '-1'" :url="formData.videoList[0]"
-          videoType="mp4" />
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;" :url="formData.videoList[1]"
-          videoType="mp4" />
+        <Video style="height: 100%; width: 380px;" :showHeader="activeName != '-1'"
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''" videoType="mp4" />
+        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;"
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''" videoType="mp4" />

        <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
      </div>
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
@ -84,10 +84,10 @@ export const gjSearchFormList = [
          key: "6",
          label: "非机预警",
        },
-        {
-          key: "7",
-          label: "气象监测器",
-        },
+        // {
+        //   key: "7",
+        //   label: "气象监测器",
+        // },
      ],
    },
  },
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@ -64,6 +64,7 @@ import { tabMap, gjSearchFormList, gzSearchFormList } from "./data";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import { Loading } from 'element-ui';
+import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping } from "@screen/utils/enum.js"

 function getRandomData(min = 1, max = 15) {
  return Math.floor(Math.random() * (max - min + 1)) + min;
@ -85,7 +86,7 @@ const warningSourceMapping = {
  4: '护栏碰撞',
  5: '扫码报警',
  6: '非机预警',
-  7: '气象监测器'
+  // 7: '气象监测器'
 }
 const gzDirectionMapping = {
  '1': '菏泽方向',
@ -98,77 +99,6 @@ const warningStateMapping = {
  3: '已终止',
  4: '自动结束'
 }
-const warningTypeMapping = {
-  1: '交通拥堵',
-  2: '行人',
-  3: '非机动车',
-  4: '停车',
-  5: '倒车/逆行',
-  6: '烟火',
-  7: '撒落物',
-  8: '异常天气',
-  9: '护栏碰撞',
-  10: '交通事故',
-  11: '车辆故障',
-  99: '其它',
-}
-const warningSubclassTypeMapping = {
-  1: {
-    "1-1": "拥堵",
-    "1-2": "缓行",
-  },
-  2: {
-    "2-1": "普通行人",
-    "2-2": "工作人员",
-  },
-  3: {
-    "3-1": "摩托车",
-    "3-2": "自行车",
-    "3-3": "三轮车",
-  },
-  4: {
-    "4-1": "非工程车",
-    "4-2": "工程车",
-    "4-3": "主路有车",
-    "4-4": "匝道有车",
-    "4-5": "车辆故障",
-    "4-6": "交通事故",
-    "4-7": "应急车道被占用",
-    "4-8": "车离开应急车道",
-    "4-9": "其他",
-  },
-  5: {
-    "5-1": "倒车/逆行",
-  },
-  6: {
-    "6-1": "烟火",
-  },
-  7: {
-    "7-1": "撒落物",
-  },
-  8: {
-    "8-1": "雨",
-    "8-2": "冰雹",
-    "8-3": "风",
-    "8-4": "雾",
-    "8-5": "高温",
-    "8-6": "积水",
-    "8-7": "路面湿滑",
-    "8-8": "路面结冰",
-    "8-9": "道路能见度低",
-    "8-10": "道路团雾",
-  },
-  9: {
-    "9-1": "只碰撞不倾斜",
-    "9-2": "只倾斜无碰撞",
-    "9-3": "碰撞后倾斜",
-  },
-  10: {},
-  11: {},
-  99: {
-    "99-1": "其他",
-  },
-}

 export default {
  name: "RoadNetworkMonitoring2",
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@ -445,7 +445,7 @@ export default {
            formData: {
                eventCategory: 1,
                eventType: 1,
-                triggerMechanism: '1-1'
+                triggerMechanism: ''
            },
            secondFormData: [{
                deviceType: 1,
@ -555,7 +555,7 @@ export default {
                        this.formData = {
                            eventCategory: 1,
                            eventType: 1,
-                            triggerMechanism: '1-1'
+                            triggerMechanism: ''
                        }
                        this.secondFormData = [{
                            deviceType: 1,
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@ -136,18 +136,18 @@ export const InfoWarningSource = {

 // 事件主类 warningType
 export const WarningType = {
-  1: "交通拥堵",
-  2: "行人",
-  3: "非机动车",
-  4: "停车",
-  5: "倒车/逆行",
-  6: "烟火",
-  7: "撒落物",
-  8: "异常天气",
-  9: "护栏碰撞",
-  10: "交通事故",
-  11: "车辆故障",
-  99: "其他",
+  1: '交通拥堵',
+  2: '行人',
+  3: '非机动车',
+  4: '停车',
+  5: '违规驾驶',
+  6: '路障',
+  7: '道路施工',
+  8: '异常天气',
+  9: '护栏碰撞',
+  10: '交通事故',
+  11: '车辆故障',
+  99: '其他事件',
 };

 export const WarningTypeList = Object.keys(WarningType).map((key) => {
@ -177,20 +177,29 @@ export const WarningSubclass = {
    "4-2": "工程车",
    "4-3": "主路有车",
    "4-4": "匝道有车",
-    "4-5": "车辆故障",
-    "4-6": "交通事故",
+    // "4-5": "车辆故障",
+    // "4-6": "交通事故",
    "4-7": "应急车道被占用",
    "4-8": "车离开应急车道",
    "4-9": "其他",
  },
  5: {
    "5-1": "倒车/逆行",
+    "5-2": "压线",
+    "5-3": "掉头",
+    "5-4": "超速",
+    "5-5": "低速",
+    "5-6": "违规变道",
+    "5-7": "未保持安全距离",
  },
  6: {
-    "6-1": "烟火",
+    "6-1": "烟雾",
+    "6-2": "火灾",
+    "6-3": "障碍物",
+    "6-4": "抛洒物",
  },
  7: {
-    "7-1": "撒落物",
+    "7-1": "道路施工",
  },
  8: {
    "8-1": "雨",
@ -209,8 +218,18 @@ export const WarningSubclass = {
    "9-2": "只倾斜无碰撞",
    "9-3": "碰撞后倾斜",
  },
+  10: {
+    "10-1": "未知",
+    "10-2": "单车事故",
+    "10-3": "多车事故",
+  },
+  11: {
+    "11-1": "车辆抛锚",
+    "11-2": "车辆炸胎（有备胎）",
+    "11-3": "车辆炸胎（无备胎）",
+  },
  99: {
-    "99-1": "其他",
+    "99-1": "其他事件",
  },
 };