Merge branch 'master' of http://git.scdxtc.com/tangyi/rzcs

src/view/generateTest.vue

@@ -288,8 +288,8 @@ export default {
         "删除后将无法继续扫码访问，且正在参与答题的用户将会被终止答题测试",
         "确定要删除该测试吗？",
         {
-          confirmButtonText: "取消",
+          confirmButtonText: "确定",
-          cancelButtonText: "确定",
+          cancelButtonText: "取消",
           type: "提示",
         }
       )
@@ -297,7 +297,7 @@ export default {
           that.deletgenerateTest(obj);
           ElMessage({
             type: "delet",
-            message: "已停用",
+            message: "已删除",
           });
         })
         .catch(() => {

src/view/projectTopic.vue

@@ -610,7 +610,9 @@ export default {
       this.generateTestIf = true;
     },
     // 确定新增测试
-    determineGenerateTest() {
+    determineGenerateTest() {     
+      let that=this                                     
+      this.generateTestData.projectId=this.projectData.id
       this.generateTestData.coverImg = this.imgData;
       if (this.generateTestData.isAllowWhiteList) {
         this.generateTestData.isAllowWhiteList = "1";
@@ -620,9 +622,18 @@ export default {
          this.generateTestIf=false
       this.axios
         .post("hysc/test/addTest", this.generateTestData)
+        .then(function (data) {
+                console.log(data,"12q3123");
+           that.axios
+        .post("/hysc/test/addTestTopic", {
+          projectId:that.projectData.id,
+          testId: data.data.data.id
+        })
         .then(function (data) {
           console.log(data);
         })
+       
+        })
         .catch(function (error) {
           console.log(error);
         });