From 77928007e41c5799b0549d6d8a5c407fee2c6136 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Fri, 26 Jan 2024 17:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FormConfig/index.vue           | 23 +++++++++++++------
 .../components/InputSearch/index.vue          |  8 ++++++-
 .../components/BroadcastReleases.vue          |  2 --
 .../components/DeviceControlDialog.vue        |  6 ++---
 .../Dialogs/PerceiveEvent/index.vue           |  4 ++--
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
index 81fc7f0f..def75814 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/index.vue
@@ -18,7 +18,7 @@
 <script>
 import { resolveName, defaultComponentOptions } from "./utils/index";
 import { reduceDefaultValue } from "./utils/defaultValue";
-import { set as pathSet, get as pathGet } from "lodash";
+import { set as pathSet, get as pathGet, cloneDeep } from "lodash";
 
 import ProxyCom from "./Proxy.vue";
 
@@ -163,11 +163,20 @@ export default {
       return components[componentKey] || components[ElComponentKey] || ElComponentKey;
     },
     getRules(item) {
-      // if (this.rules?.[item.key]) return this.rules[item.key];
+      // 自定义的没添加
 
-      // if (item.rules) return item.rules;
-
-      // console.log(item.required)
+      /**
+       * validator 手动情况下 此方法需要改传参 ({
+       * // 当前总数据
+       * data,
+       * // 当前字段的值
+       * value,
+       * // 回调跟 el 一样
+       * callback,
+       * // 当前的item config
+       * config
+       * })
+       */
 
       if (item.required) return [
         {
@@ -183,8 +192,8 @@ export default {
     },
     validate() {
       return new Promise((resolve, reject) => {
-        this.$refs.ElFormRef.validate((bool, data) => {
-          if (bool) resolve(data)
+        this.$refs.ElFormRef.validate((bool) => {
+          if (bool) resolve(cloneDeep(this.modelFormData))
           else reject()
         })
       })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
index 73970c5e..605b42ff 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
@@ -80,7 +80,13 @@ export default {
       this.$emit('handleSearch', cloneDeep(this.$refs.FormConfigRef?.formData));
     },
     handleSearch() {
-      this.$emit('handleSearch', cloneDeep(this.$refs.FormConfigRef?.formData));
+      this.$refs.FormConfigRef.validate()
+        .then((result) => {
+          this.$emit('handleSearch', result);
+        })
+        .catch((err) => {
+          console.log("catch")
+        });
     }
   }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 56b381c6..74a78147 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -40,7 +40,6 @@
 <script>
 import Dialog from "@screen/components/Dialog/index.vue";
 import Button from "@screen/components/Buttons/Button.vue"
-import Form from '@screen/components/FormConfig';
 import Video from "@screen/components/Video"
 import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue"
 
@@ -54,7 +53,6 @@ export default {
   components: {
     Dialog,
     Button,
-    Form,
     Video,
     CheckboxGroup
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 878dcada..3f22193c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -87,16 +87,16 @@ export default {
           type: "RadioGroup",
           default: "00",
           ons: {
-            input: (value, data, that) => {
+            input: (value, { data }) => {
               const oldFormData = this.oldFormData;
               if (!oldFormData) return;
 
-              that.formList[1].options.options.splice(-1, 1, {
+              this.formList[1].options.options.splice(-1, 1, {
                 ...workStatus.slice(-1)[0],
                 disabled: value != "00"
               })
 
-              that.formList[1].options.options.splice(0, 1, {
+              this.formList[1].options.options.splice(0, 1, {
                 ...workStatus[0],
                 disabled: value != "00"
               })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index 4d7b3b19..34ef3ef4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -80,9 +80,9 @@ export default {
             options: WarningTypeList
           },
           ons: {
-            change: (value, formData) => {
+            change: (value, { data }) => {
               this.formList[4].options.options = WarningSubclassList[value] || [];
-              formData.warningSubclass = null;
+              data.warningSubclass = null;
             }
           }
         },