调整事件接口参数

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js

@@ -82,6 +82,7 @@ export const station = {
             color: "#3DE8FF",
           },
         },
+        key: "stakeMark[0]",
       },
       {
         prefix: {
@@ -90,6 +91,7 @@ export const station = {
             color: "#3DE8FF",
           },
         },
+        key: "stakeMark[1]",
       },
     ],
   },
@@ -144,6 +146,12 @@ export const direction = {
   key: "direction",
   required: true,
   type: "select",
+  options: {
+    options: [
+      { key: "济南方向", label: "济南方向" },
+      { key: "菏泽方向", label: "菏泽方向" },
+    ],
+  },
 };
 
 export const problemDescription = {
@@ -166,6 +174,10 @@ export const startTime = {
   required: true,
   isAlone: true,
   type: "datePicker",
+  options:{
+    format: 'yyyy-MM-dd HH:mm:ss',
+    valueFormat: 'yyyy-MM-dd HH:mm:ss'
+  }
 };
 
 export const expectedEndTime = {
@@ -173,6 +185,10 @@ export const expectedEndTime = {
   key: "estimatedEndTime",
   isAlone: true,
   type: "datePicker",
+  options:{
+    format: 'yyyy-MM-dd HH:mm:ss',
+    valueFormat: 'yyyy-MM-dd HH:mm:ss'
+  }
 };
 
 export const eventLevel = {
@@ -362,14 +378,55 @@ export const freeway = {
   required: true,
   key: "roadId",
   type: "select",
+  options: {
+    options: [
+      {
+        key: "1",
+        label: "济菏高速",
+      },
+    ]
+  }
 };
 
-export const weatherConditions = {
+export const weatherCondition = {
   label: "天气情况:",
   key: "dcEventAccident.weatherCondition",
   type: "RadioGroup",
   isAlone: true,
   required: true,
+  options: {
+    activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
+    options: [
+      {
+        key: "1",
+        label: "晴",
+      },
+      {
+        key: "2",
+        label: "雨",
+      },
+      {
+        key: "3",
+        label: "雪",
+      },
+      {
+        key: "4",
+        label: "雾",
+      },
+      {
+        key: "5",
+        label: "其他",
+      },
+    ],
+  },
+};
+
+export const weatherSituation = {
+  label: "天气情况:",
+  key: "dcEventAccident.weatherSituation",
+  type: "RadioGroup",
+  isAlone: true,
+  required: true,
   options: {
     activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
     options: [
@@ -555,6 +612,10 @@ export const aEstimatedReleaseTime = {
   label: "预计解除时间:",
   key: "estimatedEndTime",
   type: "datePicker",
+  options:{
+    format: 'yyyy-MM-dd HH:mm:ss',
+    valueFormat: 'yyyy-MM-dd HH:mm:ss'
+  }
 };
 
 export const pressure = {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js

@@ -6,30 +6,30 @@ export const tabConfigList = [
     label: "交通事故",
     formConfig: {
       list: [
-        Object.assign(PresetFormItems.callPolicePersonName, { key: 'dcEventAccident.reporterName' }),
+        { ...PresetFormItems.callPolicePersonName, key: 'dcEventAccident.reporterName' },
-        Object.assign(PresetFormItems.callPolicePersonPhone, { key: 'dcEventAccident.reporterPhoneNumber' }),
+        { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventAccident.reporterPhoneNumber' },
         PresetFormItems.trafficAccidentType,
         PresetFormItems.eventLevel,
-        Object.assign(PresetFormItems.locationMode, { key: 'dcEventAccident.locationType' }),
+        { ...PresetFormItems.locationMode, key: 'dcEventAccident.locationType' },
-        Object.assign(PresetFormItems.route, { key: 'dcEventAccident.route' }),
+        { ...PresetFormItems.freeway, key: 'dcEventAccident.roadId' },
         PresetFormItems.direction,
         PresetFormItems.station,
         PresetFormItems.eventHappenTime,
         PresetFormItems.aEstimatedReleaseTime,
-        Object.assign(PresetFormItems.pressure, { key: 'dcEventAccident.trafficJam' }),
+        { ...PresetFormItems.pressure, key: 'dcEventAccident.trafficJam' },
-        Object.assign(PresetFormItems.weatherConditions, { key: 'dcEventAccident.weatherCondition' }),
+        { ...PresetFormItems.weatherCondition, key: 'dcEventAccident.weatherCondition' },
-        Object.assign(PresetFormItems.effect, { key: 'dcEventAccident.impactLevel' }),
+        { ...PresetFormItems.effect, key: 'dcEventAccident.impactLevel' },
-        Object.assign(PresetFormItems.isArrives, { key: 'dcEventAccident.isReverseCargo' }),
+        { ...PresetFormItems.isArrives, key: 'dcEventAccident.isReverseCargo' },
-        Object.assign(PresetFormItems.isMaintenanceAccident, { key: 'dcEventAccident.isMaintenance' }),
+        { ...PresetFormItems.isMaintenanceAccident, key: 'dcEventAccident.isMaintenance' },
-        Object.assign(PresetFormItems.trafficPolicePhone, { key: 'dcEventAccident.policeContact' }),
+        { ...PresetFormItems.trafficPolicePhone, key: 'dcEventAccident.policeContact' },
-        Object.assign(PresetFormItems.wreckerCalls, { key: 'dcEventAccident.towingServiceContact' }),
+        { ...PresetFormItems.wreckerCalls, key: 'dcEventAccident.towingServiceContact' },
-        Object.assign(PresetFormItems.isCongestionAhead, { key: 'dcEventAccident.congestionAhead' }),
+        { ...PresetFormItems.isCongestionAhead, key: 'dcEventAccident.congestionAhead' },
-        Object.assign(PresetFormItems.isForkRoad, { key: 'dcEventAccident.atIntersection' }),
+        { ...PresetFormItems.isForkRoad, key: 'dcEventAccident.atIntersection' },
-        Object.assign(PresetFormItems.isCurveRoad, { key: 'dcEventAccident.onCurve' }),
+        { ...PresetFormItems.isCurveRoad, key: 'dcEventAccident.onCurve' },
-        Object.assign(PresetFormItems.isInTunnel, { key: 'dcEventAccident.inTunnel' }),
+        { ...PresetFormItems.isInTunnel, key: 'dcEventAccident.inTunnel' },
-        Object.assign(PresetFormItems.spillName, { key: 'dcEventAccident.spillageItem' }),
+        { ...PresetFormItems.spillName, key: 'dcEventAccident.spillageItem' },
-        Object.assign(PresetFormItems.ownerPhone, { key: 'dcEventAccident.vehicleOwnerPhone' }),
+        { ...PresetFormItems.ownerPhone, key: 'dcEventAccident.vehicleOwnerPhone' },
-        Object.assign(PresetFormItems.laneOccupancy, { key: 'dcEventAccident.laneOccupancy' }),
+        { ...PresetFormItems.laneOccupancy, key: 'dcEventAccident.laneOccupancy' },
         PresetFormItems.vehicleCondition('dcEventAccident'),
         PresetFormItems.casualties('dcEventAccident'),
         PresetFormItems.eventTitle,
@@ -44,23 +44,23 @@ export const tabConfigList = [
     formConfig: {
       formOptions: {},
       list: [
-        Object.assign(PresetFormItems.callPolicePersonName, { key: 'dcEventVehicleAccident.reporterName' }),
+        { ...PresetFormItems.callPolicePersonName, key: 'dcEventVehicleAccident.reporterName' },
-        Object.assign(PresetFormItems.callPolicePersonPhone, { key: 'dcEventVehicleAccident.reporterPhoneNumber' }),
+        { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventVehicleAccident.reporterPhoneNumber' },
         PresetFormItems.vehicleMalfunctionType,
         PresetFormItems.eventLevel,
-        Object.assign(PresetFormItems.locationMode, { key: 'dcEventVehicleAccident.locationType' }),
+        { ...PresetFormItems.locationMode, key: 'dcEventVehicleAccident.locationType' },
-        Object.assign(PresetFormItems.route, { key: 'dcEventVehicleAccident.route' }),
+        { ...PresetFormItems.freeway, key: 'dcEventVehicleAccident.roadId' },
         PresetFormItems.direction,
         PresetFormItems.station,
         PresetFormItems.eventHappenTime,
         PresetFormItems.aEstimatedReleaseTime,
-        Object.assign(PresetFormItems.pressure, { key: 'dcEventVehicleAccident.trafficJam' }),
+        { ...PresetFormItems.pressure, key: 'dcEventVehicleAccident.trafficJam' },
-        Object.assign(PresetFormItems.weatherConditions, { key: 'dcEventVehicleAccident.weatherCondition' }),
+        { ...PresetFormItems.weatherCondition, key: 'dcEventVehicleAccident.weatherCondition' },
-        Object.assign(PresetFormItems.isCongestionAhead, { key: 'dcEventVehicleAccident.congestionAhead' }),
+        { ...PresetFormItems.isCongestionAhead, key: 'dcEventVehicleAccident.congestionAhead' },
-        Object.assign(PresetFormItems.isForkRoad, { key: 'dcEventVehicleAccident.atIntersection' }),
+        { ...PresetFormItems.isForkRoad, key: 'dcEventVehicleAccident.atIntersection' },
-        Object.assign(PresetFormItems.isCurveRoad, { key: 'dcEventVehicleAccident.onCurve' }),
+        { ...PresetFormItems.isCurveRoad, key: 'dcEventVehicleAccident.onCurve' },
-        Object.assign(PresetFormItems.isInTunnel, { key: 'dcEventVehicleAccident.inTunnel' }),
+        { ...PresetFormItems.isInTunnel, key: 'dcEventVehicleAccident.inTunnel' },
-        Object.assign(PresetFormItems.laneOccupancy, { key: 'dcEventVehicleAccident.laneOccupancy' }),
+        { ...PresetFormItems.laneOccupancy, key: 'dcEventVehicleAccident.laneOccupancy' },
         PresetFormItems.vehicleCondition('dcEventVehicleAccident'),
         PresetFormItems.casualties('dcEventVehicleAccident'),
         PresetFormItems.eventTitle,
@@ -103,8 +103,8 @@ export const tabConfigList = [
             ],
           },
         },
-        Object.assign(PresetFormItems.congestionCause, { key: 'dcEventTrafficCongestion.congestionCause' }),
+        { ...PresetFormItems.congestionCause, key: 'dcEventTrafficCongestion.congestionCause' },
-        PresetFormItems.isInTunnel,
+        { ...PresetFormItems.isInTunnel, isAlone: true },
         {
           label: "拥堵里程:",
           key: "dcEventTrafficCongestion.congestionMileage",
@@ -538,7 +538,7 @@ export const tabConfigList = [
             ],
           },
         },
-        Object.assign(PresetFormItems.weatherConditions, { key: 'dcEventAbnormalWeather.weatherSituation' }),
+        { ...PresetFormItems.weatherSituation, key: 'dcEventAbnormalWeather.weatherSituation' },
         PresetFormItems.additionalNotes,
         PresetFormItems.freeway,
         PresetFormItems.direction,
@@ -650,7 +650,7 @@ export const tabConfigList = [
           },
         },
         PresetFormItems.isInTunnel,
-        Object.assign(PresetFormItems.locationType, { key: 'dcEventConstruction.locationType' }),
+        { ...PresetFormItems.locationType, key: 'dcEventConstruction.locationType' },
         PresetFormItems.freeway,
         PresetFormItems.direction,
         PresetFormItems.station,
@@ -667,8 +667,8 @@ export const tabConfigList = [
             showWordLimit: true,
           },
         },
-        Object.assign(PresetFormItems.specialConstruction, { key: 'dcEventConstruction.specialConstruction' }),
+        { ...PresetFormItems.specialConstruction, key: 'dcEventConstruction.specialConstruction' },
-        Object.assign(PresetFormItems.constructionMeasurement, { key: 'dcEventConstruction.constructionMeasurement' }),
+        { ...PresetFormItems.constructionMeasurement, key: 'dcEventConstruction.constructionMeasurement' },
         PresetFormItems.startTime,
         PresetFormItems.expectedEndTime,
         PresetFormItems.remark,

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

@@ -21,6 +21,7 @@
 import Dialog from "@screen/components/Dialog/index";
 import Form from '@screen/components/FormConfig';
 import Button from '@screen/components/Buttons/Button.vue';
+import request from '@/utils/request'
 
 import { tabConfigList } from "./data.js"
 
@@ -72,11 +73,13 @@ export default {
     },
     handleSubmit(){
       const formData = this.$refs.FormConfigRef?.formData;
+      let stakeMark = formData.stakeMark;
       console.log('122', {
           eventType: this.index,
-          ...formData
+          ...formData,
+          stakeMark: stakeMark.length > 0 ?  ('K' + stakeMark[0] + '+' + stakeMark[1]) : ''
         })
-        return
+        // return
       request({
         url: `/dc/system/event`,
         method: "post",