update

package-lock.json

@@ -21826,7 +21826,7 @@
         "script-loader": "^0.7.2",
         "semver": "^5.3.0",
         "shelljs": "^0.7.6",
-        "turndown": "*",
+        "turndown": "^7.2.0",
         "uglifyjs-webpack-plugin": "^1.1.1",
         "url-loader": "^0.5.9",
         "v-viewer": "^1.6.4",

src/components/pages/aiAddCourse/addCourse.vue

@@ -180,7 +180,7 @@
                           <!-- <el-switch v-model="isuseT" active-text="是否从已有教案生成"
                               style="justify-content: center; min-width: 175px"></el-switch> -->
                           <span>生成模式：</span>
-                          <el-radio-group v-model="isuseT" style="display: flex; align-items: center">
+                          <el-radio-group v-model="isuseT" style="display: flex; align-items: center" @change="changeIsuseT">
                             <div class="all_choose info_radio">
                               <el-radio :label="1">引导模式生成</el-radio>
                             </div>
@@ -954,7 +954,7 @@
                   <div class="inter_box" v-show="interPan">
                     <iframe allow="camera *; microphone *;display-capture;midi;encrypted-media;" :src="interUrl" frameborder="0" v-if="interFlash && chatid" class="interIframe"></iframe>
                   </div>
-                  <div style="width: calc(100%);height: 100%" class='op_task_box'>
+                  <div style="width: calc(100%);height: 100%" class='op_task_box' :class="{inter_Detailbox: !courseTextB && interPan}">
                     <textarea style="height: 500px" class="binfo_input binfo_textarea" cols v-model="courseText"
                       placeholder="请输入课程简要描述" v-if="courseTextB && interPan"></textarea>
                     <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="courseText"
@@ -7367,7 +7367,7 @@ export default {
       cankaoInfoData: [],
       fileSLoading: false,
       infoData2: [],
-      isuseT: 1,
+      isuseT: false,
       mode: 1,
       targetCourseText2: "",
       targetTextLoading2: false,
@@ -13682,7 +13682,7 @@ export default {
         console.log("这是新增课程");
         this.selectAllType();
         this.chatid = uuidv4();
-        this.courseTextB = false
+        // this.courseTextB = false
       } else {
         this.isOutline = true
         this.isOutline2 = true
@@ -13819,7 +13819,7 @@ export default {
                 this.xuanzeInfoData = JSON.parse(res.data[0][0].setting).xuanzeInfoData ? JSON.parse(res.data[0][0].setting).xuanzeInfoData : [];
                 this.pingjiaInfoData = JSON.parse(res.data[0][0].setting).pingjiaInfoData ? JSON.parse(res.data[0][0].setting).pingjiaInfoData : [];
                 this.infoData2 = JSON.parse(res.data[0][0].setting).infoData2 ? JSON.parse(res.data[0][0].setting).infoData2 : [];
-                this.isuseT = JSON.parse(res.data[0][0].setting).isuseT ? JSON.parse(res.data[0][0].setting).isuseT : JSON.parse(res.data[0][0].setting).isuseT === false ? false : 1;
+                this.isuseT = JSON.parse(res.data[0][0].setting).isuseT ? JSON.parse(res.data[0][0].setting).isuseT : JSON.parse(res.data[0][0].setting).isuseT === false ? false : false;
                 this.mode = JSON.parse(res.data[0][0].setting).mode ? JSON.parse(res.data[0][0].setting).mode : 1;
                 this.targetCourseText2 = JSON.parse(res.data[0][0].setting).targetCourseText2 ? JSON.parse(res.data[0][0].setting).targetCourseText2 : '';
                 this.chatid = JSON.parse(res.data[0][0].setting).chatid ? JSON.parse(res.data[0][0].setting).chatid : uuidv4();
@@ -13968,7 +13968,7 @@ export default {
                 this.xuanzeInfoData = JSON.parse(res.data[0][0].setting).xuanzeInfoData ? JSON.parse(res.data[0][0].setting).xuanzeInfoData : [];
                 this.pingjiaInfoData = JSON.parse(res.data[0][0].setting).pingjiaInfoData ? JSON.parse(res.data[0][0].setting).pingjiaInfoData : [];
                 this.infoData2 = JSON.parse(res.data[0][0].setting).infoData2 ? this.infoData2.length ? this.infoData2 : JSON.parse(res.data[0][0].setting).infoData2 : [...this.infoData2];
-                this.isuseT = JSON.parse(res.data[0][0].setting).isuseT ? JSON.parse(res.data[0][0].setting).isuseT : JSON.parse(res.data[0][0].setting).isuseT === false ? false : 1;
+                this.isuseT = JSON.parse(res.data[0][0].setting).isuseT ? JSON.parse(res.data[0][0].setting).isuseT : JSON.parse(res.data[0][0].setting).isuseT === false ? false : false;
                 this.mode = JSON.parse(res.data[0][0].setting).mode ? JSON.parse(res.data[0][0].setting).mode : 1;
                 this.targetCourseText2 = JSON.parse(res.data[0][0].setting).targetCourseText2 ? JSON.parse(res.data[0][0].setting).targetCourseText2 : '';
                 this.chatid = JSON.parse(res.data[0][0].setting).chatid ? JSON.parse(res.data[0][0].setting).chatid : uuidv4();
@@ -16062,6 +16062,17 @@ export default {
 
       this.courseTextBool = true
     },
+    changeIsuseT(){
+      if(this.isuseT == 1){
+        this.courseTextB = false
+      }else{
+        if(this.courseText){
+          this.courseTextB = false
+        }else{ 
+          this.courseTextB = true
+        }
+      }
+    },
     openInterPanSetting(){
       this.interSetting = !this.interSetting
       if(this.interSetting){
@@ -17373,7 +17384,7 @@ ${this.courseText && this.aiCallBack == 2 ? '注意，优化原有的<参考内
       // });
       this.isOutlineCancelToken = this.ajax.setCancelSource();
       let parm = {
-        assistant_id: '6063369f-289a-11ef-8bf4-12e77c4cb76b',
+        assistant_id: '6063369f-289a-11ef-8bf4-12e77c4cb76b',//
         message: [{"type":"text", "text":messages}],
         session_name: uuidv4(),
         userId: this.userid,
@@ -26961,8 +26972,47 @@ ol {
   min-width: calc(50%);
   min-height: 500px;
   margin-right: 10px;
+  border: 1px solid #c7c7c7;
+  border-radius: 0px 5px 5px 5px;
+  overflow: hidden;
+  position: relative;
+  box-sizing: border-box;
+}
+
+.inter_box::before{
+  content:'对话区';
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: block;
+  padding: 8px 10px;
+  background: #e0eafb;
+  color: #98a0ac;
+  font-size: 14px;
+  border-radius: 0 15px 15px 0;
+}
+
+.inter_Detailbox{
+  border: 1px solid #c7c7c7;
+  border-radius: 0px 5px 5px 5px;
+  overflow: hidden;
+  position: relative;
+  box-sizing: border-box;
+}
 
+.inter_Detailbox::before{
+  content:'编辑区';
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: block;
+  padding: 8px 10px;
+  background: #e0eafb;
+  color: #98a0ac;
+  font-size: 14px;
+  border-radius: 0 15px 15px 0;
 }
+
 .inter_box > iframe{
   width: 100%;
   height: 100%;

src/components/pages/aiAddCourse/aiBoxRight.vue

@@ -370,6 +370,26 @@ export default {
               this.array = _chatList;
               this.loading = false;
             } else {
+              let _uid = uuidv4()
+              let _chatList = [];
+              _chatList.push({
+                loading: false,
+                role: "",
+                content: '',
+                uid: _uid,
+                AI: "AI",
+                aiContent: '您好，我是您的创课助手小可，在创课中遇到什么问题，都可以与我对话~,我会尽量帮助您的',
+                oldContent: '您好，我是您的创课助手小可，在创课中遇到什么问题，都可以与我对话~,我会尽量帮助您的',
+                isShowSynchronization: false,
+                filename: "",
+                index: 0,
+                is_mind_map: false,
+                fileid: ""
+              });
+              this.array = _chatList;
+              if(this.courseId){
+                this.insertChat(_uid)
+              }
               //没有对话记录
               this.loading = false;
             }
@@ -535,6 +555,7 @@ export default {
 .dialog_content > div {
   display: flex;
   align-items: flex-start;
+  width: 100%;
 }
 
 .dialog_content + .dialog_content {
@@ -566,11 +587,11 @@ export default {
 .dialog_content > div .content {
   padding: 10px 10px;
   border-radius: 2px 8px 8px 8px;
-  width: 100%;
+  width: auto;
   word-break: break-word;
   box-sizing: border-box;
   /* white-space: pre-line; */
-  max-width: 100%;
+  max-width: calc(100% - 50px);
   background: #f6f9ff;
   overflow: hidden;
   margin: 0 10px;
@@ -580,6 +601,7 @@ export default {
   background: #3681fc;
   color: #fff;
   border-radius: 8px 2px 8px 8px;
+  margin-left: auto;
 }
 
 .ai_body_select {

src/components/pages/aiAddCourse/aiCreateDialog.vue

@@ -126,15 +126,16 @@ export default {
             //     { img: require('../../../assets/icon/ppt/model5-1.png'), img2: require('../../../assets/icon/ppt/model5-2.png'),color:'674D40' },
             // ],
             templateList: [
-                {
-                    img: require('../../../assets/icon/ppt/model1-1.png'),
+            {
+                    img: require('../../../assets/icon/ppt/model6-1.png'),
                     img1: {
-                        img: require('../../../assets/icon/ppt/model1-1.png'),
+                        img: require('../../../assets/icon/ppt/model6-1-2.png'),
                         setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '17094F',
+                            x: "35%",
+                            y: 2.3,
+                            w: "60%",
+                            bold: true,
+                            color: 'EA7A93',
                             fontSize: 38,
                             fontFace: '黑体',
                             align: "center",
@@ -142,12 +143,12 @@ export default {
                     },
                     img2: [
                         {
-                            img: require('../../../assets/icon/ppt/model1-2.png'),
+                            img:require('../../../assets/icon/ppt/model6-2.png'),
                             title: {
                                 x: "5%", // 横坐标
                                 y: 1.1,
                                 w: "90%",
-                                color: '17094F',
+                                color: '4F73DA',
                                 bold: true,
                                 fontSize: 35, // 字号
                                 fontFace: '黑体',
@@ -157,7 +158,7 @@ export default {
                                 x: "5%", // 横坐标
                                 y: 1.8,
                                 w: "90%",
-                                color: "222222",
+                                color: "333333",
                                 fontSize: 20, // 字号
                                 fontFace: '黑体',
                                 align: "center",
@@ -166,426 +167,124 @@ export default {
                                 x: "20%", // 横坐标
                                 y: 3.2,
                                 w: "60%",
-                                color: "444444",
+                                color: "333333",
                                 fontSize: 18, // 字号
                                 fontFace: '黑体',
                                 align: "left",
                             }
-                        }
-                    ],
-                    imgEnd: {
-                        img: require('../../../assets/icon/ppt/model1-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '17094F',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    }
-                },
-                {
-                    img: require('../../../assets/icon/ppt/model2-1.png'),
-                    img1: {
-                        img: require('../../../assets/icon/ppt/model2-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '052B37',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    img2: [
+                        },//内容页1
                         {
-                            img: require('../../../assets/icon/ppt/model2-2.png'),
+                            img: require('../../../assets/icon/ppt/model6-2.png'),
                             title: {
-                                x: "5%", // 横坐标
-                                y: 1.1,
-                                w: "90%",
-                                color: '052B37',
+                                x: "2.5%", // 横坐标
+                                y: 2.3,
+                                w: "30%",
+                                color: 'ffffff',
                                 bold: true,
                                 fontSize: 35, // 字号
                                 fontFace: '黑体',
-                                align: "center",
+                                align: "left",
                             },
                             subTitle: {
-                                x: "5%", // 横坐标
-                                y: 1.8,
-                                w: "90%",
-                                color: "222222",
+                                x: "2.5%", // 横坐标
+                                y: 3.1,
+                                w: "30%",
+                                color: "ffffff",
                                 fontSize: 20, // 字号
                                 fontFace: '黑体',
-                                align: "center",
+                                align: "left",
                             },
                             content: {
-                                x: "20%", // 横坐标
-                                y: 3.2,
-                                w: "60%",
-                                color: "444444",
+                                x: "45%", // 横坐标
+                                y: 2.8,
+                                w: "45%",
+                                color: "333333",
                                 fontSize: 18, // 字号
                                 fontFace: '黑体',
                                 align: "left",
+                            },
+                            square: {
+                                x: 0,
+                                y: 0,
+                                w: "35%",
+                                h: "100%",
+                                fill: { color: "4F73DA" }
+                            },
+                            square2: {
+                                x: "35%",
+                                y: 0,
+                                w: "2.5%",
+                                h: "100%",
+                                fill: { color: "C2CFEF" }
                             }
-                        }
-                    ],
-                    imgEnd: {
-                        img: require('../../../assets/icon/ppt/model2-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '052B37',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    }
-                },
-                {
-                    img: require('../../../assets/icon/ppt/model3-1.png'),
-                    img1: {
-                        img: require('../../../assets/icon/ppt/model3-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '1D5869',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    img2: [
+                        },//内容页2
                         {
-                            img: require('../../../assets/icon/ppt/model3-2.png'),
+                            img: require('../../../assets/icon/ppt/model6-2.png'),
                             title: {
                                 x: "5%", // 横坐标
-                                y: 1.1,
-                                w: "90%",
-                                color: '1D5869',
+                                y: 1,
+                                w: "60%",
+                                color: '4F73DA',
                                 bold: true,
                                 fontSize: 35, // 字号
                                 fontFace: '黑体',
-                                align: "center",
+                                align: "left",
                             },
                             subTitle: {
                                 x: "5%", // 横坐标
-                                y: 1.8,
-                                w: "90%",
-                                color: "222222",
+                                y: 1.7,
+                                w: "60%",
+                                color: "333333",
                                 fontSize: 20, // 字号
                                 fontFace: '黑体',
-                                align: "center",
+                                align: "left",
                             },
                             content: {
-                                x: "20%", // 横坐标
-                                y: 3.2,
+                                x: "5%", // 横坐标
+                                y: 2.5,
                                 w: "60%",
-                                color: "444444",
+                                color: "333333",
                                 fontSize: 18, // 字号
                                 fontFace: '黑体',
                                 align: "left",
-                            }
-                        }
-                    ],
-                    imgEnd: {
-                        img: require('../../../assets/icon/ppt/model3-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '1D5869',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    }
-                },
-                {
-                    img: require('../../../assets/icon/ppt/model4-1.png'),
-                    img1: {
-                        img: require('../../../assets/icon/ppt/model4-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '372213',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    img2: [
+                            },
+                            image: {
+                                x: "70%",
+                                y: "22%",
+                                w: "30%",
+                                h: "56%",
+                                sizing: "contain",
+                                path: require('../../../assets/icon/ppt/model6-3.png')
+                            },
+                        },//内容页3
                         {
-                            img: require('../../../assets/icon/ppt/model4-2.png'),
+                            img: require('../../../assets/icon/ppt/model6-2.png'),
                             title: {
-                                x: "5%", // 横坐标
-                                y: 1.1,
-                                w: "90%",
-                                color: '372213',
+                                x: "10%", // 横坐标
+                                y: "4%",
+                                h: 0.75,
+                                w: "80%",
+                                color: 'ffffff',
+                                fill: { color: "4F73DA"},
                                 bold: true,
                                 fontSize: 35, // 字号
                                 fontFace: '黑体',
                                 align: "center",
                             },
                             subTitle: {
-                                x: "5%", // 横坐标
-                                y: 1.8,
-                                w: "90%",
-                                color: "222222",
+                                x: "10%", // 横坐标
+                                y: 1.5,
+                                w: "80%",
+                                color: "333333",
                                 fontSize: 20, // 字号
                                 fontFace: '黑体',
-                                align: "center",
+                                align: "left",
                             },
                             content: {
-                                x: "20%", // 横坐标
-                                y: 3.2,
-                                w: "60%",
-                                color: "444444",
-                                fontSize: 18, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            }
-                        }
-                    ],
-                    imgEnd: {
-                        img: require('../../../assets/icon/ppt/model4-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '372213',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    color: '372213'
-                },
-                {
-                    img: require('../../../assets/icon/ppt/model5-1.png'),
-                    img1: {
-                        img: require('../../../assets/icon/ppt/model5-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '674D40',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    img2: [
-                        {
-                            img: require('../../../assets/icon/ppt/model5-2.png'),
-                            title: {
-                                x: "5%", // 横坐标
-                                y: 1.1,
-                                w: "90%",
-                                color: '674D40',
-                                bold: true,
-                                fontSize: 35, // 字号
-                                fontFace: '黑体',
-                                align: "center",
-                            },
-                            subTitle: {
-                                x: "5%", // 横坐标
-                                y: 1.8,
-                                w: "90%",
-                                color: "222222",
-                                fontSize: 20, // 字号
-                                fontFace: '黑体',
-                                align: "center",
-                            },
-                            content: {
-                                x: "20%", // 横坐标
-                                y: 3.2,
-                                w: "60%",
-                                color: "444444",
-                                fontSize: 18, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            }
-                        }
-                    ],
-                    imgEnd: {
-                        img: require('../../../assets/icon/ppt/model5-1.png'),
-                        setting: {
-                            x: "5%",
-                            y: 3,
-                            w: "90%",
-                            color: '674D40',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                },
-                {
-                    img: require('../../../assets/icon/ppt/model6-1.png'),
-                    img1: {
-                        img: require('../../../assets/icon/ppt/model6-1-2.png'),
-                        setting: {
-                            x: "35%",
-                            y: 2.3,
-                            w: "60%",
-                            bold: true,
-                            color: 'EA7A93',
-                            fontSize: 38,
-                            fontFace: '黑体',
-                            align: "center",
-                        }
-                    },
-                    img2: [
-                        {
-                            img:require('../../../assets/icon/ppt/model6-2.png'),
-                            title: {
-                                x: "5%", // 横坐标
-                                y: 1.1,
-                                w: "90%",
-                                color: '4F73DA',
-                                bold: true,
-                                fontSize: 35, // 字号
-                                fontFace: '黑体',
-                                align: "center",
-                            },
-                            subTitle: {
-                                x: "5%", // 横坐标
-                                y: 1.8,
-                                w: "90%",
-                                color: "333333",
-                                fontSize: 20, // 字号
-                                fontFace: '黑体',
-                                align: "center",
-                            },
-                            content: {
-                                x: "20%", // 横坐标
-                                y: 3.2,
-                                w: "60%",
-                                color: "333333",
-                                fontSize: 18, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            }
-                        },//内容页1
-                        {
-                            img: require('../../../assets/icon/ppt/model6-2.png'),
-                            title: {
-                                x: "2.5%", // 横坐标
-                                y: 2.3,
-                                w: "30%",
-                                color: 'ffffff',
-                                bold: true,
-                                fontSize: 35, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            subTitle: {
-                                x: "2.5%", // 横坐标
-                                y: 3.1,
-                                w: "30%",
-                                color: "ffffff",
-                                fontSize: 20, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            content: {
-                                x: "45%", // 横坐标
-                                y: 2.8,
-                                w: "45%",
-                                color: "333333",
-                                fontSize: 18, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            square: {
-                                x: 0,
-                                y: 0,
-                                w: "35%",
-                                h: "100%",
-                                fill: { color: "4F73DA" }
-                            },
-                            square2: {
-                                x: "35%",
-                                y: 0,
-                                w: "2.5%",
-                                h: "100%",
-                                fill: { color: "C2CFEF" }
-                            }
-                        },//内容页2
-                        {
-                            img: require('../../../assets/icon/ppt/model6-2.png'),
-                            title: {
-                                x: "5%", // 横坐标
-                                y: 1,
-                                w: "60%",
-                                color: '4F73DA',
-                                bold: true,
-                                fontSize: 35, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            subTitle: {
-                                x: "5%", // 横坐标
-                                y: 1.7,
-                                w: "60%",
-                                color: "333333",
-                                fontSize: 20, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            content: {
-                                x: "5%", // 横坐标
-                                y: 2.5,
-                                w: "60%",
-                                color: "333333",
-                                fontSize: 18, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            image: {
-                                x: "70%",
-                                y: "22%",
-                                w: "30%",
-                                h: "56%",
-                                sizing: "contain",
-                                path: require('../../../assets/icon/ppt/model6-3.png')
-                            },
-                        },//内容页3
-                        {
-                            img: require('../../../assets/icon/ppt/model6-2.png'),
-                            title: {
-                                x: "10%", // 横坐标
-                                y: "4%",
-                                h: 0.75,
-                                w: "80%",
-                                color: 'ffffff',
-                                fill: { color: "4F73DA"},
-                                bold: true,
-                                fontSize: 35, // 字号
-                                fontFace: '黑体',
-                                align: "center",
-                            },
-                            subTitle: {
-                                x: "10%", // 横坐标
-                                y: 1.5,
-                                w: "80%",
-                                color: "333333",
-                                fontSize: 20, // 字号
-                                fontFace: '黑体',
-                                align: "left",
-                            },
-                            content: {
-                                x: "10%", // 横坐标
-                                y: 2.3,
-                                w: "80%",
-                                color: "333333",
+                                x: "10%", // 横坐标
+                                y: 2.3,
+                                w: "80%",
+                                color: "333333",
                                 fontSize: 18, // 字号
                                 fontFace: '黑体',
                                 align: "left",
@@ -738,6 +437,307 @@ export default {
                         }
                     },
                 },
+                {
+                    img: require('../../../assets/icon/ppt/model1-1.png'),
+                    img1: {
+                        img: require('../../../assets/icon/ppt/model1-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '17094F',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    img2: [
+                        {
+                            img: require('../../../assets/icon/ppt/model1-2.png'),
+                            title: {
+                                x: "5%", // 横坐标
+                                y: 1.1,
+                                w: "90%",
+                                color: '17094F',
+                                bold: true,
+                                fontSize: 35, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            subTitle: {
+                                x: "5%", // 横坐标
+                                y: 1.8,
+                                w: "90%",
+                                color: "222222",
+                                fontSize: 20, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            content: {
+                                x: "20%", // 横坐标
+                                y: 3.2,
+                                w: "60%",
+                                color: "444444",
+                                fontSize: 18, // 字号
+                                fontFace: '黑体',
+                                align: "left",
+                            }
+                        }
+                    ],
+                    imgEnd: {
+                        img: require('../../../assets/icon/ppt/model1-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '17094F',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    }
+                },
+                {
+                    img: require('../../../assets/icon/ppt/model2-1.png'),
+                    img1: {
+                        img: require('../../../assets/icon/ppt/model2-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '052B37',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    img2: [
+                        {
+                            img: require('../../../assets/icon/ppt/model2-2.png'),
+                            title: {
+                                x: "5%", // 横坐标
+                                y: 1.1,
+                                w: "90%",
+                                color: '052B37',
+                                bold: true,
+                                fontSize: 35, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            subTitle: {
+                                x: "5%", // 横坐标
+                                y: 1.8,
+                                w: "90%",
+                                color: "222222",
+                                fontSize: 20, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            content: {
+                                x: "20%", // 横坐标
+                                y: 3.2,
+                                w: "60%",
+                                color: "444444",
+                                fontSize: 18, // 字号
+                                fontFace: '黑体',
+                                align: "left",
+                            }
+                        }
+                    ],
+                    imgEnd: {
+                        img: require('../../../assets/icon/ppt/model2-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '052B37',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    }
+                },
+                {
+                    img: require('../../../assets/icon/ppt/model3-1.png'),
+                    img1: {
+                        img: require('../../../assets/icon/ppt/model3-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '1D5869',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    img2: [
+                        {
+                            img: require('../../../assets/icon/ppt/model3-2.png'),
+                            title: {
+                                x: "5%", // 横坐标
+                                y: 1.1,
+                                w: "90%",
+                                color: '1D5869',
+                                bold: true,
+                                fontSize: 35, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            subTitle: {
+                                x: "5%", // 横坐标
+                                y: 1.8,
+                                w: "90%",
+                                color: "222222",
+                                fontSize: 20, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            content: {
+                                x: "20%", // 横坐标
+                                y: 3.2,
+                                w: "60%",
+                                color: "444444",
+                                fontSize: 18, // 字号
+                                fontFace: '黑体',
+                                align: "left",
+                            }
+                        }
+                    ],
+                    imgEnd: {
+                        img: require('../../../assets/icon/ppt/model3-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '1D5869',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    }
+                },
+                {
+                    img: require('../../../assets/icon/ppt/model4-1.png'),
+                    img1: {
+                        img: require('../../../assets/icon/ppt/model4-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '372213',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    img2: [
+                        {
+                            img: require('../../../assets/icon/ppt/model4-2.png'),
+                            title: {
+                                x: "5%", // 横坐标
+                                y: 1.1,
+                                w: "90%",
+                                color: '372213',
+                                bold: true,
+                                fontSize: 35, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            subTitle: {
+                                x: "5%", // 横坐标
+                                y: 1.8,
+                                w: "90%",
+                                color: "222222",
+                                fontSize: 20, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            content: {
+                                x: "20%", // 横坐标
+                                y: 3.2,
+                                w: "60%",
+                                color: "444444",
+                                fontSize: 18, // 字号
+                                fontFace: '黑体',
+                                align: "left",
+                            }
+                        }
+                    ],
+                    imgEnd: {
+                        img: require('../../../assets/icon/ppt/model4-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '372213',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    color: '372213'
+                },
+                {
+                    img: require('../../../assets/icon/ppt/model5-1.png'),
+                    img1: {
+                        img: require('../../../assets/icon/ppt/model5-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '674D40',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                    img2: [
+                        {
+                            img: require('../../../assets/icon/ppt/model5-2.png'),
+                            title: {
+                                x: "5%", // 横坐标
+                                y: 1.1,
+                                w: "90%",
+                                color: '674D40',
+                                bold: true,
+                                fontSize: 35, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            subTitle: {
+                                x: "5%", // 横坐标
+                                y: 1.8,
+                                w: "90%",
+                                color: "222222",
+                                fontSize: 20, // 字号
+                                fontFace: '黑体',
+                                align: "center",
+                            },
+                            content: {
+                                x: "20%", // 横坐标
+                                y: 3.2,
+                                w: "60%",
+                                color: "444444",
+                                fontSize: 18, // 字号
+                                fontFace: '黑体',
+                                align: "left",
+                            }
+                        }
+                    ],
+                    imgEnd: {
+                        img: require('../../../assets/icon/ppt/model5-1.png'),
+                        setting: {
+                            x: "5%",
+                            y: 3,
+                            w: "90%",
+                            color: '674D40',
+                            fontSize: 38,
+                            fontFace: '黑体',
+                            align: "center",
+                        }
+                    },
+                },
             ],
             templateIndex: 0,
         };

src/components/pages/studentManage/student.vue

@@ -716,19 +716,25 @@ export default {
             arr.push(obj);
           });
           console.log(arr);
+          if(arr.length > 70){
+            _this.$message.error("限制上传学生数量不能超过70个");
+            _this.fileListUpload = [];
+            loading.close();
+            return;
+          }
           let _b = 1;
           for (var i = 0; i < arr.length; i++) {
             let item = arr[i];
             if (item.class === "") {
-              _b = 1;
+              _b = 2;
               _this.$message.error("学生班级不能为空,请重新上传");
               break;
             } else if (item.name === "") {
-              _b = 1;
+              _b = 2;
               _this.$message.error("学生姓名不能为空,请重新上传");
               break;
             } else if (item.sId === "") {
-              _b = 1;
+              _b = 2;
               _this.$message.error("学生学号不能为空,请重新上传");
             }
             // else if (item.phone === "") {
@@ -741,7 +747,7 @@ export default {
             //   break;
             // }
             else if (item.mail === "") {
-              _b = 1;
+              _b = 2;
               _this.$message.error("学生账号不能为空,请重新上传");
               break;
             } else if (
@@ -749,7 +755,7 @@ export default {
                 item.mail
               )
             ) {
-              _b = 1;
+              _b = 2;
               _this.$message.error("有学生账号格式不正确,请重新上传");
               break;
             }
@@ -981,6 +987,11 @@ export default {
             //   loading.close();
             //#endregion
           }
+          if(_b == 2){
+            _this.fileListUpload = [];
+            loading.close();
+            return
+          }
           let z = 2;
           let newArr = JSON.stringify(arr);
           let params = [