0

public/mg/yjbdc_articles.html

@@ -246,8 +246,13 @@
         }
 
         @keyframes spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
+            0% {
+                transform: rotate(0deg);
+            }
+
+            100% {
+                transform: rotate(360deg);
+            }
         }
 
         .clear-btn {
@@ -336,13 +341,11 @@
                 </div>
                 <!-- 搜索结果列表 -->
                 <div class="search-results" style="flex: 1; overflow-y: auto; padding: 10px;">
-                    <div v-if="articles && articles.length > 0" 
-                         v-for="(article, index) in articles" 
-                         :key="index"
-                         @click="selectArticle(article)"
-                         style="padding: 10px; margin: 5px 0; background: white; border-radius: 4px; cursor: pointer; transition: background-color 0.2s;"
-                         :style="{ backgroundColor: selectedArticle === article ? '#e6f3ff' : 'white' }"
-                         class="search-result-item">
+                    <div v-if="articles && articles.length > 0" v-for="(article, index) in articles" :key="index"
+                        @click="selectArticle(article)"
+                        style="padding: 10px; margin: 5px 0; background: white; border-radius: 4px; cursor: pointer; transition: background-color 0.2s;"
+                        :style="{ backgroundColor: selectedArticle === article ? '#e6f3ff' : 'white' }"
+                        class="search-result-item">
                         <div style="font-weight: bold;">文章ID: {{ article.ID }}</div>
                         <div style="font-size: 12px; color: #666; margin-top: 4px;">
                             创建时间: {{ article.CreateTime }}
@@ -354,11 +357,11 @@
                             单词表: {{ article.Words }}
                         </div>
                         <div style="font-size: 12px; color: #666;">
-                            是否精选: {{ article.IsFine=="1"?"是":"" }}
+                            是否精选: {{ article.IsFine ? "是" : "否" }}
                         </div>
                     </div>
-                    <div v-else-if="articles && articles.length === 0" 
-                         style="text-align: center; color: #999; padding: 20px;">
+                    <div v-else-if="articles && articles.length === 0"
+                        style="text-align: center; color: #999; padding: 20px;">
                         未找到相关文章
                     </div>
                 </div>
@@ -377,17 +380,24 @@
                     <span class="json-key">是否精选:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'IsFine', 'IsFine')">
                         <template v-if="editingKey === 'IsFine'">
-                            <input type="number" class="json-editor-input" v-model.number="selectedArticle.IsFine"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <label style="margin-right: 10px;">
+                                <input type="radio" v-model.number="selectedArticle.IsFine" :value="1"
+                                    @change="finishEdit"> 是
+                            </label>
+                            <label>
+                                <input type="radio" v-model.number="selectedArticle.IsFine" :value="0"
+                                    @change="finishEdit"> 否
+                            </label>
                         </template>
                         <template v-else>
-                            {{ selectedArticle.IsFine }}
+                            {{ selectedArticle.IsFine == 1 || selectedArticle.IsFine == "1" ? "是" : "否" }}
                         </template>
                     </span>
                 </div>
                 <div class="json-node">
                     <span class="json-key">文章英文标题:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleTitle', 'ArticleTitle')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'ArticleTitle', 'ArticleTitle')">
                         <template v-if="editingKey === 'ArticleTitle'">
                             <input type="text" class="json-editor-input" v-model="selectedArticle.ArticleTitle"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
@@ -399,7 +409,8 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">文章中文标题:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleTitleCHN', 'ArticleTitleCHN')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'ArticleTitleCHN', 'ArticleTitleCHN')">
                         <template v-if="editingKey === 'ArticleTitleCHN'">
                             <input type="text" class="json-editor-input" v-model="selectedArticle.ArticleTitleCHN"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
@@ -411,7 +422,8 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">文章图片名称:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleImage', 'ArticleImage')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'ArticleImage', 'ArticleImage')">
                         <template v-if="editingKey === 'ArticleImage'">
                             <input type="text" class="json-editor-input" v-model="selectedArticle.ArticleImage"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
@@ -423,10 +435,12 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">创建时间:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'CreateTime', 'CreateTime')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'CreateTime', 'CreateTime')">
                         <template v-if="editingKey === 'CreateTime'">
-                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.CreateTime"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="text" disabled="true" class="json-editor-input"
+                                v-model="selectedArticle.CreateTime" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             "{{ selectedArticle.CreateTime }}"
@@ -435,23 +449,26 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">英语文章:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleStart', 'ArticleStart')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'ArticleStart', 'ArticleStart')">
                         <template v-if="editingKey === 'ArticleStart'">
-                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.ArticleStart"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="text" disabled="true" class="json-editor-input"
+                                v-model="selectedArticle.ArticleStart" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             "{{ selectedArticle.ArticleStart }}"
                         </template>
                     </span>
                 </div>
-               
+
                 <div class="json-node">
                     <span class="json-key">用户ID:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'UserID', 'UserID')">
                         <template v-if="editingKey === 'UserID'">
-                            <input type="number" disabled="true" class="json-editor-input" v-model.number="selectedArticle.UserID"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="number" disabled="true" class="json-editor-input"
+                                v-model.number="selectedArticle.UserID" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             {{ selectedArticle.UserID }}
@@ -460,10 +477,12 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">生成秒数:</span>
-                    <span class="json-number editable" @dblclick="editValue(selectedArticle, 'GenerateTime', 'GenerateTime')">
+                    <span class="json-number editable"
+                        @dblclick="editValue(selectedArticle, 'GenerateTime', 'GenerateTime')">
                         <template v-if="editingKey === 'GenerateTime'">
-                            <input type="number" disabled="true" class="json-editor-input" v-model.number="selectedArticle.GenerateTime"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="number" disabled="true" class="json-editor-input"
+                                v-model.number="selectedArticle.GenerateTime" @blur="finishEdit"
+                                @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
                             {{ selectedArticle.GenerateTime }}
@@ -472,10 +491,12 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">使用AI模型:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'AIProvider', 'AIProvider')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'AIProvider', 'AIProvider')">
                         <template v-if="editingKey === 'AIProvider'">
-                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.AIProvider"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="text" disabled="true" class="json-editor-input"
+                                v-model="selectedArticle.AIProvider" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             "{{ selectedArticle.AIProvider }}"
@@ -486,8 +507,8 @@
                     <span class="json-key">提示语:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'BuildStr', 'BuildStr')">
                         <template v-if="editingKey === 'BuildStr'">
-                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.BuildStr"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="text" disabled="true" class="json-editor-input"
+                                v-model="selectedArticle.BuildStr" @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
                             "{{ selectedArticle.BuildStr }}"
@@ -510,7 +531,7 @@
                     <span class="json-key">文章难度:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'Level', 'Level')">
                         <template v-if="editingKey === 'Level'">
-                            <input type="text"  disabled="true" class="json-editor-input" v-model="selectedArticle.Level"
+                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.Level"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -520,10 +541,12 @@
                 </div>
                 <div class="json-node">
                     <span class="json-key">文章类型:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleStyle', 'ArticleStyle')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'ArticleStyle', 'ArticleStyle')">
                         <template v-if="editingKey === 'ArticleStyle'">
-                            <input type="text"  disabled="true" class="json-editor-input" v-model="selectedArticle.ArticleStyle"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="text" disabled="true" class="json-editor-input"
+                                v-model="selectedArticle.ArticleStyle" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             "{{ selectedArticle.ArticleStyle }}"
@@ -534,18 +557,20 @@
                     <span class="json-key">用户阅读数:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'ReadCount', 'ReadCount')">
                         <template v-if="editingKey === 'ReadCount'">
-                            <input type="number"  disabled="true" class="json-editor-input" v-model.number="selectedArticle.ReadCount"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="number" disabled="true" class="json-editor-input"
+                                v-model.number="selectedArticle.ReadCount" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             {{ selectedArticle.ReadCount }}
                         </template>
                     </span>
                 </div>
-                
+
                 <div class="json-node">
                     <span class="json-key">JSON结果:</span>
-                    <span class="json-string editable" @dblclick="editValue(selectedArticle, 'JSONString', 'JSONString')">
+                    <span class="json-string editable"
+                        @dblclick="editValue(selectedArticle, 'JSONString', 'JSONString')">
                         <template v-if="editingKey === 'JSONString'">
                             <textarea class="json-editor-input" disabled="true" v-model="selectedArticle.JSONString"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus></textarea>
@@ -559,8 +584,9 @@
                     <span class="json-key">是否删除:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'Flag', 'Flag')">
                         <template v-if="editingKey === 'Flag'">
-                            <input type="number"  disabled="true" class="json-editor-input" v-model.number="selectedArticle.Flag"
-                                @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
+                            <input type="number" disabled="true" class="json-editor-input"
+                                v-model.number="selectedArticle.Flag" @blur="finishEdit" @keyup.enter="finishEdit"
+                                v-focus>
                         </template>
                         <template v-else>
                             {{ selectedArticle.Flag }}
@@ -573,8 +599,10 @@
                 </div>
             </div>
         </div>
-    </div>
+        <div class="toast" :class="{ show: showToastFlag, [toastType]: showToastFlag }">{{ toastMessage }}</div>
 
+    </div>
+    
     <script>
         new Vue({
             el: '#app',
@@ -584,7 +612,10 @@
                 selectedArticle: null,
                 isSearchLoading: false,
                 isDetailLoading: false,
-                editingKey: null
+                editingKey: null,
+                toastMessage: '',
+                toastType: 'info',
+                showToastFlag: false
             },
             methods: {
                 searchArticles() {
@@ -631,15 +662,17 @@
                 saveArticle() {
                     if (!this.selectedArticle) return;
                     this.isDetailLoading = true;
-                    this.selectedArticle.Source="web";
+                    this.selectedArticle.Source = "web";
                     $.ajax({
                         url: 'api/UpdateYJBDCArticle',
                         method: 'POST',
                         data: this.selectedArticle,
                         success: () => {
                             this.isDetailLoading = false;
-                            alert('保存成功');
+                            this.showToast('保存成功', 'success');
+                            // 重新加载文章列表和当前选中的文章
                             this.searchArticles();
+                            this.selectArticle(this.selectedArticle);
                         },
                         error: () => {
                             this.isDetailLoading = false;
@@ -649,7 +682,17 @@
                 },
                 cancelEdit() {
                     this.selectedArticle = null;
-                }
+                },
+                showToast(message, type = 'info') {
+                    this.toastMessage = message;
+                    this.toastType = type;
+                    this.showToastFlag = true;
+
+                    // 自动隐藏
+                    setTimeout(() => {
+                        this.showToastFlag = false;
+                    }, 3000);
+                },
             },
             directives: {
                 focus: {

src/api/yjbdc/yjbdcController.js

@@ -409,18 +409,12 @@ export async function GetYJBDCArticleList(ctx) {
         result = await yjbdc.GetYJBDCArticleList(param);
         
         let menuConfig=constantClass.GetYJBDCGenerateConfig();
-
-        
         for(let i=0;i<result.length;i++){
             let item=result[i];
             item.CreateTime=moment(item.CreateTime).format("YYYY年MM月DD日 HH:mm");
             //debugger;
-            if (param.ID==0){
-                item.LevelStr=menuConfig.Level[item.Level].Name;
-            }
+            item.LevelStr=menuConfig.Level[item.Level].Name;
         }
-        
-        
         globalCache.set(url, result, config.BufferMemoryTime);
         console.log("缓存"+config.BufferMemoryTime+"秒");
     }
@@ -493,6 +487,8 @@ export async function UpdateYJBDCArticle(ctx) {
     if (param.ID>0 && param.UserID<12 && param.Source=="web"){
         const url='GetYJBDCArticleList?IsChoiceness=0&UserID='+param.UserID+"&ID=0";
         globalCache.delete(url);
+        const url2='GetYJBDCArticleList?IsChoiceness=0&UserID='+param.UserID+"&ID="+param.ID;
+        globalCache.delete(url2);
         delete param.LevelStr;
         delete param.CreateTime;
         delete param.CreateTime;
@@ -662,11 +658,12 @@ export async function GeneratePDF(ctx) {
 
         // 7. 黑线
         const articleEndY = doc.y;
-        // 计算单词列表的实际结束Y坐标
-        const wordListEndY = pixelToPt(364) + (Math.min(words.length, 10) * pixelToPt(70));
+        const wordListEndY = doc.y; // 假设单词列表的Y坐标
         const maxY = Math.max(articleEndY, wordListEndY);
-
-        doc.rect(pixelToPt(120), maxY + pixelToPt(41), 
+        if (doc && typeof doc.line === 'function') {
+            doc.line(20, maxY, 200, maxY);
+        }
+        doc.rect(pixelToPt(120), articleEndY + pixelToPt(41), 
                 pixelToPt(1860), pixelToPt(10))
            .fill('black');
 
@@ -693,7 +690,7 @@ export async function GeneratePDF(ctx) {
             for (const i of firstRowQuestions) {
                 if (i < questions.length && questions[i]) {
                     const currentX = questionXPositions[i];
-                    const currentY = maxY + pixelToPt(130); // 所有第一行问题的起始Y坐标相同
+                    const currentY = articleEndY + pixelToPt(130); // 所有第一行问题的起始Y坐标相同
                     
                     // 渲染问题文本
                     doc.font('Helvetica-Bold')
@@ -867,7 +864,7 @@ export async function GeneratePDF(ctx) {
             // 问题5保持原位置不变
             if (questions.length > 4 && questions[4]) {
                 const currentX = questionXPositions[4];
-                const currentY = maxY + pixelToPt(130);
+                const currentY = articleEndY + pixelToPt(130);
                 
                 doc.font('Helvetica-Bold')
                    .fontSize(pixelToPt(36))