From 4babf4405474a09eedc209bba619e71754b1b22f Mon Sep 17 00:00:00 2001
From: fanzhuxian <17826840660@139.com>
Date: Mon, 21 Apr 2025 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95-?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/test/performance/performanceAdd.vue | 13 ++-
 .../test/performance/performanceEdit.vue      | 85 +++++++++++++++----
 2 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/test-ui/src/views/test/performance/performanceAdd.vue b/test-ui/src/views/test/performance/performanceAdd.vue
index bef309d..8bfc94a 100644
--- a/test-ui/src/views/test/performance/performanceAdd.vue
+++ b/test-ui/src/views/test/performance/performanceAdd.vue
@@ -29,7 +29,11 @@
             @click="handleClickLoad">引用接口自动化场景</el-button>
           <el-table :data="changeList">
             <el-table-column prop="name" label="场景名称" />
-            <el-table-column prop="status" label="Enable/Disable" />
+            <el-table-column prop="status" label="Enable/Disable">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.status" active-value="1" inactive-value="0"></el-switch>
+              </template>
+            </el-table-column>
             <el-table-column prop="action" label="操作">
               <template slot-scope="scope">
                 <el-button type="text" icon="el-icon-delete" style="color: red;"
@@ -243,6 +247,10 @@ export default {
     handleWithSaveAndExecute() {
       this.validationForm()
       if (this.validation === false) { return }
+      if (this.addForm.crontab === '' || this.addForm.crontab === null) {
+        this.$message({ message: '请输入Crontab表达式', type: 'warning' })
+        return
+      }
       // 需要校验crontab表达式
       addAndExecuteTest(this.addForm).then(res => {
         if (res.code === 200) {
@@ -300,6 +308,9 @@ export default {
     },
     handleWithSure() {
       this.changeList = this.multipleSelection
+      this.changeList.forEach(item => {
+        item.status = '1'
+      })
       this.dialogVisible = false
     },
     switchChange(val) {
diff --git a/test-ui/src/views/test/performance/performanceEdit.vue b/test-ui/src/views/test/performance/performanceEdit.vue
index 9faacc7..4de8c62 100644
--- a/test-ui/src/views/test/performance/performanceEdit.vue
+++ b/test-ui/src/views/test/performance/performanceEdit.vue
@@ -29,7 +29,7 @@
           <el-button style="margin-top: 10px; margin-bottom: 10px;" icon="el-icon-share"
             @click="handleClickLoad">引用接口自动化场景</el-button>
           <el-table :data="changeList">
-            <el-table-column prop="name" label="场景名称" />
+            <el-table-column prop="testCaseName" label="场景名称" />
             <el-table-column prop="status" label="Enable/Disable">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.status" active-value="1" inactive-value="0"></el-switch>
@@ -198,6 +198,7 @@ export default {
           time: "2025-02-22 10:00:00",
         },
       ],
+      validation: false, // 校验
     }
   },
   mounted() {
@@ -205,15 +206,30 @@ export default {
     this.getTestDetailData()
   },
   methods: {
+    // 校验
+    validationForm() {
+      if (this.addForm.performanceName === '' || this.addForm.performanceName === null) {
+        this.$message({ message: '请输入测试名称', type: 'warning' })
+        return
+      }
+
+      if (this.addForm.errorOperType === '' || this.addForm.errorOperType === null) {
+        this.$message({ message: '请填写取样器错误后', type: 'warning' })
+        return
+      }
+
+      if (this.addForm.executeType === '' || this.addForm.executeType === null) {
+        this.$message({ message: '请选择执行方式', type: 'warning' })
+        return
+      }
+
+      this.validation = true
+    },
     // 保存
     handleWithSave() {
-      this.changeList.forEach(item => {
-        const par = {
-          testCaseId: item.id,
-          status: item.status
-        }
-        this.addForm.performanceTestCaseVOList.push(par)
-      })
+      this.validationForm()
+      if (this.validation === false) { return }
+      this.addForm.performanceTestCaseVOList = this.changeList
       editTest(this.addForm).then(res => {
         if (res.code === 200) {
           this.$message({ message: '编辑成功', type: 'success' })
@@ -225,6 +241,12 @@ export default {
     },
     // 保存并执行
     handleWithSaveAndExecute() {
+      this.validationForm()
+      if (this.validation === false) { return }
+      if (this.addForm.crontab === '' || this.addForm.crontab === null) {
+        this.$message({ message: '请输入Crontab表达式', type: 'warning' })
+        return
+      }
       editAndExecuteTest(this.addForm).then(res => {
         if (res.code === 200) {
           this.$message({ message: '编辑成功', type: 'success' })
@@ -253,17 +275,29 @@ export default {
     // 加载jmx文件
     handleClickLoad() {
       this.dialogVisible = true
+      this.$nextTick(() => {
+        let array = this.multipleSelection
+        this.sceneList.forEach(row => {
+          if (array.includes(row)) {
+            this.$refs.tableRef.toggleRowSelection(row, true);
+          } else {
+            this.$refs.tableRef.toggleRowSelection(row, false);
+          }
+        })
+      });
+
     },
     // 删除
     hadleClickDelete(val) {
       this.changeList = this.changeList.filter(item => item !== val);
-      this.multipleSelection = this.multipleSelection.filter(item => item !== val);
+      console.log(this.changeList)
+      this.multipleSelection = []
       this.sceneList.forEach(row => {
-        if (this.multipleSelection.includes(row)) {
-          this.$refs.tableRef.toggleRowSelection(row, true);
-        } else {
-          this.$refs.tableRef.toggleRowSelection(row, false);
-        }
+        this.changeList.forEach(item => {
+          if (row.id === item.testCaseId) {
+            this.multipleSelection.push(row)
+          }
+        })
       })
     },
     // netWorking
@@ -280,6 +314,18 @@ export default {
       getTestDetail(this.$route.query.id).then(res => {
         if (res.code === 200) {
           this.addForm = res.data
+          res.data.performanceTestCaseVOList.forEach(item => {
+            item.status = String(item.status)
+          })
+          this.changeList = res.data.performanceTestCaseVOList
+          this.sceneList.forEach(row => {
+            this.changeList.forEach(item => {
+              if (row.id === item.testCaseId) {
+                this.multipleSelection.push(row)
+              }
+            })
+          })
+          this.addForm.rpsStatus = String(res.data.rpsStatus)
         }
       })
     },
@@ -299,7 +345,16 @@ export default {
       this.multipleSelection = val;
     },
     handleWithSure() {
-      this.changeList = this.multipleSelection
+      this.changeList = []
+      this.multipleSelection.forEach(item => {
+        var par = {
+          testCaseId: item.id,
+          status: '1',
+          testCaseName: item.name
+        }
+        this.changeList.push(par)
+      })
+
       this.dialogVisible = false
     },
     switchChange(val) {