chengjie месяцев назад: 6
Родитель
Сommit
155b0d5846
2 измененных файлов с 6 добавлено и 8 удалено
  1. 6 2
      src/api/yjbdc/yjbdcController.js
  2. 0 6
      src/util/constant/index.js

+ 6 - 2
src/api/yjbdc/yjbdcController.js

@@ -409,11 +409,15 @@ export async function GetYJBDCArticleList(ctx) {
409
         result = await yjbdc.GetYJBDCArticleList(param);
409
         result = await yjbdc.GetYJBDCArticleList(param);
410
         
410
         
411
         let menuConfig=constantClass.GetYJBDCGenerateConfig();
411
         let menuConfig=constantClass.GetYJBDCGenerateConfig();
412
+
413
+        
412
         for(let i=0;i<result.length;i++){
414
         for(let i=0;i<result.length;i++){
413
             let item=result[i];
415
             let item=result[i];
414
             item.CreateTime=moment(item.CreateTime).format("YYYY年MM月DD日 HH:mm");
416
             item.CreateTime=moment(item.CreateTime).format("YYYY年MM月DD日 HH:mm");
415
             //debugger;
417
             //debugger;
416
-            item.LevelStr=menuConfig.Level[item.Level].Name;
418
+            if (param.ID==0){
419
+                item.LevelStr=menuConfig.Level[item.Level].Name;
420
+            }
417
         }
421
         }
418
         
422
         
419
         
423
         
@@ -661,7 +665,7 @@ export async function GeneratePDF(ctx) {
661
         // 计算单词列表的实际结束Y坐标
665
         // 计算单词列表的实际结束Y坐标
662
         const wordListEndY = pixelToPt(364) + (Math.min(words.length, 10) * pixelToPt(70));
666
         const wordListEndY = pixelToPt(364) + (Math.min(words.length, 10) * pixelToPt(70));
663
         const maxY = Math.max(articleEndY, wordListEndY);
667
         const maxY = Math.max(articleEndY, wordListEndY);
664
-        
668
+
665
         doc.rect(pixelToPt(120), maxY + pixelToPt(41), 
669
         doc.rect(pixelToPt(120), maxY + pixelToPt(41), 
666
                 pixelToPt(1860), pixelToPt(10))
670
                 pixelToPt(1860), pixelToPt(10))
667
            .fill('black');
671
            .fill('black');

+ 0 - 6
src/util/constant/index.js

@@ -5,18 +5,12 @@ export default {
5
     GetYJBDCGenerateConfig:()=>{
5
     GetYJBDCGenerateConfig:()=>{
6
         let result = {};
6
         let result = {};
7
         result.Level=[
7
         result.Level=[
8
-            // {Name:"小学",CSS:"Selected",English:"Primary school vocabulary size",Content:"生成难度是CEFR语言能力评估框架的A2标准"},
9
-            // {Name:"初中",CSS:"",English:"Junior high school vocabulary size",Content:"生成难度是CEFR语言能力评估框架的B1标准"},
10
-            // {Name:"高中",CSS:"",English:"High school vocabulary size",Content:"生成难度是CEFR语言能力评估框架的B2标准"},
11
-            // {Name:"大学",CSS:"",English:"College vocabulary size",Content:"生成难度是CEFR语言能力评估框架的C1标准"}
12
-
13
             {Name:"A1",CSS:"Selected",English:"A1",Content:"初学,入门理解\n适用小学"},
8
             {Name:"A1",CSS:"Selected",English:"A1",Content:"初学,入门理解\n适用小学"},
14
             {Name:"A2",CSS:"",English:"A2",Content:"基础,简单沟通\n适用小升初"},
9
             {Name:"A2",CSS:"",English:"A2",Content:"基础,简单沟通\n适用小升初"},
15
             {Name:"B1",CSS:"",English:"B1",Content:"中级,日常应对\n适用中考"},
10
             {Name:"B1",CSS:"",English:"B1",Content:"中级,日常应对\n适用中考"},
16
             {Name:"B2",CSS:"",English:"B2",Content:"较高,流利交流\n适用高考"},
11
             {Name:"B2",CSS:"",English:"B2",Content:"较高,流利交流\n适用高考"},
17
             {Name:"C1",CSS:"",English:"C1",Content:"高级,运用自如\n适用大学"},
12
             {Name:"C1",CSS:"",English:"C1",Content:"高级,运用自如\n适用大学"},
18
             {Name:"C2",CSS:"",English:"C2",Content:"精通,母语水平\n适用留学"},
13
             {Name:"C2",CSS:"",English:"C2",Content:"精通,母语水平\n适用留学"},
19
-
20
         ];            
14
         ];            
21
         result.ArticleStyle=[
15
         result.ArticleStyle=[
22
             {Name:"童话",CSS:"Selected",English:"Fairy Tales",Content:"充满神奇和想象的故事,里面可能有会说话的动物、美丽的人、勇敢的人,还有魔法和冒险"},
16
             {Name:"童话",CSS:"Selected",English:"Fairy Tales",Content:"充满神奇和想象的故事,里面可能有会说话的动物、美丽的人、勇敢的人,还有魔法和冒险"},