Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into dev

src/views/resource/bankManagement/testPaperManagement/addPaper/topicAddPaper/index.vue

@@ -1714,9 +1714,9 @@ export default {
           setTimeout(async () => {
             await this.removeInfo();
             this.$store.dispatch("tagsView/exitView", this.$route).then(() => {
-              // this.$router.push({
-              //   path: "testPaperManagement",
-              // });
+              this.$router.push({
+                path: "testPaperManagement",
+              });
             });
           }, 500);
         })

src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/index.vue

@@ -1725,6 +1725,7 @@ export default {
         return;
       }
       var arrs = [];
+      this.disabledBtn = true;
       for (let i = this.tableData.length - 1; i >= 0; i--) {
         if (self.tableData[i].questionId && self.tableData[i].diff) {
           await self.uploadApis(self.tableData[i]);
@@ -1739,8 +1740,7 @@ export default {
           score: self.tableData[i].score,
           partScore: self.tableData[i].partScore,
         });
-      }
-      this.disabledBtn = true;
+      }     
       var data = {
         examId: this.$route.query.id,
         questionList: arrs,

src/views/resource/videoManagement/festival/edit/index.vue

@@ -357,12 +357,8 @@
           <el-button
             type="primary"
             @click="submit('listData')"
-<<<<<<< HEAD
-            :disabled="!noStudent"
-=======
             :disabled="listData.sectionType === 1 ? !noStudent : false"
             :loading="disabledBtn"
->>>>>>> b2a276f5917ad406fb7c2bd0e52954a213cb9492
             >确定</el-button
           >
         </el-form-item>