From 09b54a29abbdb75b555861decf36a97da576b956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= <stary1993@qq.com>
Date: Mon, 15 Sep 2025 10:38:14 +0800
Subject: [PATCH] =?UTF-8?q?ADD:=20=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=91=E6=B5=8B=E7=82=B9=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/result/result.ts                        | 4 +++-
 frontend/src/views/home/components/reportResultPopup.vue | 9 ++++++---
 .../src/views/plan/planList/components/planPopup.vue     | 9 ++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/api/result/result.ts b/frontend/src/api/result/result.ts
index 1e11ff9..4c8d596 100644
--- a/frontend/src/api/result/result.ts
+++ b/frontend/src/api/result/result.ts
@@ -2,4 +2,6 @@ import http from '@/api'
 
 export const getMonitorResult = (devId: string) => http.post(`/result/getMonitorResult?devId=${devId}`)
 export const getMonitorDataSourceResult = (monitorId: string) =>
-    http.get(`/result/getMonitorDataSourceResult?monitorId=${monitorId}`)
\ No newline at end of file
+    http.get(`/result/getMonitorDataSourceResult?monitorId=${monitorId}`)
+
+export const updateMonitorResult = (data: any) => http.post('/result/updateMonitorResult', data)
\ No newline at end of file
diff --git a/frontend/src/views/home/components/reportResultPopup.vue b/frontend/src/views/home/components/reportResultPopup.vue
index 83dade8..2cc7ecf 100644
--- a/frontend/src/views/home/components/reportResultPopup.vue
+++ b/frontend/src/views/home/components/reportResultPopup.vue
@@ -104,7 +104,7 @@
     </el-dialog>
 </template>
 <script setup lang="ts" name="reportPopup">
-import { getMonitorDataSourceResult, getMonitorResult } from '@/api/result/result'
+import { getMonitorDataSourceResult, getMonitorResult, updateMonitorResult } from '@/api/result/result'
 import { type MonitorResult } from '@/api/result/interface'
 
 const dialogVisible = ref(false)
@@ -117,6 +117,7 @@ const whichTimeData = ref<any>([])
 const sourceData = ref<any>([])
 const formRef = ref()
 const submitSourceData = reactive({
+    monitorId: '',
     whichTime: '',
     resultType: '',
     checkResult: -1
@@ -145,6 +146,7 @@ const handleTabClick = (tab: any) => {
 const handleChooseClick = async () => {
     const currentResult = resultData.value[activeName.value]
     if (currentResult) {
+        submitSourceData.monitorId = currentResult.monitorId
         submitSourceData.whichTime = currentResult.whichTime
         submitSourceData.resultType = currentResult.resultType
         submitSourceData.checkResult = currentResult.checkResult
@@ -169,8 +171,9 @@ const handleSourceChange = (value: any) => {
     ).checkResult
 }
 const handleSureChoose = () => {
-    formRef.value.validate().then(() => {
-        console.log(submitSourceData)
+    formRef.value.validate().then(async () => {
+        await updateMonitorResult(submitSourceData)
+        await getResultData()
         dialogSourceVisible.value = false
     })
 }
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index eb5e700..3cc64cc 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -98,12 +98,11 @@
                                 :key="item.id"
                                 :label="item.name"
                                 :value="item.code || ''"
-                                :disabled="(selectByMode && planType == 0) || allDisabled">
-                            </el-option>
-                            />
+                                :disabled="(selectByMode && planType == 0) || allDisabled"
+                            ></el-option>
                         </el-select>
                     </el-form-item>
-                   
+
                     <el-form-item v-if="!selectByMode" :label-width="110" label="检测脚本" prop="scriptId">
                         <el-select
                             v-model="formContent.scriptId"
@@ -885,7 +884,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
             if (Array.isArray(user_Result.data)) {
                 if (user_Result.data.length > 0) {
                     // 为leaderData和memberData分别创建独立的对象数组
-                   
+
                     leaderData.value = user_Result.data
                         .filter((user: any) => !user.roleCodes.includes('root'))
                         .map((user: any) => ({