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

update

lsc 1 year ago
parent
55e643c859
commit
77c413eeca
13 changed files with 38 additions and 34 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.433b3fbc56e384dc9d54440583145a33.css.map
  3. 0 0
      dist/static/css/app.d4185bac57a86495060e3a1a24d9b890.css
  4. 0 0
      dist/static/css/app.d4185bac57a86495060e3a1a24d9b890.css.map
  5. 0 0
      dist/static/js/app.6e4ecc503822d56bfcfd.js
  6. 0 0
      dist/static/js/app.991cece091d4b824a9b2.js
  7. 0 0
      dist/static/js/app.991cece091d4b824a9b2.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 10 9
      src/components/easy2/studyStudent.vue
  10. 7 7
      src/components/easy3/studyStudent.vue
  11. 4 4
      src/components/group/group.vue
  12. 14 12
      src/components/studyStudent.vue
  13. 2 1
      src/components/tools/time.vue

+ 1 - 1
dist/index.html
View File 

@@ -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.433b3fbc56e384dc9d54440583145a33.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.6e4ecc503822d56bfcfd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.d4185bac57a86495060e3a1a24d9b890.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.991cece091d4b824a9b2.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.433b3fbc56e384dc9d54440583145a33.css.map


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


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


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


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


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


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


+ 10 - 9
src/components/easy2/studyStudent.vue
View File 

@@ -4745,26 +4745,26 @@
 
               (courseDetail.course_teacher &&
 
                 courseDetail.course_teacher.indexOf(userid) != -1)
 
               ">
 
-              <div class="queTop" style="
 
+              <div class="queTop" @click="isClose = !isClose" style="
 
                   padding: 15px 0 15px 37px;
 
                   justify-content: space-between;
 
                 ">
 
                 <div class="queTopTitle">新增工具</div>
 
                 <div class="queTopRight">
 
-                  <div class="queTopClose" v-if="isClose == 0" @click="isClose = 1">
 
+                  <div class="queTopClose" v-if="isClose == 0">
 
                     展开
 
                     <div class="closeImg">
 
                       <img src="../../assets/icon/newIcon/close.png" alt="" />
 
                     </div>
 
                   </div>
 
-                  <div class="queTopClose" v-if="isClose == 1 && checktoolArray.length > 0" @click="isClose = 0">
 
+                  <div class="queTopClose" v-if="isClose == 1">
 
                     收缩
 
                     <div class="openImg">
 
                       <img src="../../assets/icon/newIcon/open.png" alt="" />
 
                     </div>
 
                   </div>
 
-                  <el-button style="margin: 0 30px 0 auto" type="primary" size="small" v-if="isClose == 1"
 
-                    @click="addToolChoose">确定</el-button>
 
+                  <el-button style="margin: 0 30px 0 auto" type="primary" size="small" v-if="isClose == 1 && checktoolArray.length > 0"
 
+                    @click.stop="addToolChoose">确定</el-button>
 
                 </div>
 
               </div>
 
               <div class="tool_work_box" :style="isClose == 0 ? 'display:none' : 'display:block'">
 
@@ -5631,6 +5631,7 @@
 
     <el-dialog title="倒计时" :visible.sync="timeDialogVisible" :append-to-body="true" width="800px"
 
       :before-close="handleClose" class="dialog_diy">
 
       <div>
 
+        <div style="margin-bottom: 20px;color: #999;">提示：点击“+”或“-”修改倒计时时长。</div>
 
         <Time :preTime="preTime" v-if="timeDialogVisible"></Time>
 
       </div>
 
       <div slot="footer">
 
@@ -6766,9 +6767,9 @@
 
       :before-close="handleClose" class="dialog_diy">
 
       <div class="groupBox">
 
         <div v-if="groupJson2.group" class="groupContent">
 
-          <div class="groupTitle">请设置小组数量</div>
 
+          <div class="groupTitle">请设置小组数量及名称</div>
 
           <div v-for="(item, index) in groupJson2.group" :key="index" class="groupName">
 
-            <span class="groupn">组{{ index + 1 }}名称:</span>
 
+            <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)">
 
@@ -6779,11 +6780,11 @@
 
           </div>
 
         </div>
 
         <div class="groupContent">
 
-          <div class="groupTitle">请设置每组人数数量</div>
 
+          <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="groupJson2.number" :controls="false" :min="2" :max="10"
 
-            placeholder="2-10人以内"></el-input-number>
 
+            placeholder="请输入2-10的数字"></el-input-number>
 
         </div>
 
       </div>
 
       <span slot="footer" class="dialog-footer">

+ 7 - 7
src/components/easy3/studyStudent.vue
View File 

@@ -7934,6 +7934,7 @@
 
           >
 
             <div
 
               class="queTop"
 
+              @click="isClose = !isClose"
 
               style="padding: 15px 0 15px 37px; justify-content: space-between"
 
             >
 
               <div class="queTopTitle">新增工具</div>
 
@@ -7941,7 +7942,6 @@
 
                 <div
 
                   class="queTopClose"
 
                   v-if="isClose == 0"
 
-                  @click="isClose = 1"
 
                 >
 
                   展开
 
                   <div class="closeImg">
 
@@ -7951,7 +7951,6 @@
 
                 <div
 
                   class="queTopClose"
 
                   v-if="isClose == 1"
 
-                  @click="isClose = 0"
 
                 >
 
                   收缩
 
                   <div class="openImg">
 
@@ -7963,7 +7962,7 @@
 
                   type="primary"
 
                   size="small"
 
                   v-if="isClose == 1 && checktoolArray.length > 0"
 
-                  @click="addToolChoose"
 
+                  @click.stop="addToolChoose"
 
                   >确定</el-button
 
                 >
 
               </div>
 
@@ -9410,6 +9409,7 @@
 
       class="dialog_diy"
 
     >
 
       <div>
 
+        <div style="margin-bottom: 20px;color: #999;">提示：点击“+”或“-”修改倒计时时长。</div>
 
         <Time :preTime="preTime" v-if="timeDialogVisible"></Time>
 
       </div>
 
       <div slot="footer">
 
@@ -11277,13 +11277,13 @@
 
     >
 
       <div class="groupBox">
 
         <div v-if="groupJson2.group" class="groupContent">
 
-          <div class="groupTitle">请设置小组数量</div>
 
+          <div class="groupTitle">请设置小组数量及名称</div>
 
           <div
 
             v-for="(item, index) in groupJson2.group"
 
             :key="index"
 
             class="groupName"
 
           >
 
-            <span class="groupn">组{{ index + 1 }}名称:</span>
 
+            <span class="groupn">第{{ index + 1 }}组名称:</span>
 
             <el-input
 
               v-model="item.name"
 
               placeholder="请输入名称..."
 
@@ -11298,7 +11298,7 @@
 
           </div>
 
         </div>
 
         <div class="groupContent">
 
-          <div class="groupTitle">请设置每组人数数量</div>
 
+          <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
 
@@ -11306,7 +11306,7 @@
 
             :controls="false"
 
             :min="2"
 
             :max="10"
 
-            placeholder="2-10人以内"
 
+            placeholder="请输入2-10的数字"
 
           ></el-input-number>
 
         </div>
 
       </div>

+ 4 - 4
src/components/group/group.vue
View File 

@@ -280,9 +280,9 @@
 
             :before-close="handleClose" class="dialog_diy">
 
             <div class="groupBox">
 
                 <div v-if="groupJson2.group" class="groupContent">
 
-                    <div class="groupTitle">请设置小组数量</div>
 
+                    <div class="groupTitle">请设置小组数量及名称</div>
 
                     <div v-for="(item, index) in groupJson2.group" :key="index" class="groupName">
 
-                        <span class="groupn">组{{ index + 1 }}名称:</span>
 
+                        <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)">
 
@@ -293,9 +293,9 @@
 
                     </div>
 
                 </div>
 
                 <div class="groupContent">
 
-                    <div class="groupTitle">请设置每组人数数量</div>
 
+                    <div class="groupTitle">请设置每组人数</div>
 
                     <el-input-number v-model="groupJson2.number" :controls="false" :min="2" :max="10"
 
-                        placeholder="2-10人以内"></el-input-number>
 
+                        placeholder="请输入2-10的数字"></el-input-number>
 
                 </div>
 
             </div>
 
             <span slot="footer" class="dialog-footer">

+ 14 - 12
src/components/studyStudent.vue
View File 

@@ -6349,6 +6349,7 @@
 
             >
 
               <div
 
                 class="queTop"
 
+                @click="isClose = !isClose"
 
                 style="
 
                   padding: 15px 0 15px 37px;
 
                   justify-content: space-between;
 
@@ -6359,7 +6360,6 @@
 
                   <div
 
                     class="queTopClose"
 
                     v-if="isClose == 0"
 
-                    @click="isClose = 1"
 
                   >
 
                     展开
 
                     <div class="closeImg">
 
@@ -6369,7 +6369,6 @@
 
                   <div
 
                     class="queTopClose"
 
                     v-if="isClose == 1"
 
-                    @click="isClose = 0"
 
                   >
 
                     收缩
 
                     <div class="openImg">
 
@@ -6381,7 +6380,7 @@
 
                     type="primary"
 
                     size="small"
 
                     v-if="isClose == 1 && checktoolArray.length > 0"
 
-                    @click="addToolChoose"
 
+                    @click.stop="addToolChoose"
 
                     >确定</el-button
 
                   >
 
                 </div>
 
@@ -8119,6 +8118,7 @@
 
       class="dialog_diy"
 
     >
 
       <div>
 
+        <div style="margin-bottom: 20px;color: #999;">提示：点击“+”或“-”修改倒计时时长。</div>
 
         <Time :preTime="preTime" v-if="timeDialogVisible"></Time>
 
       </div>
 
       <div slot="footer">
 
@@ -9967,13 +9967,13 @@
 
     >
 
       <div class="groupBox">
 
         <div v-if="groupJson2.group" class="groupContent">
 
-          <div class="groupTitle">请设置小组数量</div>
 
+          <div class="groupTitle">请设置小组数量及名称</div>
 
           <div
 
             v-for="(item, index) in groupJson2.group"
 
             :key="index"
 
             class="groupName"
 
           >
 
-            <span class="groupn">组{{ index + 1 }}名称:</span>
 
+            <span class="groupn">第{{ index + 1 }}组名称:</span>
 
             <el-input
 
               v-model="item.name"
 
               placeholder="请输入名称..."
 
@@ -9988,7 +9988,7 @@
 
           </div>
 
         </div>
 
         <div class="groupContent">
 
-          <div class="groupTitle">请设置每组人数数量</div>
 
+          <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
 
@@ -9996,7 +9996,7 @@
 
             :controls="false"
 
             :min="2"
 
             :max="10"
 
-            placeholder="2-10人以内"
 
+            placeholder="请输入2-10的数字"
 
           ></el-input-number>
 
         </div>
 
       </div>
 
@@ -14036,12 +14036,14 @@ export default {
 
         this.$message.error("已经开启跟随模式，请认真跟堂听讲");
 
         return;
 
       }
 
-      for(var k=0;k<this.navList.length;k++){
 
-        this.navList[k].isOpen = false;
 
+      // for(var k=0;k<this.navList.length;k++){
 
+      //   this.navList[k].isOpen = false;
 
+      // }
 
+      // this.navList[i].isOpen = true;
 
+      this.navList[i].isOpen = !this.navList[i].isOpen;
 
+      if(this.navList[i].isOpen){
 
+        this.openTask(i, 0, i + "-0");
 
       }
 
-      this.navList[i].isOpen = true;
 
-      // this.navList[i].isOpen = !this.navList[i].isOpen;
 
-      this.openTask(i, 0, i + "-0");
 
     },
 
     addQuestion() {
 
       this.answerList.push({

+ 2 - 1
src/components/tools/time.vue
View File 

@@ -242,9 +242,10 @@ button[data-setter]:hover {
 
 }
 
 .controlls {
 
   position: absolute;
 
-  left: 75px;
 
+  left: 70px;
 
   top: 105px;
 
   text-align: center;
 
+  width: 170px;
 
 }
 
 .display-remain-time {
 
   font-family: "Roboto";

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