Merge branch 'dev'

src/views/flowPool/components/forewarning.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, toRefs, toRef, watch, watchEffect } from 'vue';
+import { ref, onMounted, toRefs, toRef, watch, defineExpose } from 'vue';
 import { Message } from "@arco-design/web-vue";
 import { Getdictionary } from '@/mixins/index.js'
 import { createWarning, updateWarning } from '@/api/path/flowPool.api.js'
@@ -119,8 +119,8 @@ const handleDictValue = async () => {
   earlyList.value = await Getdictionary('forewarning')
 }
 
-watch(() => FormDataList.value, val => {
 
+const detaile = (val)=>{
   formWarning.value.userId = val.userId;
   formWarning.value.poolId = val.id;
 
@@ -137,9 +137,9 @@ watch(() => FormDataList.value, val => {
   if (val.alert.id !== '') {
     formWarning.value.id = val.alert.id
   }
+}
 
-})
-
+defineExpose({detaile})
 
 onMounted(() => {
   handleDictValue()

src/views/flowPool/index.vue

@@ -45,7 +45,7 @@
 
 
     <add v-model:model-value="showAdd" status="1" :typeCurrent="typeCurrent" :record="record" @submit="intData()"></add>
-    <Forewarning v-model:modelValue="visibleForewarning" :FormDataList="FormDataList" @submit="intData()" />
+    <Forewarning v-model:modelValue="visibleForewarning" ref="forewarning" @submit="intData()" />
     <openExport v-model:model-value="ShowOpenExport" />
 
   </div>
@@ -87,7 +87,7 @@ const state = ref({
   typeCurrent: 1,
   record: {},
   dataSource: [],
-  FormDataList: {}
+  forewarning:null
 })
 const {
   role,
@@ -101,7 +101,7 @@ const {
   showAdd,
   record,
   dataSource,
-  FormDataList
+  forewarning
 } = toRefs(state.value)
 const { proxy } = getCurrentInstance()
 
@@ -161,7 +161,7 @@ const dictShowModel = (type, data) => {
 }
 
 const handelForewring = (item) => {
-  FormDataList.value = item
+  forewarning.value.detaile(item)
   visibleForewarning.value = true
 }
 

src/views/flowPool/rearFlowPool/index.vue

@@ -69,7 +69,7 @@
     ></add>
     <Forewarning
       v-model:modelValue="visibleForewarning"
-      :FormDataList="FormDataList"
+      ref="forewarning"
       @submit="intData()"
     />
   </div>
@@ -99,11 +99,11 @@ const state = reactive({
   role: systemStore.getRole,
   typeCurrent: 1,
   visibleForewarning: false,
-  FormDataList: {},
   record: {},
   sourceList: [],
   trafficList: [],
   showAdd: false,
+  forewarning:null
 });
 
 const {
@@ -113,11 +113,11 @@ const {
   role,
   typeCurrent,
   visibleForewarning,
-  FormDataList,
   record,
   sourceList,
   trafficList,
   showAdd,
+  forewarning
 } = toRefs(state);
 
 const intData = async (item) => {
@@ -186,7 +186,7 @@ const dictShowModel = (type, data) => {
 };
 
 const handelForewring = (item) => {
-  FormDataList.value = item;
+  forewarning.value.detaile(item)
   visibleForewarning.value = true;
 };