新增事件弹窗

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

@@ -716,7 +716,13 @@ export const locationMode = {
   },
   ons: {
     change(value, ...args) {
-      const { formList } = args.slice(-1)[0];
+      const { data, formList } = args.slice(-1)[0];
+      if(data.dcEventAccident) {
+        data.dcEventAccident.facilityId = null;
+      }
+      if(data.dcEventVehicleAccident) {
+        data.dcEventVehicleAccident.facilityId = null;
+      }
 
       let facilityType = 1;
       if (value == 2) {
@@ -744,7 +750,7 @@ export const locationMode = {
           
         }).catch((err) => {
           console.log('err',err)
-          Message.error("查询失败", err);
+          Message.error("查询失败1", err);
         })
       }
       
@@ -1129,9 +1135,9 @@ export const congestionCause = {
   },
   ons: {
     input(value, ...args) {
-      console.log(value);
+      // console.log(value);
       const { formList } = args.slice(-1)[0];
-      const config = formList.find((it) => it.key == "xxyy");
+      const config = formList.find((it) => it.key == "detailedReasons");
       let ad = {
         1: [
           {
@@ -1181,4 +1187,10 @@ export const congestionCause = {
       config.options.options = value != 1 ? ad[1] : ad[2];
     },
   },
+  visible: (data) => {
+    if (data?.eventSubclass != '4-1') {
+      return false;
+    }
+    return true;
+  },
 };

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

@@ -88,7 +88,7 @@ export default {
             this.roads.push({ key: it.id, label: it.roadName })
           })
         }).catch((err) => {
-          Message.error("查询失败", err);
+          Message.error("查询失败4", err);
         }),
         //方向字典
         request({
@@ -100,7 +100,7 @@ export default {
             this.direction.push({ key: it.dictValue, label: it.dictLabel })
           })
         }).catch((err) => {
-          Message.error("查询失败", err);
+          Message.error("查询失败5", err);
         }),
         //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
         request({
@@ -108,9 +108,10 @@ export default {
           method: "get"
         }).then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
-          result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: facilityType }))
+          result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: it.facilityType }))
         }).catch((err) => {
-          Message.error("查询失败", err);
+          console.log('err', err)
+          Message.error("查询失败6", err);
         })
 
       ])
@@ -148,9 +149,15 @@ export default {
         if (this.index == 0 || this.index == 1) {
           formData.lang = formData.lang.join(',')
         }
-        if (this.index == 9) {
+        if (formData.endStakeMark) {
           let endStakeMark = formData.endStakeMark;
-          formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '';
+          let strMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '';
+          if (this.index == 3) {
+            formData.dcEventTrafficCongestion.endStakeMark = strMark;
+          }
+          if (this.index == 9) {
+            formData.dcEventAbnormalWeather.endStakeMark = strMark;
+          }
           formData.endStakeMark = '';
         }
         // console.log('formData',formData)
@@ -163,15 +170,13 @@ export default {
           data: {
             ...formData,
             eventType: Number(this.index) + 1,
-            stakeMark: (stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '',
+            stakeMark: stakeMark ? ((stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '') : '',
           }
-        })
+        }).then((result) => {
-          .then((result) => {
           if (result.code != 200) return Message.error(result?.msg);
           Message.success("提交成功");
           this.modelVisible = false;
-          })
+        }).catch(() => {
-          .catch(() => {
           Message.error("提交失败");
         }).finally(() => {
           this.submitting = false;