Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 1 year ago
parent
e78c43a79b
commit
2fca44f6c3
17 changed files with 154 additions and 98 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.87e5844cc1ee6ae0aa9d63a78789cb0d.css
  3. 0 0
      dist/static/css/app.87e5844cc1ee6ae0aa9d63a78789cb0d.css.map
  4. 0 0
      dist/static/css/app.afa04404a4aff5f80be06a6aede0bae1.css
  5. 0 0
      dist/static/css/app.afa04404a4aff5f80be06a6aede0bae1.css.map
  6. 0 0
      dist/static/js/app.a1bdc5c3b9bbea871f69.js
  7. 0 0
      dist/static/js/app.a1bdc5c3b9bbea871f69.js.map
  8. 0 0
      dist/static/js/app.a291cb457914b1317e4c.js
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. 24 13
      src/components/pages/addCourse.vue
  11. 4 4
      src/components/pages/addCourseGM.vue
  12. 2 2
      src/components/pages/choice/index.vue
  13. 66 43
      src/components/pages/course.vue
  14. 24 13
      src/components/pages/easy/addCourse.vue
  15. 4 4
      src/components/pages/student/addCourse.vue
  16. 4 4
      src/components/pages/studio/addCourse.vue
  17. 25 14
      src/components/pages/task/addCourse.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.afa04404a4aff5f80be06a6aede0bae1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.a291cb457914b1317e4c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.87e5844cc1ee6ae0aa9d63a78789cb0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.a1bdc5c3b9bbea871f69.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.87e5844cc1ee6ae0aa9d63a78789cb0d.css


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


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


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


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


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


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


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


+ 24 - 13
src/components/pages/addCourse.vue
View File 

@@ -2554,7 +2554,7 @@
 
             </div>
 
             <div class="a_add_head">
 
               <div style="display: flex;align-items: center;width: 100%;margin-right: 20px;">
 
-                {{ index1 + 1 + "、" }}
 
+                <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                 <textarea class="a_add_head_input textarea_css" v-autoHeight="40" v-model="askJson.askJson[index1].askstitle
 
                   " placeholder="请输入题目" @change="()=>{$forceUpdate()}"></textarea>
 
               </div>
 
@@ -2634,7 +2634,7 @@
 
             <div class="a_add_head">
 
               <div class="timuUpImg">
 
                 <div style="display: flex;align-items: center;">
 
-                  {{ index1 + 1 + "、" }}
 
+                  <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                   <!-- <el-input class="a_add_head_input"  v-autoHeight="40" resize="none" v-model="testJson.testJson[index1].teststitle" type="textarea"
 
                     placeholder="请输入题目">
 
                   </el-input> -->
 
@@ -3174,8 +3174,8 @@
 
                   <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle"></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
+                <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
               </div>
 
-              <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
             </div>
 
 
             <div class="cardList">
 
@@ -3369,8 +3369,8 @@
 
           <div class="groupTitle">请设置每组人数</div>
 
           <!-- <el-input v-model="groupJson.number" placeholder="2-10人以内"
 
             style="width: 150px; margin: 10px 10px 0 0"></el-input> -->
 
-          <el-input-number v-model="groupJson.number" :controls="false" :min="2" :max="10"
 
-            placeholder="请输入2-10的数字"></el-input-number>
 
+            <el-input v-model="groupJson.number" style="width:150px"
 
+            placeholder="请输入2-10的数字" @change="numberPan"></el-input>
 
         </div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
@@ -6984,7 +6984,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7005,7 +7005,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
               for (var z2 = z+1; z2 < aj[i].checkList.length; z2++) {  
@@ -7059,7 +7059,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7080,7 +7080,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
               for (var z2 = z+1; z2 < aj[i].checkList.length; z2++) {  
@@ -7100,7 +7100,7 @@ export default {
 
               (aj[i].type == "2" && !aj[i].answer.length) ||
 
               (aj[i].type == "1" && ((typeof aj[i].answer == 'object' && !aj[i].answer.length) || (aj[i].answer !== 0 && !aj[i].answer)))
 
             ) {
 
-              this.$message.error(`题目${i+1},未设置正确选项，请设置。`);
 
+              this.$message.error(`请将题目${i+1}的正确选项设置完整`);
 
               return;
 
             }
 
           }
 
@@ -8202,6 +8202,10 @@ export default {
 
         this.$message.error("请填写卡片内容！");
 
         return;
 
       }
 
+      if(this.sentenceList[i].sentenceTitle.length > 8){
 
+        this.$message.error("卡片内容字数不能超过8位");
 
+        return;
 
+      }
 
       if(this.sentenceList[i].addSentence.indexOf(this.sentenceList[i].sentenceTitle) !== -1){
 
         this.$message.error("不能添加重复的卡片内容！");
 
         return;
 
@@ -8221,14 +8225,14 @@ export default {
 
     addSentenceTool() {
 
       for (var i = 0; i < this.sentenceList.length; i++) {
 
         if (this.sentenceList[i].rightAnswer.length == 0) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
         if (
 
           this.sentenceList[i].addSentence.length !=
 
           this.sentenceList[i].rightAnswer.length
 
         ) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
       }
 
@@ -8425,6 +8429,12 @@ export default {
 
     deleteGroup(i) {
 
       this.groupJson.group.splice(i, 1);
 
     },
 
+    numberPan(){
 
+      if(/[^\d]/.test(this.groupJson.number) || this.groupJson.number < 2 || this.groupJson.number > 10){ 
+        this.$message.error('请输入2-10的数字')
 
+        this.groupJson.number = ''
 
+      }
 
+    },
 
     addGroupJson() {
 
       for (var i = 0; i < this.groupJson.group.length; i++) {
 
         if (!this.groupJson.group[i].name) {
 
@@ -9249,6 +9259,7 @@ export default {
 
   width: 40px;
 
   height: 50px;
 
   cursor: pointer;
 
+  margin-left: 10px;
 
 }
 
 
 .binfo_input {
 
@@ -11646,7 +11657,7 @@ ol {
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
-  font-size: 20px;
 
+  font-size: 14px;
 
   cursor: pointer;
 
   background-image: url("../../assets/icon/conSentences/titleBorder.png");
 
   background-size: cover;

+ 4 - 4
src/components/pages/addCourseGM.vue
View File 

@@ -4161,7 +4161,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -4182,7 +4182,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }
 
@@ -4229,7 +4229,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -4250,7 +4250,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }

+ 2 - 2
src/components/pages/choice/index.vue
View File 

@@ -402,7 +402,7 @@ export default {
 
                             : "";
 
                         if (element != "") {
 
                             b++;
 
-                            this.$message.error("填写了选项，题目不能为空！");
 
+                            this.$message.error(`请将题目${i+1}填写完整。`);
 
                             return;
 
                         } else {
 
                             a++;
 
@@ -423,7 +423,7 @@ export default {
 
                             if (checkC != "") {
 
                                 index++;
 
                             } else {
 
-                                this.$message.error("选项不能为空！");
 
+                                this.$message.error(`题目${i+1}选项不能为空！`);
 
                                 return;
 
                             }
 
                         }

+ 66 - 43
src/components/pages/course.vue
View File 

@@ -57,6 +57,7 @@
 
               </div>
 
               <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @input="getCourse()" />
 
             </div>
 
+            <el-button type="primary" class="bgColor" style="margin-left: 10px;" @click="reset">重置</el-button>
 
           </div>
 
         </div>
 
         <div class="pType_box all_choose" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
 
@@ -87,27 +88,27 @@
 
               <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
 
                 @click="getCourse2(item.name, item.id, item1.id, 2)">
 
                 <div class="cName" :class="typea == item1.id || typeb == item1.id || typed == item1.id
 
-                    ? 'isCType'
 
-                    : ''
 
+                  ? 'isCType'
 
+                  : ''
 
                   ">
 
                   {{ item1.name }}
 
                 </div>
 
               </div>
 
             </div>
 
           </div>
 
-          <div class="all_choose"  v-if="role == '1'">
 
+          <div class="all_choose" v-if="role == '1'">
 
             <span><span>所有者</span></span>
 
             <div class="typeCss">
 
-              <div class="cName" :class="groupA == '4' ? 'isCType' : ''" @click="groupA = '4';search();">
 
+              <div class="cName" :class="groupA == '4' ? 'isCType' : ''" @click="groupA = '4'; search();">
 
                 全部
 
               </div>
 
-              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2';search();">
 
+              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
                 我的课程
 
               </div>
 
-              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3';search();">
 
+              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
                 协同课程
 
               </div>
 
-              <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1';search();">
 
+              <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
 
                 他人课程
 
               </div>
 
             </div>
 
@@ -115,13 +116,13 @@
 
           <div class="all_choose" v-else>
 
             <span><span>所有者</span></span>
 
             <div class="typeCss">
 
-              <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0';search();">
 
+              <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0'; search();">
 
                 全部
 
               </div>
 
-              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2';search();">
 
+              <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
                 我的课程
 
               </div>
 
-              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3';search();">
 
+              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
                 协同课程
 
               </div>
 
             </div>
 
@@ -179,10 +180,10 @@
 
             <div class="xtCourse" v-else>协同课程</div>
 
             <div class="tup">
 
               <img :src="item.cover != null && item.cover != ''
 
-                  ? JSON.parse(item.cover).length > 0
 
-                    ? JSON.parse(item.cover)[0].url
 
-                    : mr
 
+                ? JSON.parse(item.cover).length > 0
 
+                  ? JSON.parse(item.cover)[0].url
 
                   : mr
 
+                : mr
 
                 " alt />
 
             </div>
 
             <!-- <div class="bottom_box">
 
@@ -215,22 +216,22 @@
 
               <div @click="get(item)">预览</div>
 
               <!-- <div @click="jump(item.courseId)" v-else>评课</div> -->
 
               <div v-if="((item.userid == userid) ||
 
-                  (item.course_teacher &&
 
-                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
+                (item.course_teacher &&
 
+                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
                 item.state == 1
 
                 " @click="goToCourse(item.courseId)">
 
                 修改
 
               </div>
 
               <div v-if="((item.userid == userid) ||
 
-                  (item.course_teacher &&
 
-                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
+                (item.course_teacher &&
 
+                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
                 item.state == 2
 
                 " @click="goToCourse2(item.courseId)">
 
                 修改
 
               </div>
 
               <div v-if="((item.userid == userid) ||
 
-                  (item.course_teacher &&
 
-                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
+                (item.course_teacher &&
 
+                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
                 item.state == 3
 
                 " @click="goToCourse3(item.courseId)">
 
                 修改
 
@@ -296,10 +297,10 @@
 
         <div class="out_box" v-for="(item, index) in courseTeam" :key="index" style="margin-left: 15px">
 
           <div class="tup">
 
             <img :src="item.cover != null && item.cover != ''
 
-                ? JSON.parse(item.cover).length > 0
 
-                  ? JSON.parse(item.cover)[0].url
 
-                  : mr
 
+              ? JSON.parse(item.cover).length > 0
 
+                ? JSON.parse(item.cover)[0].url
 
                 : mr
 
+              : mr
 
               " alt />
 
           </div>
 
           <div class="bottom_box">
 
@@ -389,7 +390,7 @@ export default {
 
       typed: "",
 
       pTypeCheck: [],
 
       pTypeCheckName: [],
 
-      btnDisplay:false
 
+      btnDisplay: false
 
     };
 
   },
 
   methods: {
 
@@ -484,6 +485,19 @@ export default {
 
       }
 
       // this.$router.push(path);
 
     },
 
+    reset() {
 
+      this.typeE = []
 
+      this.typea = ''
 
+      this.typeb = ''
 
+      this.typed = ''
 
+      this.courseName = ''
 
+      if (this.role == "1") {
 
+        this.groupA = "4";
 
+      } else {
 
+        this.groupA = "0";
 
+      }
 
+      this.getCourse();
 
+    },
 
     goToCourse2(courseId) {
 
       if (courseId) {
 
         this.$router.push(
 
@@ -1146,10 +1160,12 @@ export default {
 
   .out_box {
 
     width: calc(100% / 4 - (15px * 3) / 4) !important;
 
   }
 
-  .out_box:nth-child(5n){
 
+
 
+  .out_box:nth-child(5n) {
 
     margin-right: 15px !important;
 
   }
 
-  .out_box:nth-child(4n){
 
+
 
+  .out_box:nth-child(4n) {
 
     margin-right: 0 !important;
 
   }
 
 }
 
@@ -1158,13 +1174,16 @@ export default {
 
   .out_box {
 
     width: calc(100% / 3 - (15px * 2) / 3) !important;
 
   }
 
-  .out_box:nth-child(5n){
 
+
 
+  .out_box:nth-child(5n) {
 
     margin-right: 15px !important;
 
   }
 
-  .out_box:nth-child(4n){
 
+
 
+  .out_box:nth-child(4n) {
 
     margin-right: 15px !important;
 
   }
 
-  .out_box:nth-child(3n){
 
+
 
+  .out_box:nth-child(3n) {
 
     margin-right: 0 !important;
 
   }
 
 }
 
@@ -1420,7 +1439,7 @@ export default {
 
   border: 1px solid #3681FC;
 
 }
 
 
-.out_box:nth-child(5n){
 
+.out_box:nth-child(5n) {
 
   margin-right: 0;
 
 }
 
 
@@ -1445,7 +1464,7 @@ export default {
 
   justify-content: space-between;
 
 }
 
 
-.bottom_box>div:nth-child(1) >span:nth-child(1){
 
+.bottom_box>div:nth-child(1)>span:nth-child(1) {
 
   max-width: 100%;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
@@ -1453,10 +1472,10 @@ export default {
 
   font-weight: bold;
 
 }
 
 
-.bottom_box>div:nth-child(1) >span:nth-child(2){
 
-  min-width:fit-content;
 
-  font-size:14px;
 
-  color:#8c8c8c;
 
+.bottom_box>div:nth-child(1)>span:nth-child(2) {
 
+  min-width: fit-content;
 
+  font-size: 14px;
 
+  color: #8c8c8c;
 
 }
 
 
 .tup {
 
@@ -1746,9 +1765,11 @@ export default {
 
   color: #205cc6;
 
   /* font-size: 20px; */
 
 }
 
-.reTop .reTopCh{
 
+
 
+.reTop .reTopCh {
 
   display: flex;
 
 }
 
+
 
 .reTop .searchI {
 
   display: flex;
 
   flex-direction: row;
 
@@ -1809,17 +1830,20 @@ export default {
 
   margin: 2px 0;
 
   width: 100%;
 
 }
 
-.all_choose>span{
 
+
 
+.all_choose>span {
 
   display: flex;
 
   margin-right: 5px;
 
 }
 
+
 
 .all_choose>span>span {
 
   min-width: 65px;
 
   max-width: 65px;
 
   display: block;
 
   text-align-last: justify;
 
 }
 
-.all_choose>span::after{
 
+
 
+.all_choose>span::after {
 
   content: '：';
 
 }
 
 
@@ -1881,7 +1905,7 @@ export default {
 
   box-shadow: none !important;
 
 }
 
 
-.buttonBox{
 
+.buttonBox {
 
   position: absolute;
 
   bottom: -0;
 
   transform: translateY(100%);
 
@@ -1891,7 +1915,7 @@ export default {
 
   width: 100%;
 
 }
 
 
-.buttonBox > div{
 
+.buttonBox>div {
 
   height: 40px;
 
   line-height: 40px;
 
   width: 100%;
 
@@ -1900,11 +1924,10 @@ export default {
 
   box-sizing: border-box;
 
 }
 
 
-.buttonBox > div + div{
 
+.buttonBox>div+div {
 
   border-top: 1px solid #e0e0e0;
 
 }
 
 
-.buttonBox > div:hover{
 
+.buttonBox>div:hover {
 
   background: #f6f8ff;
 
-}
 
-</style>
 
+}</style>

+ 24 - 13
src/components/pages/easy/addCourse.vue
View File 

@@ -3471,7 +3471,7 @@
 
             </div>
 
             <div class="a_add_head">
 
               <div style="display: flex;align-items: center;width: 100%;margin-right: 20px;">
 
-                {{ index1 + 1 + "、" }}
 
+                <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                 <textarea class="a_add_head_input textarea_css"  v-autoHeight="40" v-model="askJson.askJson[index1].askstitle
 
                         " placeholder="请输入题目" @change="()=>{$forceUpdate()}"></textarea>
 
               </div>
 
@@ -3549,7 +3549,7 @@
 
             <div class="a_add_head">
 
               <div class="timuUpImg">
 
                 <div style="display: flex;align-items: center;">
 
-                  {{ index1 + 1 + "、" }}
 
+                  <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                   <!-- <el-input class="a_add_head_input"  v-autoHeight="40" resize="none" v-model="testJson.testJson[index1].teststitle" type="textarea"
 
                     placeholder="请输入题目">
 
                   </el-input> -->
 
@@ -4089,8 +4089,8 @@
 
                   <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle"></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
+                <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
               </div>
 
-              <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
             </div>
 
 
             <div class="cardList">
 
@@ -4284,8 +4284,8 @@
 
           <div class="groupTitle">请设置每组人数</div>
 
           <!-- <el-input v-model="groupJson.number" placeholder="2-10人以内"
 
             style="width: 150px; margin: 10px 10px 0 0"></el-input> -->
 
-          <el-input-number v-model="groupJson.number" :controls="false" :min="2" :max="10"
 
-            placeholder="请输入2-10的数字"></el-input-number>
 
+          <el-input v-model="groupJson.number" style="width:150px"
 
+            placeholder="请输入2-10的数字" @change="numberPan"></el-input>
 
         </div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
@@ -7704,7 +7704,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7725,7 +7725,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
 
@@ -7780,7 +7780,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7801,7 +7801,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
 
@@ -7822,7 +7822,7 @@ export default {
 
               (aj[i].type == "2" && !aj[i].answer.length) ||
 
               (aj[i].type == "1" && ((typeof aj[i].answer == 'object' && !aj[i].answer.length) || (aj[i].answer !== 0 && !aj[i].answer)))
 
             ) {
 
-              this.$message.error(`题目${i+1},未设置正确选项，请设置。`);
 
+              this.$message.error(`请将题目${i+1}的正确选项设置完整`);
 
               return;
 
             }
 
           }
 
@@ -8901,6 +8901,10 @@ export default {
 
         this.$message.error("请填写卡片内容！");
 
         return;
 
       }
 
+      if(this.sentenceList[i].sentenceTitle.length > 8){
 
+        this.$message.error("卡片内容字数不能超过8位");
 
+        return;
 
+      }
 
       if(this.sentenceList[i].addSentence.indexOf(this.sentenceList[i].sentenceTitle) !== -1){
 
         this.$message.error("不能添加重复的卡片内容！");
 
         return;
 
@@ -8920,14 +8924,14 @@ export default {
 
     addSentenceTool() {
 
       for (var i = 0; i < this.sentenceList.length; i++) {
 
         if (this.sentenceList[i].rightAnswer.length == 0) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
         if (
 
           this.sentenceList[i].addSentence.length !=
 
           this.sentenceList[i].rightAnswer.length
 
         ) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
       }
 
@@ -9106,6 +9110,12 @@ export default {
 
     deleteGroup(i) {
 
       this.groupJson.group.splice(i, 1);
 
     },
 
+    numberPan(){
 
+      if(/[^\d]/.test(this.groupJson.number) || this.groupJson.number < 2 || this.groupJson.number > 10){ 
+        this.$message.error('请输入2-10的数字')
 
+        this.groupJson.number = ''
 
+      }
 
+    },
 
     addGroupJson() {
 
       for (var i = 0; i < this.groupJson.group.length; i++) {
 
         if (!this.groupJson.group[i].name) {
 
@@ -9933,6 +9943,7 @@ export default {
 
   width: 40px;
 
   height: 50px;
 
   cursor: pointer;
 
+  margin-left: 10px;
 
 }
 
 
 
@@ -12227,7 +12238,7 @@ ol {
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
-  font-size: 20px;
 
+  font-size: 14px;
 
   cursor: pointer;
 
   background-image: url("../../../assets/icon/conSentences/titleBorder.png");
 
   background-size: cover;

+ 4 - 4
src/components/pages/student/addCourse.vue
View File 

@@ -6824,7 +6824,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -6845,7 +6845,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }
 
@@ -6893,7 +6893,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -6914,7 +6914,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }

+ 4 - 4
src/components/pages/studio/addCourse.vue
View File 

@@ -7849,7 +7849,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7870,7 +7870,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }
 
@@ -7918,7 +7918,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -7939,7 +7939,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
             }

+ 25 - 14
src/components/pages/task/addCourse.vue
View File 

@@ -5554,7 +5554,7 @@
 
             </div>
 
             <div class="a_add_head">
 
               <div style="display: flex;align-items: center;width: 100%;margin-right: 20px;">
 
-                {{ index1 + 1 + "、" }}
 
+                <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                 <textarea class="a_add_head_input textarea_css"  v-autoHeight="40" v-model="askJson.askJson[index1].askstitle
 
                         " placeholder="请输入题目" @change="()=>{$forceUpdate()}"></textarea>
 
               </div>
 
@@ -5665,7 +5665,7 @@
 
             <div class="a_add_head">
 
               <div class="timuUpImg">
 
                 <div style="display: flex;align-items: center;">
 
-                  {{ index1 + 1 + "、" }}
 
+                  <span style="min-width:fit-content">{{ index1 + 1 + "、" }}</span>
 
                   <!-- <el-input class="a_add_head_input"  v-autoHeight="40" resize="none" v-model="testJson.testJson[index1].teststitle" type="textarea"
 
                     placeholder="请输入题目">
 
                   </el-input> -->
 
@@ -6541,12 +6541,12 @@
 
                   ></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
-              </div>
 
-              <div
 
+                <div
 
                 class="remove1"
 
                 v-if="sentenceList.length > 1"
 
                 @click="deleteSentence(stIndex)"
 
               ></div>
 
+              </div>
 
             </div>
 
 
             <div class="cardList">
 
@@ -6839,8 +6839,8 @@
 
           <div class="groupTitle">请设置每组人数</div>
 
           <!-- <el-input v-model="groupJson.number" placeholder="2-10人以内"
 
             style="width: 150px; margin: 10px 10px 0 0"></el-input> -->
 
-          <el-input-number v-model="groupJson.number" :controls="false" :min="2" :max="10"
 
-            placeholder="请输入2-10的数字"></el-input-number>
 
+            <el-input v-model="groupJson.number" style="width:150px"
 
+            placeholder="请输入2-10的数字" @change="numberPan"></el-input>
 
         </div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
@@ -10249,7 +10249,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -10270,7 +10270,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
               for (var z2 = z+1; z2 < aj[i].checkList.length; z2++) {  
@@ -10324,7 +10324,7 @@ export default {
 
               : "";
 
             if (element != "") {
 
               b++;
 
-              this.$message.error("填写了选项，题目不能为空！");
 
+              this.$message.error(`请将题目${i+1}填写完整。`);
 
               return;
 
             } else {
 
               a++;
 
@@ -10345,7 +10345,7 @@ export default {
 
               if (checkC != "") {
 
                 index++;
 
               } else {
 
-                this.$message.error("选项不能为空！");
 
+                this.$message.error(`题目${i+1}选项不能为空！`);
 
                 return;
 
               }
 
               for (var z2 = z+1; z2 < aj[i].checkList.length; z2++) {  
@@ -10365,7 +10365,7 @@ export default {
 
               (aj[i].type == "2" && !aj[i].answer.length) ||
 
               (aj[i].type == "1" && ((typeof aj[i].answer == 'object' && !aj[i].answer.length) || (aj[i].answer !== 0 && !aj[i].answer)))
 
             ) {
 
-              this.$message.error(`题目${i+1},未设置正确选项，请设置。`);
 
+              this.$message.error(`请将题目${i+1}的正确选项设置完整`);
 
               return;
 
             }
 
           }
 
@@ -11444,6 +11444,10 @@ export default {
 
         this.$message.error("请填写卡片内容！");
 
         return;
 
       }
 
+      if(this.sentenceList[i].sentenceTitle.length > 8){
 
+        this.$message.error("卡片内容字数不能超过8位");
 
+        return;
 
+      }
 
       if(this.sentenceList[i].addSentence.indexOf(this.sentenceList[i].sentenceTitle) !== -1){
 
         this.$message.error("不能添加重复的卡片内容！");
 
         return;
 
@@ -11463,14 +11467,14 @@ export default {
 
     addSentenceTool() {
 
       for (var i = 0; i < this.sentenceList.length; i++) {
 
         if (this.sentenceList[i].rightAnswer.length == 0) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
         if (
 
           this.sentenceList[i].addSentence.length !=
 
           this.sentenceList[i].rightAnswer.length
 
         ) {
 
-          this.$message.error("请将信息填写完整！");
 
+          this.$message.error(`请将题目${i+1}设置完整。`);
 
           return;
 
         }
 
       }
 
@@ -11622,6 +11626,12 @@ export default {
 
     deleteGroup(i) {
 
       this.groupJson.group.splice(i, 1);
 
     },
 
+    numberPan(){
 
+      if(/[^\d]/.test(this.groupJson.number) || this.groupJson.number < 2 || this.groupJson.number > 10){ 
+        this.$message.error('请输入2-10的数字')
 
+        this.groupJson.number = ''
 
+      }
 
+    },
 
     addGroupJson() {
 
       for (var i = 0; i < this.groupJson.group.length; i++) {
 
         if (!this.groupJson.group[i].name) {
 
@@ -12449,6 +12459,7 @@ export default {
 
   width: 40px;
 
   height: 50px;
 
   cursor: pointer;
 
+  margin-left: 10px;
 
 }
 
 
 
@@ -14748,7 +14759,7 @@ ol {
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
-  font-size: 20px;
 
+  font-size: 14px;
 
   cursor: pointer;
 
   background-image: url("../../../assets/icon/conSentences/titleBorder.png");
 
   background-size: cover;

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