ai-question-pro 0.0.21 → 0.0.22

package/components/demo/src/main.vue

@@ -160,6 +160,12 @@
           </div>
         </div>
         <div class="question_body" ref="generateDiv">
+          <div v-if="isGenerating" class="generating-loading">
+            <div class="loading-content">
+              <div class="loading-spinner"></div>
+              <div class="loading-text">AI生成中...</div>
+            </div>
+          </div>
           <questionItem v-if="aiResponse.questions && aiResponse.questions.length > 0" @agree="agree" @join="join"
                         @selectionChange="handleQuestionSelection"
                         :isJoined="joinedQuestions.includes(idx)"
@@ -306,6 +312,8 @@ export default {
       currentBot: 'tongyi',
       selectedQuestions: [], // 存储选中的题目
       joinedQuestions: [], // 存储已加入题库的题目索引
+      retryCountMap: {}, // 存储每个题目的重试次数
+      isGenerating: false, // 内部loading状态
     }
   },
   watch: {
@@ -483,6 +491,7 @@ export default {
       if (this.generateCount == totalCount) {
         this.$message.success('题目(' + totalCount + '道)全部生成完毕！');
         this.rebuildFlag = false;
+        this.isGenerating = false;
       } else {
         this.$message.success('生成' + this.generateCount + '道题目成功');
       }
@@ -493,12 +502,7 @@ export default {
     },
 
     reSend() {
-      this.loading && this.loading.close()
-      this.loading = this.$loading({
-        target: '.el-dialog',
-        text: 'AI生成中...'
-      });
-
+      this.isGenerating = true;
       const selectedTypes = Object.keys(this.form.selectedTypes).filter(key => this.form.selectedTypes[key])
       const questionTypes = selectedTypes
       const difficultys = selectedTypes.map(type => this.form.typeDifficulties[type])
@@ -522,25 +526,38 @@ export default {
         if (res.success) {
           this.loading && this.loading.close()
           if (res.data && res.data.questions && res.data.questions.length > 0) {
+            const newQuestion = res.data.questions[0];
+            const questionType = newQuestion.type;
+            // 检查是否有重复的题目标题和题型
+            const isDuplicate = this.checkDuplicateQuestion(newQuestion, questionType);
+            
+            if (isDuplicate) {
+              const repetitionQuestions = this.getGeneratedQuestionsByType(questionType);
+              this.regenerateWithRepetitionForReSend(obj, repetitionQuestions, questionType);
+              return;
+            }
+            
             if (this.aiResponse.questions && this.aiResponse.questions.length > 0) {
-              this.aiResponse.questions.push(res.data.questions[0]);
+              this.aiResponse.questions.push(newQuestion);
             } else {
               this.aiResponse = res.data;
             }
-            this.$set(res.data.questions[0], 'evaluate', 0)
+            this.$set(newQuestion, 'evaluate', 0)
+            // 设置题目类型，便于后续统计
+            this.$set(newQuestion, 'type', questionType)
             this.showGenerateResult();
           } else {
             this.$message.warning('题目获取失败,重新生成中...')
             return this.reSend()
           }
         } else {
-          this.loading && this.loading.close()
+          this.isGenerating = false;
           this.$message.warning('题目获取失败')
           this.rebuildFlag = false;
         }
       }).catch(error => {
         console.log("error:" + error);
-        this.loading && this.loading.close()
+        this.isGenerating = false;
         this.$message.warning('题目获取失败')
         this.rebuildFlag = false;
       })
@@ -562,11 +579,7 @@ export default {
       this.rebuildFlag = true;
       this.generateCount = 0;
       this.aiResponse = {}
-      this.loading && this.loading.close()
-      this.loading = this.$loading({
-        target: '.el-dialog',
-        text: 'AI生成中...'
-      });
+      this.isGenerating = true;
 
       const selectedTypes = Object.keys(this.form.selectedTypes).filter(key => this.form.selectedTypes[key])
 
@@ -594,29 +607,40 @@ export default {
           
           getAiQuestion(obj).then(res => {
             if (res.success) {
-              this.loading && this.loading.close()
               if (res.data && res.data.questions && res.data.questions.length > 0) {
+                const newQuestion = res.data.questions[0];
+                
+                // 检查是否有重复的题目标题和题型
+                const isDuplicate = this.checkDuplicateQuestion(newQuestion, type);
+                
+                if (isDuplicate) {
+                  // 只传递当前题型
+                  const repetitionQuestions = this.getGeneratedQuestionsByType(type);
+                  this.regenerateWithRepetition(obj, repetitionQuestions, type);
+                  return;
+                }
+                
                 if (this.aiResponse.questions && this.aiResponse.questions.length > 0) {
-                  this.aiResponse.questions.push(res.data.questions[0]);
+                  this.aiResponse.questions.push(newQuestion);
                 } else {
                   this.aiResponse = res.data;
                 }
-                this.$set(res.data.questions[0], 'evaluate', 0)
+                this.$set(newQuestion, 'evaluate', 0)
                 // 设置题目类型，便于后续统计
-                this.$set(res.data.questions[0], 'type', type)
+                this.$set(newQuestion, 'type', type)
                 this.showGenerateResult();
               } else {
                 this.$message.warning('题目获取失败,重新生成中...')
                 return this.reSend()
               }
             } else {
-              this.loading && this.loading.close()
+              this.isGenerating = false;
               this.$message.warning('题目获取失败')
               this.rebuildFlag = false;
             }
           }).catch(error => {
             console.log("error:" + error);
-            this.loading && this.loading.close()
+            this.isGenerating = false;
             this.$message.warning('题目获取失败')
             this.rebuildFlag = false;
           })
@@ -749,6 +773,142 @@ export default {
       // 清空选中状态
       this.selectedQuestions = [];
     },
+
+    // 检查题目是否重复
+    checkDuplicateQuestion(newQuestion, questionType) {
+      if (!this.aiResponse.questions || this.aiResponse.questions.length === 0) {
+        return false;
+      }
+      return this.aiResponse.questions.some(existingQuestion => {
+        return existingQuestion.title === newQuestion.title && 
+               existingQuestion.type === questionType;
+      });
+    },
+
+    // 获取指定题型的已生成题目信息
+    getGeneratedQuestionsByType(questionType) {
+      if (!this.aiResponse.questions || this.aiResponse.questions.length === 0) {
+        return [];
+      }
+      return this.aiResponse.questions
+        .filter(question => question.type === questionType)
+        .map(question => ({
+          title: question.title,
+          type: question.type
+        }));
+    },
+
+    // 重复题目信息重新生成
+    regenerateWithRepetition(originalObj, repetitionQuestions, questionType, retryCount = 0) {
+      console.log('检测到重复题目，重新生成，已生成题目:', repetitionQuestions, '重试次数:', retryCount);
+      
+      // 如果重试次数超过3次，跳过此题目
+      if (retryCount >= 3) {
+        console.log('重试次数超过3次，跳过此题目');
+        this.isGenerating = false;
+        this.$message.warning('AI生成重复题目超过3次，已跳过该题目');
+        return;
+      }
+      
+      const newObj = {
+        ...originalObj,
+        repetitionQuestions: repetitionQuestions // 传递所有已生成的题目信息
+      };
+      
+      getAiQuestion(newObj).then(res => {
+        if (res.success) {
+          this.loading && this.loading.close()
+          if (res.data && res.data.questions && res.data.questions.length > 0) {
+            const newQuestion = res.data.questions[0];
+            // 再次检查是否还有重复
+            const isStillDuplicate = this.checkDuplicateQuestion(newQuestion, questionType);
+            
+            if (isStillDuplicate) {
+              console.log('重新生成后仍有重复，继续重试，当前重试次数:', retryCount + 1);
+              // 递归调用，增加重试次数，重新获取最新的当前题型已生成题目列表
+              const updatedRepetitionQuestions = this.getGeneratedQuestionsByType(questionType);
+              this.regenerateWithRepetition(originalObj, updatedRepetitionQuestions, questionType, retryCount + 1);
+              return;
+            }
+            
+            if (this.aiResponse.questions && this.aiResponse.questions.length > 0) {
+              this.aiResponse.questions.push(newQuestion);
+            } else {
+              this.aiResponse = res.data;
+            }
+            this.$set(newQuestion, 'evaluate', 0)
+            // 设置题目类型，便于后续统计
+            this.$set(newQuestion, 'type', questionType)
+            this.showGenerateResult();
+          } else {
+            this.$message.warning('重新生成题目失败')
+          }
+        } else {
+          this.$message.warning('重新生成题目失败')
+        }
+      }).catch(error => {
+        console.log("重新生成题目错误:" + error);
+        this.$message.warning('重新生成题目失败')
+      });
+    },
+
+    // 重新生成的重复检测重新生成
+    regenerateWithRepetitionForReSend(originalObj, repetitionQuestions, questionType, retryCount = 0) {
+      console.log('reSend检测到重复题目，重新生成，已生成题目:', repetitionQuestions, '重试次数:', retryCount);
+      // 如果重试次数超过3次，跳过此题目
+      if (retryCount >= 3) {
+        console.log('reSend重试次数超过3次，跳过此题目');
+        this.isGenerating = false;
+        this.$message.warning('AI生成重复题目超过3次，已跳过该题目');
+        return;
+      }
+      const newObj = {
+        ...originalObj,
+        repetitionQuestions: repetitionQuestions
+      };
+
+      getAiQuestion(newObj).then(res => {
+        if (res.success) {
+          this.loading && this.loading.close()
+          if (res.data && res.data.questions && res.data.questions.length > 0) {
+            const newQuestion = res.data.questions[0];
+            
+            // 再次检查是否还有重复
+            const isStillDuplicate = this.checkDuplicateQuestion(newQuestion, questionType);
+            
+            if (isStillDuplicate) {
+              console.log('reSend重新生成后仍有重复，继续重试，当前重试次数:', retryCount + 1);
+              // 递归调用，增加重试次数，重新获取最新的当前题型已生成题目列表
+              const updatedRepetitionQuestions = this.getGeneratedQuestionsByType(questionType);
+              this.regenerateWithRepetitionForReSend(originalObj, updatedRepetitionQuestions, questionType, retryCount + 1);
+              return;
+            }
+            
+            if (this.aiResponse.questions && this.aiResponse.questions.length > 0) {
+              this.aiResponse.questions.push(newQuestion);
+            } else {
+              this.aiResponse = res.data;
+            }
+            this.$set(newQuestion, 'evaluate', 0)
+            // 设置题目类型，便于后续统计
+            this.$set(newQuestion, 'type', questionType)
+            this.showGenerateResult();
+          } else {
+            this.$message.warning('重新生成题目失败,重新生成中...')
+            return this.reSend()
+          }
+        } else {
+          this.loading && this.loading.close()
+          this.$message.warning('重新生成题目失败')
+          this.rebuildFlag = false;
+        }
+      }).catch(error => {
+        console.log("reSend重新生成题目错误:" + error);
+        this.loading && this.loading.close()
+        this.$message.warning('重新生成题目失败')
+        this.rebuildFlag = false;
+      });
+    },
   }
 }
 </script>
@@ -759,7 +919,7 @@ export default {
 
   ::v-deep {
     .el-drawer.rtl {
-      border-radius: 15px 0 0 15px;
+      border-radius: 20px;
       width: 720px !important;
     }
 
@@ -775,6 +935,7 @@ export default {
       background: linear-gradient(to bottom, rgba(255, 255, 255, 0), white),
       linear-gradient(to right, #BCB9F4, #D5C6F8, #E6C6F9);
       margin-bottom: 0;
+      border-radius: 20px;
     }
 
     .el-drawer__body {
@@ -824,7 +985,7 @@ export default {
 
     .el-input__inner {
       border-radius: 12px;
-      height: 48px;
+      height: 48px !important;
       border: 1px solid #E0E0E0;
     }
 
@@ -946,10 +1107,11 @@ export default {
             margin-left: 20px;
 
             ::v-deep .el-input__inner {
-              height: 42px;
+              height: 42px !important;
               border-radius: 56px;
               text-align: center;
               font-size: 12px;
+              padding: 0 !important;
             }
           }
 
@@ -1135,6 +1297,41 @@ export default {
       flex-direction: column;
     }
 
+    // 内部loading样式
+    .generating-loading {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 200px;
+      
+      .loading-content {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 16px;
+        
+        .loading-spinner {
+          width: 40px;
+          height: 40px;
+          border: 4px solid #f3f3f3;
+          border-top: 4px solid #7C4DFF;
+          border-radius: 50%;
+          animation: spin 1s linear infinite;
+        }
+        
+        .loading-text {
+          font-size: 14px;
+          color: #7C4DFF;
+          font-weight: 500;
+        }
+      }
+    }
+
+    @keyframes spin {
+      0% { transform: rotate(0deg); }
+      100% { transform: rotate(360deg); }
+    }
+
     .drawer_content_wrapper {
       display: flex;
       flex-direction: column;

package/components/demo/src/questionItem.vue

@@ -13,14 +13,14 @@
                 <span class="difficult">{{ difficultyList.find(item => item.id == detail.difficulty).name }}</span>
                 <span>{{ detail.title }}</span>
             </span>
-            <span class="question_contain_title_reght">
-                <img src="../static/zan_plain.png" v-if="detail.evaluate == 0 || detail.evaluate == 2"
-                    @click="agree(1)">
-                <img src="../static/zan_bg.png" v-if="detail.evaluate == 1">
-                <img src="../static/unzan_plain.png" v-if="detail.evaluate == 0 || detail.evaluate == 1"
-                    @click="agree(2)">
-                <img src="../static/unzan_bg.png" v-if="detail.evaluate == 2">
-            </span>
+<!--            <span class="question_contain_title_reght">-->
+<!--                <img src="../static/zan_plain.png" v-if="detail.evaluate == 0 || detail.evaluate == 2"-->
+<!--                    @click="agree(1)">-->
+<!--                <img src="../static/zan_bg.png" v-if="detail.evaluate == 1">-->
+<!--                <img src="../static/unzan_plain.png" v-if="detail.evaluate == 0 || detail.evaluate == 1"-->
+<!--                    @click="agree(2)">-->
+<!--                <img src="../static/unzan_bg.png" v-if="detail.evaluate == 2">-->
+<!--            </span>-->
         </div>
         <div class="question_contain_question" v-if="detail.type == 'single' || detail.type == 'multiple' ">
             <div v-for="item, idx in detail.options" :key="idx">