From b02c7eb73aabc8531b6e52b02fc15489f0441b52 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 28 十月 2024 10:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/taskReliability/ReliabilityAssess.vue |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/web/src/views/modules/taskReliability/ReliabilityAssess.vue b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
index 743b946..49562fe 100644
--- a/web/src/views/modules/taskReliability/ReliabilityAssess.vue
+++ b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
@@ -108,10 +108,15 @@
       onTaskSelected(data) {
         console.log(data, ' onProductSelected(data)')
         this.dataForm.taskId = data.id
+        if (this.dataForm.taskId&& this.dataForm.itemId) {
+          this.page()
+        }
       },
       onAssessDataSelected(data) {
         this.dataForm.itemId = data.id
-        this.page()
+        if (this.dataForm.taskId&& this.dataForm.itemId) {
+          this.page()
+        }
       },
       refreshData() {
         this.getAssessDataList();
@@ -138,6 +143,7 @@
       async assess() {
         if (!this.dataForm.productId || !this.dataForm.taskId || !this.dataForm.itemId || !this.dataForm.confidence) {
           this.$tip.alert("鏈夋湭濉啓鐨勬暟鎹�")
+          return
         }
         let res = await this.$http.post('/taskReliability/ReliabilityAssess/assess', this.dataForm)
         console.log(res.data)

--
Gitblit v1.9.1