From f041527e28330c392f3bbf843a00188cbc6cb642 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 25 Jan 2024 15:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FormConfig/index.vue           |  2 +-
 .../FormConfig/utils/defaultValue.js          |  2 +-
 .../event/event/FormEvent/PresetFormItems.js  | 26 ++++++++++++++-----
 .../control/event/event/FormEvent/index.vue   | 25 ++++++++++++++++--
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
index f389047f..cdd58ee0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
@@ -115,7 +115,7 @@ export default {
     },
     formItemVisible() {
       return item => {
-        const result = item.visible ? item.visible(this.modelFormData) : true;
+        const result = item && item.visible ? item.visible(this.modelFormData) : true;
 
         // if (!result) {
         //   delete this.formData[item.key];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
index 77a7b801..b055db7f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/utils/defaultValue.js
@@ -34,7 +34,7 @@ export function reduceDefaultValue(formList, data) {
   if (!Array.isArray(formList)) return null;
 
   return formList.reduce((prev, cur) => {
-    if (cur.key)
+    if (cur?.key)
       pathSet(
         prev,
         cur.key,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
index d1553658..d174b9aa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
@@ -185,20 +185,32 @@ export const eventLevel = {
 export const laneOccupancy = {
   label: "车道占用:",
   key: "dcEventAccident.laneOccupancy",
-  type: "CheckboxGroup",
+  type: "RadioGroup",
   isAlone: true,
   default: [],
   options: {
     options: [
-      { key: "weChat", label: "行1" },
-      { key: "message", label: "行2" },
-      { key: "website", label: "行3" },
-      { key: "weibo", label: "行4" },
-      { key: "weibo2", label: "应急车道" },
+      { key: "1", label: "行1" },
+      { key: "2", label: "行2" },
+      { key: "3", label: "行3" },
+      { key: "4", label: "行4" },
+      { key: "0", label: "应急车道" },
     ],
   },
 };
 
+export const eventSources = {
+  label: "事件源:",
+  key: "key999999999",
+  type: "input",
+};
+
+export const eventType = {
+  label: "事件类型:",
+  key: "事件类型",
+  type: "input",
+};
+
 export const vehicleCondition = (keyPrefix = 'dcEventAccident') => ({
   label: "车辆情况:",
   key: "key25",
@@ -334,7 +346,7 @@ export const isInTunnel = {
     activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)",
     options: [
       {
-        key: "2",
+        key: "1",
         label: "是",
       },
       {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index 25c9aa44..b62ce70a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
@@ -42,7 +42,8 @@ export default {
     return {
       activeName: "TrafficAccident",
       formConfig: {},
-      tabConfigList
+      tabConfigList,
+      index: 1
     }
   },
   created() {
@@ -66,11 +67,31 @@ export default {
   },
   methods: {
     handleChange({ index }) {
+      this.index = index;
       this.formConfig = tabConfigList[index].formConfig;
     },
     handleSubmit(){
       const formData = this.$refs.FormConfigRef?.formData;
-      console.log('122',formData)
+      console.log('122', {
+          eventType: this.index,
+          ...formData
+        })
+        return
+      request({
+        url: `/dc/system/event`,
+        method: "post",
+        data: {
+          eventType: this.index,
+          ...formData
+        }
+      })
+        .then(() => {
+          Message.success("提交成功");
+        })
+        .catch(() => {
+          Message.error("提交失败");
+        })
+      
     }
   }
 }