lsc 1 år sedan
förälder
incheckning
44ac30b282

+ 1 - 1
dist/index.html

@@ -18,7 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.6eba140d39b61353d0e97350096c7e0f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e97d134e001cf57d792e.js></script><script type=text/javascript src=./static/js/app.f47e9b7c7403ded0fa53.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.0d7bdd48944b7a1710eb38e18f76cc85.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e97d134e001cf57d792e.js></script><script type=text/javascript src=./static/js/app.9e253b4d43b2f8c2d92c.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.0d7bdd48944b7a1710eb38e18f76cc85.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.0d7bdd48944b7a1710eb38e18f76cc85.css.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.6eba140d39b61353d0e97350096c7e0f.css.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.9e253b4d43b2f8c2d92c.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.9e253b4d43b2f8c2d92c.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.f47e9b7c7403ded0fa53.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 28 - 7
src/components/easy2/studyStudent.vue

@@ -316,7 +316,7 @@
                               <img src="../../assets/icon/newIcon/allScreen.png" alt />
                             </div>
                           </div>
-                          <div class="navListItem" v-if="vitem.type == 8">
+                          <div class="navListItem" v-if="vitem.type == 8 || vitem.type == 14">
                             <div @click="doUrl(vitem.url, vindex)" class="navText"
                               :class="isClickNav == vindex ? 'isClickNav' : ''">
                               {{ vitem.title ? vitem.title : vitem.url }}
@@ -6161,7 +6161,7 @@
       <div>
         <div class="sentenBox">
           <div v-for="(st, stIndex) in sentenceList" :key="stIndex" style="padding-bottom: 20px">
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div v-for="(r, rIndex) in st.chooseSenList" :key="rIndex" @click="returnCard(r, stIndex, rIndex)">
@@ -6212,7 +6212,7 @@
         </div>
         <div class="sentenBox">
           <div v-for="(st, stIndex) in sentenceList" :key="stIndex" style="padding-bottom: 20px">
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div v-for="(r, rIndex) in st.chooseSenList" :key="rIndex" @click="returnCard(r, stIndex, rIndex)">
@@ -10394,7 +10394,7 @@ export default {
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
-                } else if (c[j].type == 8) {
+                } else if (c[j].type == 8 || c[j].type == 14) {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
@@ -10462,7 +10462,7 @@ export default {
             } else {
               if (_chapterData[this.taskCount].length > 0) {
                 let _url = _chapterData[this.taskCount][0].url;
-                if (_chapterData[this.taskCount][0].type == 8) {
+                if (_chapterData[this.taskCount][0].type == 8 || _chapterData[this.taskCount][0].type == 14) {
                   this.showType = 2;
                   if (
                     _url.indexOf("https://") == -1 &&
@@ -10581,7 +10581,7 @@ export default {
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
-                } else if (c[j].type == 8) {
+                } else if (c[j].type == 8 || c[j].type == 14) {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
@@ -10612,7 +10612,7 @@ export default {
             } else {
               if (_chapterData[this.taskCount].length > 0) {
                 let _url = _chapterData[this.taskCount][0].url;
-                if (_chapterData[this.taskCount][0].type == 8) {
+                if (_chapterData[this.taskCount][0].type == 8 || _chapterData[this.taskCount][0].type == 14) {
                   this.showType = 2;
                   if (
                     _url.indexOf("https://") == -1 &&
@@ -17388,4 +17388,25 @@ ol {
 .selectBox>>>.el-input__icon {
   line-height: 30px;
 }
+
+.sentenceTitle{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.sentenceTitle::before{
+  content:attr(index);
+  background: #3681fc;
+  border-radius: 50%;
+  color: #fff;
+  width: 25px;
+  height: 25px;
+  min-width: 25px;
+  min-height: 25px;
+  text-align: center;
+  line-height: 25px;
+  margin-right: 5px;
+}
 </style>

+ 26 - 5
src/components/easy3/studyStudent.vue

@@ -429,7 +429,7 @@
                               />
                             </div>
                           </div>
-                          <div class="navListItem" v-if="vitem.type == 8">
+                          <div class="navListItem" v-if="vitem.type == 8 || vitem.type == 14">
                             <div
                               @click="doUrl(vitem.url, vindex)"
                               class="navText"
@@ -10354,7 +10354,7 @@
             :key="stIndex"
             style="padding-bottom: 20px"
           >
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div
@@ -10445,7 +10445,7 @@
             :key="stIndex"
             style="padding-bottom: 20px"
           >
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div
@@ -15026,7 +15026,7 @@ export default {
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
-                } else if (c[j].type == 8) {
+                } else if (c[j].type == 8 || c[j].type == 14) {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
@@ -15095,7 +15095,7 @@ export default {
             } else {
               if (_chapterData[taskCount].length > 0) {
                 let _url = _chapterData[taskCount][0].url;
-                if (_chapterData[taskCount][0].type == 8) {
+                if (_chapterData[taskCount][0].type == 8 || _chapterData[taskCount][0].type == 14) {
                   this.showType = 2;
                   if (
                     _url.indexOf("https://") == -1 &&
@@ -21881,4 +21881,25 @@ ol {
 .selectBox>>>.el-input__icon {
   line-height: 30px;
 }
+
+.sentenceTitle{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.sentenceTitle::before{
+  content:attr(index);
+  background: #3681fc;
+  border-radius: 50%;
+  color: #fff;
+  width: 25px;
+  height: 25px;
+  min-width: 25px;
+  min-height: 25px;
+  text-align: center;
+  line-height: 25px;
+  margin-right: 5px;
+}
 </style>

+ 1 - 1
src/components/group/group.vue

@@ -285,7 +285,7 @@
                         <span class="groupn">第{{ index + 1 }}组名称:</span>
                         <el-input v-model="item.name" placeholder="请输入名称..." style="width: 250px"></el-input>
                         <div class="groupBtn">
-                            <el-button type="primary" size="small" @click="addGroup(index)">
+                            <el-button type="primary" size="small" @click="addGroup(index)" v-if="(groupJson2.group.length - 1) == index">
                                 添加</el-button>
                             <el-button type="primary" size="small" @click="deleteGroup(index)"
                                 v-if="groupJson2.group && groupJson2.group.length > 1">删除</el-button>

+ 28 - 7
src/components/studyStudent.vue

@@ -499,7 +499,7 @@
                               />
                             </div>
                           </div>
-                          <div class="navListItem" v-if="vitem.type == 8">
+                          <div class="navListItem" v-if="vitem.type == 8 || vitem.type == 14">
                             <div
                               @click="doUrl(vitem.url, vindex)"
                               class="navText"
@@ -9063,7 +9063,7 @@
             :key="stIndex"
             style="padding-bottom: 20px"
           >
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div
@@ -9154,7 +9154,7 @@
             :key="stIndex"
             style="padding-bottom: 20px"
           >
-            <div style="padding: 15px 0 10px 20px">请选择正确顺序</div>
+            <div style="padding: 15px 0 10px 20px" class="sentenceTitle" :index="stIndex+1">请选择正确顺序</div>
             <div class="cardList" v-if="st.chooseSenList">
               <div class="cardBox">
                 <div
@@ -14210,7 +14210,7 @@ export default {
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
-                } else if (c[j].type == 8) {
+                } else if (c[j].type == 8 || c[j].type == 14) {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
@@ -14278,7 +14278,7 @@ export default {
             } else {
               if (_chapterData[this.taskCount].length > 0) {
                 let _url = _chapterData[this.taskCount][0].url;
-                if (_chapterData[this.taskCount][0].type == 8) {
+                if (_chapterData[this.taskCount][0].type == 8 || _chapterData[this.taskCount][0].type == 14) {
                   this.showType = 2;
                   if (
                     _url.indexOf("https://") == -1 &&
@@ -14385,7 +14385,7 @@ export default {
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
-                } else if (c[j].type == 8) {
+                } else if (c[j].type == 8 || c[j].type == 14) {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
@@ -14417,7 +14417,7 @@ export default {
             } else {
               if (_chapterData[this.taskCount].length > 0) {
                 let _url = _chapterData[this.taskCount][0].url;
-                if (_chapterData[this.taskCount][0].type == 8) {
+                if (_chapterData[this.taskCount][0].type == 8 || _chapterData[this.taskCount][0].type == 14) {
                   this.showType = 2;
                   if (
                     _url.indexOf("https://") == -1 &&
@@ -21050,4 +21050,25 @@ ol {
 .selectBox>>>.el-input__icon {
   line-height: 30px;
 }
+
+.sentenceTitle{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.sentenceTitle::before{
+  content:attr(index);
+  background: #3681fc;
+  border-radius: 50%;
+  color: #fff;
+  width: 25px;
+  height: 25px;
+  min-width: 25px;
+  min-height: 25px;
+  text-align: center;
+  line-height: 25px;
+  margin-right: 5px;
+}
 </style>

Vissa filer visades inte eftersom för många filer har ändrats