lsc 8 months ago
parent
commit
f9e9baf672

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.55481b6d8b8dc3eab7c1c6cb179895cd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.ee476e38463461edca63.js></script><script type=text/javascript src=./static/js/app.683014a5bd72f920270d.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.4a096db5679f1526fc20f8b8a5859612.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.ee476e38463461edca63.js></script><script type=text/javascript src=./static/js/app.3877f657f87972362d76.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.4a096db5679f1526fc20f8b8a5859612.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.4a096db5679f1526fc20f8b8a5859612.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.3877f657f87972362d76.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.3877f657f87972362d76.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 21 - 21
src/components/pages/aiAddCourse/addCourse.vue

@@ -187,7 +187,7 @@
                           </div>
                         </div>
                       </div>
-                      <div class="info_box_t" v-if="templatePan.includes(templateid)">
+                      <!-- <div class="info_box_t" v-if="templatePan.includes(templateid)">
                         <div class="info_box_t_box">
                           <span>课程节数:</span>
                           <input type="text" placeholder="请输入课程节数" class="binfo_input" v-model="courseJie" @change="numberPanJie"/>
@@ -198,7 +198,7 @@
                           <input type="text" placeholder="请输入课程节数" class="binfo_input" v-model="courseTime"  @change="numberPanTime"/>
                           <span>min</span>
                         </div>
-                      </div>
+                      </div> -->
                     </div>
                     <div class="right_first" v-loading="imageloading2">
                       <!-- <div class="ai_box">
@@ -882,15 +882,16 @@
                 </div>
               </div>
             </div>
-            <div class="whiteBg" style="background: #fff; margin: 0 0 10px;padding: 0 0 15px;" v-loading="textLoading" element-loading-text="小可正在努力生成中,请稍等..." v-if="((!yiKeTemplateArray.includes(templateid)) && courseTextBool) || (yiKeTemplateArray.includes(templateid))">
+            <div class="whiteBg" style="background: #fff; margin: 0 0 10px;padding: 0 0 15px;" v-loading="textLoading" element-loading-text="小可正在努力生成中,请稍等..." v-if="(!isuseT && (!yiKeTemplateArray.includes(templateid))) || (isuseT && (!yiKeTemplateArray.includes(templateid)) && courseTextBool) || (yiKeTemplateArray.includes(templateid))">
               <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
-                <div class="c_info_title">
+                <div class="c_info_title" style="margin: 0 20px 0 20px;">
                   课程简要描述
                   <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom">
-                    <button class="c_pub_button_confirm" style="margin: 0 20px 0 auto;"
+                    <button class="c_pub_button_confirm" style="margin: 0 0 0 auto;"
                       @contextmenu.prevent="openAiDialog(1, 'aiDetail',1)"
                       @click="openAiDialog(2, 'aiDetail',1)">AI优化</button>
-                                      </el-tooltip>
+                  </el-tooltip>
+                  <button class="c_pub_button_confirm" @click="clickGenTT2" style="margin: 0 0 0 5px;">生成概况和目标</button>
                 </div>
                 <div style="width: 100%; padding: 0px 20px; box-sizing: border-box">
                   <div style="width: calc(100%);" class='op_task_box'>
@@ -913,7 +914,7 @@
                 </div>
               </div>
             </div>
-            <div class="whiteBg" style="background: #fff; margin: 0 0 10px;padding: 0 0 15px;" v-loading="targetTextLoading2" element-loading-text="小可正在努力生成中,请稍等..." v-if="(!yiKeTemplateArray.includes(templateid)) && courseTextBool">
+            <div class="whiteBg" style="background: #fff; margin: 0 0 10px;padding: 0 0 15px;" v-loading="targetTextLoading2" element-loading-text="小可正在努力生成中,请稍等..." v-if="(!isuseT && (!yiKeTemplateArray.includes(templateid))) || (isuseT && (!yiKeTemplateArray.includes(templateid)) && courseTextBool)">
               <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
                 <div class="c_info_title">
                   课程目标
@@ -1441,10 +1442,11 @@
               <button class="c_pub_button_return pub_btn_last_img" v-if="steps > 1 && steps != 5" @click="lastSteps">
                 {{ steps == 4 ? "返回课程" : "上一步" }}
               </button>
-              <button class="c_pub_button_confirm" v-if="!isOutline && !courseTextBool && (!yiKeTemplateArray.includes(templateid))" @click="clickGenTT2">
+              <button class="c_pub_button_confirm" v-if="isuseT && !isOutline && !courseTextBool && (!yiKeTemplateArray.includes(templateid))" @click="clickGenTT2">
                 {{isuseT ? "重新生成概况和目标" : "生成概况和目标"}}
               </button>
-              <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom"  v-if="((isuseT || courseTextBool) && (!yiKeTemplateArray.includes(templateid))) && steps < 4">
+              <!-- ((isuseT || courseTextBool) && (!yiKeTemplateArray.includes(templateid))) &&  -->
+              <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom"  v-if="steps < 4">
                 <button class="c_pub_button_confirm" @click="nextSteps(2)"
                   @contextmenu.prevent="nextSteps(1)" v-if="templateid != '4480d65a-1e48-11ef-bee5-005056b86db5' && templateid != 'cf5722a4-401b-11ef-b873-005056b86dc3'" :class="{
                     pub_btn_next_img: steps != 3,
@@ -15067,6 +15069,8 @@ export default {
 let txt = (!this.yiKeTemplateArray.includes(this.templateid)) ? '任务设计、评价标准和教学目标(markdown格式)' : '任务设计和评价标准'
 let courseText = this.courseText ? this.courseText : this.teacherCourseText
 let target = this.targetCourseText2 ? this.targetCourseText2 : this.targetcoursetext
+// ${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
+// ${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
         let message = `NOTICE
 Role: 你是创建课程的老师,可以利用file_search的方式完整的去分析文件内容(注:如果文件内容里面不包含需要检索的内容,就不引用文件内容),并生成需要的JSON数据。
 Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
@@ -15083,8 +15087,6 @@ ${courseText ? '课程简要描述:' + courseText : ''}
 ${sub.length ? '学科:' + sub.join(",") : ''}
 ${mclass.length ? '面向年级:' + mclass.join(",") : ''}
 ${target ? '课程目标:' + target.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
-${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
-${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
 detail输出不要输出成json,文本或者markdown都可以
 
 # Format example
@@ -15097,6 +15099,8 @@ detail输出不要输出成json,文本或者markdown都可以
       } else if (this.aitype == "aiOutline2") {
         this.loading = true
         let target = this.targetCourseText2 ? this.targetCourseText2 : this.targetcoursetext
+//         ${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
+// ${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
         let message = `NOTICE
 Role: 你是创建课程的老师,可以利用file_search的方式完整的去分析文件内容(注:如果文件内容里面不包含需要检索的内容,就不引用文件内容),并生成需要的JSON数据。
 Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
@@ -15113,8 +15117,6 @@ ${this.courseText ? '课程简要描述:' + this.courseText : ''}
 ${sub.length ? '学科:' + sub.join(",") : ''}
 ${mclass.length ? '面向年级:' + mclass.join(",") : ''}
 ${target ? '课程目标:' + target.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
-${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
-${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
 
 # Format example
 [{"task": "任务1的名字"}, {"task": "任务2的名字"}, {"task": "任务2的名字"}, {"task": "任务n的名字"}]`
@@ -15361,6 +15363,8 @@ ${msg}。相关信息内容至少要有300tokens,可以是markdown格式
 // 补充资料:${url.join(",")}
 // 补充描述:${this.courseText2} ##补充参考资料和
       let target = this.targetCourseText2 ? this.targetCourseText2 : this.targetcoursetext
+//       ${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
+// ${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
       let msg = `NOTICE
 Role: 你是创建课程的老师,内容以markdown形式出现(注:如果文件内容里面不包含需要检索的内容,就不引用文件内容)
 Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
@@ -15372,8 +15376,6 @@ Instruction: Based on the context, follow "Format example", write content.
 课程名字:${this.courseName}
 ${sub.length ? '学科:' + sub.join(",") : ''}
 ${mclass.length ? '面向年级:' + mclass.join(",") : ''}
-${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
-${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
 ${(this.mode == 1 && (!this.yiKeTemplateArray.includes(this.templateid)) && this.teacherCourseText) ? '提取教案摘要:'+this.teacherCourseText : ''}
 ${(this.mode == 1 && (!this.yiKeTemplateArray.includes(this.templateid)) && target) ? '提取教案目标:'+target : ''}
 ${this.courseText && this.aiCallback == 2 ? '参考内容:'+this.courseText : ''}
@@ -18798,7 +18800,8 @@ ${this.aitype == 'aiCpote4' ? '## 目标层\n'+this.cpote['cpote3'] : ''}`
           }
         }
       }
-
+      // ${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
+      // ${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
       let messages = `NOTICE
 Role: 你是创建课程的老师,内容以markdown形式出现(注:如果文件内容里面不包含需要检索的内容,就不引用文件内容)。
 Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
@@ -18810,8 +18813,6 @@ Instruction: Based on the context, follow "Format example", write content.
 课程名字:${this.courseName}
 ${sub.length ? '学科:' + sub.join(",") : ''}
 ${mclass.length ? '面向年级:' + mclass.join(",") : ''}
-${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
-${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
 ${this.teacherCourseText && this.aiCallback == 2 ? '参考内容:'+this.teacherCourseText : ''}
 
 ## 要求
@@ -18963,7 +18964,8 @@ ${this.teacherCourseText && this.aiCallback == 2 ? '注意,优化原有的<参
           }
         }
       }
-
+      // ${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
+      // ${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
       let messages = `NOTICE
 Role: 你是创建课程的老师,内容以markdown形式出现(注:如果文件内容里面不包含需要检索的内容,就不引用文件内容)。
 Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
@@ -18975,8 +18977,6 @@ Instruction: Based on the context, follow "Format example", write content.
 课程名字:${this.courseName}
 ${sub.length ? '学科:' + sub.join(",") : ''}
 ${mclass.length ? '面向年级:' + mclass.join(",") : ''}
-${this.templatePan.includes(this.templateid) ? '课程节数:'+this.courseJie+'节' : ''}
-${this.templatePan.includes(this.templateid) ? '课程时长:'+this.courseTime+'min' : ''}
 ${this.targetCourseText && this.aiCallback == 2 ? '参考内容:'+this.targetCourseText : ''}
 
 ## 要求

+ 59 - 8
src/components/pages/aiAddCourse/aiCreateDialog.vue

@@ -134,6 +134,7 @@ export default {
                             w: "90%",
                             color: '17094F',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -147,6 +148,7 @@ export default {
                                 color: '17094F',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -155,6 +157,7 @@ export default {
                                 w: "90%",
                                 color: "222222",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -163,7 +166,8 @@ export default {
                                 w: "60%",
                                 color: "444444",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         }
                     ],
@@ -175,6 +179,7 @@ export default {
                             w: "90%",
                             color: '17094F',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     }
@@ -189,6 +194,7 @@ export default {
                             w: "90%",
                             color: '052B37',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -202,6 +208,7 @@ export default {
                                 color: '052B37',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -210,6 +217,7 @@ export default {
                                 w: "90%",
                                 color: "222222",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -218,7 +226,8 @@ export default {
                                 w: "60%",
                                 color: "444444",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         }
                     ],
@@ -230,6 +239,7 @@ export default {
                             w: "90%",
                             color: '052B37',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     }
@@ -244,6 +254,7 @@ export default {
                             w: "90%",
                             color: '1D5869',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -257,6 +268,7 @@ export default {
                                 color: '1D5869',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -265,6 +277,7 @@ export default {
                                 w: "90%",
                                 color: "222222",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -273,7 +286,8 @@ export default {
                                 w: "60%",
                                 color: "444444",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         }
                     ],
@@ -285,6 +299,7 @@ export default {
                             w: "90%",
                             color: '1D5869',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     }
@@ -299,6 +314,7 @@ export default {
                             w: "90%",
                             color: '372213',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -312,6 +328,7 @@ export default {
                                 color: '372213',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -320,6 +337,7 @@ export default {
                                 w: "90%",
                                 color: "222222",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -328,7 +346,8 @@ export default {
                                 w: "60%",
                                 color: "444444",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         }
                     ],
@@ -340,6 +359,7 @@ export default {
                             w: "90%",
                             color: '372213',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -355,6 +375,7 @@ export default {
                             w: "90%",
                             color: '674D40',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -368,6 +389,7 @@ export default {
                                 color: '674D40',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -376,6 +398,7 @@ export default {
                                 w: "90%",
                                 color: "222222",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -384,7 +407,8 @@ export default {
                                 w: "60%",
                                 color: "444444",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         }
                     ],
@@ -396,6 +420,7 @@ export default {
                             w: "90%",
                             color: '674D40',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -411,6 +436,7 @@ export default {
                             bold: true,
                             color: 'EA7A93',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -424,6 +450,7 @@ export default {
                                 color: '4F73DA',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -432,6 +459,7 @@ export default {
                                 w: "90%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             content: {
@@ -440,7 +468,8 @@ export default {
                                 w: "60%",
                                 color: "333333",
                                 fontSize: 18, // 字号
-                                align: "center",
+                                fontFace: '黑体',
+                                align: "left",
                             }
                         },//内容页1
                         {
@@ -452,6 +481,7 @@ export default {
                                 color: 'ffffff',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             subTitle: {
@@ -460,6 +490,7 @@ export default {
                                 w: "30%",
                                 color: "ffffff",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
@@ -468,6 +499,7 @@ export default {
                                 w: "45%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             square: {
@@ -494,6 +526,7 @@ export default {
                                 color: '4F73DA',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             subTitle: {
@@ -502,6 +535,7 @@ export default {
                                 w: "60%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
@@ -510,6 +544,7 @@ export default {
                                 w: "60%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             image: {
@@ -532,6 +567,7 @@ export default {
                                 fill: { color: "4F73DA"},
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -540,6 +576,7 @@ export default {
                                 w: "80%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
@@ -548,6 +585,7 @@ export default {
                                 w: "80%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             image: {
@@ -569,6 +607,7 @@ export default {
                                 color: 'ffffff',
                                 bold: true,
                                 fontSize: 30, // 字号
+                                fontFace: '黑体',
                                 align: "right",
                                 fill: { color: "4F73DA"},
                                 margin: 10,
@@ -579,6 +618,7 @@ export default {
                                 w: "53%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
@@ -587,6 +627,7 @@ export default {
                                 w: "53%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             square: {
@@ -612,6 +653,7 @@ export default {
                                 fill: { color: "4F73DA"},
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
@@ -620,6 +662,7 @@ export default {
                                 w: "90%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
@@ -628,6 +671,7 @@ export default {
                                 w: "90%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             image: {
@@ -648,6 +692,7 @@ export default {
                                 color: '4F73DA',
                                 bold: true,
                                 fontSize: 35, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             subTitle: {
@@ -656,14 +701,16 @@ export default {
                                 w: "50%",
                                 color: "333333",
                                 fontSize: 20, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             content: {
                                 x: "45%", // 横坐标
-                                y: 3,
+                                y: 3.2,
                                 w: "50%",
                                 color: "333333",
                                 fontSize: 18, // 字号
+                                fontFace: '黑体',
                                 align: "left",
                             },
                             image: {
@@ -674,7 +721,7 @@ export default {
                                 sizing: "contain",
                                 path: require('../../../assets/icon/ppt/model6-7-2.png')
                             },
-                        },//内容页6
+                        },//内容页7
                     ],
                     imgEnd: {
                         img: require('../../../assets/icon/ppt/model6-1-2.png'),
@@ -684,6 +731,7 @@ export default {
                             w: "60%",
                             color: 'EA7A93',
                             fontSize: 38,
+                            fontFace: '黑体',
                             align: "center",
                         }
                     },
@@ -1093,6 +1141,9 @@ ${mclass.length ? "面向年级:" + mclass.join(",") : ""}
                 let tempResult3 = '';
                 if (typeof array[i].points == 'object') {
                     if (Array.isArray(array[i].points)) {
+                        for(var k = 0; k < array[i].points.length; k++){
+                            array[i].points[k] = '· '+array[i].points[k]
+                        }
                         tempResult3 = array[i].points.join('\n')
                     } else {
                         tempResult3 = JSON.stringify(array[i].points)

Some files were not shown because too many files changed in this diff