0

public/mg/yjbdc_articles.html

@@ -348,10 +348,13 @@
                             创建时间: {{ article.CreateTime }}
                         </div>
                         <div style="font-size: 12px; color: #666;">
-                            标题: {{ article.ArticleStart }}
+                            标题: {{ article.ArticleTitle }}
                         </div>
                         <div style="font-size: 12px; color: #666;">
-                            字数: {{ article.words }}
+                            单词表: {{ article.Words }}
+                        </div>
+                        <div style="font-size: 12px; color: #666;">
+                            是否精选: {{ article.IsFine=="1"?"是":"" }}
                         </div>
                     </div>
                     <div v-else-if="articles && articles.length === 0" 
@@ -434,7 +437,7 @@
                     <span class="json-key">英语文章:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleStart', 'ArticleStart')">
                         <template v-if="editingKey === 'ArticleStart'">
-                            <input type="text" class="json-editor-input" v-model="selectedArticle.ArticleStart"
+                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.ArticleStart"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -447,7 +450,7 @@
                     <span class="json-key">用户ID:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'UserID', 'UserID')">
                         <template v-if="editingKey === 'UserID'">
-                            <input type="number" class="json-editor-input" v-model.number="selectedArticle.UserID"
+                            <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>
@@ -459,7 +462,7 @@
                     <span class="json-key">生成秒数:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'GenerateTime', 'GenerateTime')">
                         <template v-if="editingKey === 'GenerateTime'">
-                            <input type="number" class="json-editor-input" v-model.number="selectedArticle.GenerateTime"
+                            <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>
@@ -471,7 +474,7 @@
                     <span class="json-key">使用AI模型:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'AIProvider', 'AIProvider')">
                         <template v-if="editingKey === 'AIProvider'">
-                            <input type="text" class="json-editor-input" v-model="selectedArticle.AIProvider"
+                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.AIProvider"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -483,7 +486,7 @@
                     <span class="json-key">提示语:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'BuildStr', 'BuildStr')">
                         <template v-if="editingKey === 'BuildStr'">
-                            <input type="text" class="json-editor-input" v-model="selectedArticle.BuildStr"
+                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.BuildStr"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -495,7 +498,7 @@
                     <span class="json-key">单词表:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'Words', 'Words')">
                         <template v-if="editingKey === 'Words'">
-                            <input type="text" class="json-editor-input" v-model="selectedArticle.Words"
+                            <input type="text" disabled="true" class="json-editor-input" v-model="selectedArticle.Words"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -507,7 +510,7 @@
                     <span class="json-key">文章难度:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'Level', 'Level')">
                         <template v-if="editingKey === 'Level'">
-                            <input type="text" 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>
@@ -519,7 +522,7 @@
                     <span class="json-key">文章类型:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'ArticleStyle', 'ArticleStyle')">
                         <template v-if="editingKey === 'ArticleStyle'">
-                            <input type="text" class="json-editor-input" v-model="selectedArticle.ArticleStyle"
+                            <input type="text"  disabled="true" class="json-editor-input" v-model="selectedArticle.ArticleStyle"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus>
                         </template>
                         <template v-else>
@@ -531,7 +534,7 @@
                     <span class="json-key">用户阅读数:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'ReadCount', 'ReadCount')">
                         <template v-if="editingKey === 'ReadCount'">
-                            <input type="number" class="json-editor-input" v-model.number="selectedArticle.ReadCount"
+                            <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>
@@ -544,7 +547,7 @@
                     <span class="json-key">JSON结果:</span>
                     <span class="json-string editable" @dblclick="editValue(selectedArticle, 'JSONString', 'JSONString')">
                         <template v-if="editingKey === 'JSONString'">
-                            <textarea class="json-editor-input" v-model="selectedArticle.JSONString"
+                            <textarea class="json-editor-input" disabled="true" v-model="selectedArticle.JSONString"
                                 @blur="finishEdit" @keyup.enter="finishEdit" v-focus></textarea>
                         </template>
                         <template v-else>
@@ -556,7 +559,7 @@
                     <span class="json-key">是否删除:</span>
                     <span class="json-number editable" @dblclick="editValue(selectedArticle, 'Flag', 'Flag')">
                         <template v-if="editingKey === 'Flag'">
-                            <input type="number" class="json-editor-input" v-model.number="selectedArticle.Flag"
+                            <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>
@@ -628,6 +631,7 @@
                 saveArticle() {
                     if (!this.selectedArticle) return;
                     this.isDetailLoading = true;
+                    this.selectedArticle.Source="web";
                     $.ajax({
                         url: 'api/UpdateYJBDCArticle',
                         method: 'POST',
@@ -635,6 +639,7 @@
                         success: () => {
                             this.isDetailLoading = false;
                             alert('保存成功');
+                            this.searchArticles();
                         },
                         error: () => {
                             this.isDetailLoading = false;

src/api/yjbdc/routes.js

@@ -6,6 +6,8 @@ const router = new Router();
 router.post('/api/YJBDCLogin',yjbdcController.YJBDCLogin);
 router.post('/api/OCRImageData',yjbdcController.OCRImageData);
 router.post('/api/GenerateArticle',yjbdcController.GenerateArticle);
+router.post('/api/UpdateYJBDCArticle',yjbdcController.UpdateYJBDCArticle);
+
 router.get('/api/GetYJBDCGenerateConfig',yjbdcController.GetYJBDCGenerateConfig);
 router.post('/api/GeneratePDF',yjbdcController.GeneratePDF);
 router.get('/api/GetYJBDCArticleList',yjbdcController.GetYJBDCArticleList);

src/api/yjbdc/yjbdcController.js

@@ -198,11 +198,18 @@ export async function GenerateArticle(ctx) {
             }
 
             level=menuConfig.Level[Number(params.Level)].Name;
-            console.log("Level:"+level);
+
+            let articleStyleContent="";
+            for(let i=0;i<menuConfig.ArticleStyle.length;i++){
+                if (params.ArticleStyle==menuConfig.ArticleStyle[i].Name){
+                    articleStyleContent=menuConfig.ArticleStyle[i].Content;
+                }
+            }
+            //console.log("Level:"+level);
             let content={
-                "instruction": "用单词("+words+")生成"+level+"难度童话故事。要求：",
+                "instruction": "用单词("+words+")生成"+level+"难度童话故事。",
                 "requirements": [
-                    "200-300词，要求："+articleStyle+"（[类型]）",
+                    "200-300词，要求："+articleStyle+"（"+articleStyleContent+"）",
                     "每句分数组提供中英双语",
                     "所有单词至少出现一次（允许变形）",
                     "生成5道四选一阅读题（含答案）"
@@ -475,6 +482,22 @@ export async function DeleteYJBDCArticleList(ctx) {
     ctx.body = {"errcode": 10000};
 }
 
+export async function UpdateYJBDCArticle(ctx) {
+    const param = ctx.request.body;
+    
+    if (param.ID>0 && param.UserID<12 && param.Source=="web"){
+        const url='GetYJBDCArticleList?IsChoiceness=0&UserID='+param.UserID+"&ID=0";
+        globalCache.delete(url);
+        delete param.LevelStr;
+        delete param.CreateTime;
+        delete param.CreateTime;
+        
+        await yjbdc.UpdateYJBDCArticle(param);
+    }
+    
+    ctx.body = {"errcode": 10000};
+}
+
 //更新阅读数
 export async function UpdateYJBDCArticleReadCount(ctx) {
     const param = {

src/model/yjbdc.js

@@ -120,7 +120,7 @@ class YJBDC {
                 return await query(sql, null);
             }
             else{
-                let sql = "SELECT `ID`,`UserID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`ArticleStart`,`ReadCount`,`Flag` FROM YJBDC_Articles WHERE UserID=? order by ID desc;";
+                let sql = "SELECT `ID`,`UserID`,`CreateTime`,`Words`,`Level`,`ArticleStyle`,`IsFine`,`ArticleTitle`,`ArticleStart`,`ReadCount`,`Flag` FROM YJBDC_Articles WHERE UserID=? order by ID desc;";
                 return await query(sql, [obj.UserID]);
             }
         } catch (error) {
@@ -135,10 +135,16 @@ class YJBDC {
                 const sql = "UPDATE YJBDC_Articles SET Flag=-1 WHERE ID=? and UserID=?";
                 return await query(sql, [obj.ID,obj.UserID]);
             }
+            else if (obj.Source=="web"){
+                delete obj.Source;
+                const sql = "UPDATE YJBDC_Articles SET ? WHERE ID=?";
+                return await query(sql, [obj,obj.ID]);
+            }
             else if (obj.ReadCount==1){
                 const sql = "UPDATE YJBDC_Articles SET ReadCount=ReadCount+1 WHERE ID=? and UserID=?";
                 return await query(sql, [obj.ID,obj.UserID]);
             }
+            
         } catch (error) {
             console.error('更新信息失败:', error);
             throw error;