Inicio Explorar Ayuda
Iniciar sesión
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

update

lsc hace 1 año
padre
e16f54290c
commit
72da67d139
Se han modificado 15 ficheros con 93 adiciones y 68 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.2fd3839c8a3af6dd3bc891498dccad1d.css
  3. 0 0
      dist/static/css/app.2fd3839c8a3af6dd3bc891498dccad1d.css.map
  4. 0 0
      dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css
  5. 0 0
      dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css.map
  6. 0 0
      dist/static/js/app.007b8b87ccbcdb73aa7f.js
  7. 0 0
      dist/static/js/app.007b8b87ccbcdb73aa7f.js.map
  8. 0 0
      dist/static/js/app.99652a1fa67b1c8516e9.js
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. 22 22
      src/App.vue
  11. BIN
      src/assets/icon/new/course.png
  12. 21 13
      src/components/pages/addCourse.vue
  13. 21 14
      src/components/pages/easy/addCourse.vue
  14. 4 3
      src/components/pages/student.vue
  15. 24 15
      src/components/pages/task/addCourse.vue

+ 1 - 1
dist/index.html
Ver fichero 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.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.99652a1fa67b1c8516e9.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.2fd3839c8a3af6dd3bc891498dccad1d.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.007b8b87ccbcdb73aa7f.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.2fd3839c8a3af6dd3bc891498dccad1d.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.2fd3839c8a3af6dd3bc891498dccad1d.css.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.007b8b87ccbcdb73aa7f.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.007b8b87ccbcdb73aa7f.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.99652a1fa67b1c8516e9.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 22 - 22
src/App.vue
Ver fichero 

@@ -419,50 +419,50 @@ html::-webkit-scrollbar-thumb {
 
   z-index: 999999999 !important;
 
 }
 
 .el-message-box{
 
-  padding-bottom: 20px;
 
+  padding-bottom: 20px !important;
 
 }
 
 .el-message-box__header{
 
-  font-weight: 700;
 
+  font-weight: 700 !important;
 
 }
 
 .el-message-box__content{
 
-  padding: 10px 15px 25px;
 
+  padding: 10px 15px 25px !important;
 
 }
 
 .el-icon-warning:before{
 
-  content: '';
 
-  width: 20px;
 
-  height: 20px;
 
-  display: block;
 
-  background-image: url("./assets/icon/new/tips.png");
 
-  background-size: 100% 100%;
 
+  content: '' !important;
 
+  width: 20px !important;
 
+  height: 20px !important;
 
+  display: block !important;
 
+  background-image: url("./assets/icon/new/tips.png") !important;
 
+  background-size: 100% 100% !important;
 
 }
 
 .el-message-box__status+.el-message-box__message{
 
-  padding-left: 30px;
 
+  padding-left: 30px !important;
 
 }
 
 .el-message-box__btns{
 
-  text-align: center;
 
+  text-align: center !important;
 
 }
 
 
 .el-message-box__btns > .el-button--small{
 
-  border: 1px solid #CAD1DC;
 
-  background: #E7EBF1;
 
-  color: #060E17;
 
+  border: 1px solid #CAD1DC !important;
 
+  background: #E7EBF1 !important;
 
+  color: #060E17 !important;
 
 }
 
 
 .el-message-box__btns > .el-button--small:hover{
 
-  background: #CAD1DC;
 
-  color: #060E17;
 
+  background: #CAD1DC !important;
 
+  color: #060E17 !important;
 
 }
 
 
 .el-message-box__btns > .el-button--primary{
 
-  border: 1px solid #EE3E3E;
 
-  background: #EE3E3E;
 
-  color: #fff;
 
+  border: 1px solid #EE3E3E !important;
 
+  background: #EE3E3E !important;
 
+  color: #fff !important;
 
 }
 
 
 .el-message-box__btns > .el-button--primary:hover{
 
-  border: 1px solid #cd3434;
 
-  background: #cd3434;
 
-  color: #fff;
 
+  border: 1px solid #cd3434 !important;
 
+  background: #cd3434 !important;
 
+  color: #fff !important;
 
 }
 
 
 .el-checkbox:hover .el-checkbox__label{

BIN
src/assets/icon/new/course.png
Ver fichero


+ 21 - 13
src/components/pages/addCourse.vue
Ver fichero 

@@ -96,9 +96,9 @@
 
                       }">
 
                         <div style="width: 100%;">
 
                           <div class="course_input_box">
 
-                            <div class="bb_courseIcon"><img src="../../assets/icon/new/course_icon.png" /></div>
 
+                            <div class="bb_courseIcon"><img src="../../assets/icon/new/course.png" /></div>
 
                             <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName"
 
-                              style="border: 1.5px solid #CAD1DC;background: #f6f6f6;" />
 
+                            style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;" />
 
                             <el-switch v-model="isTeacherSee" active-text="是否公开此课程" style="justify-content: center;width: 200px;"></el-switch>
 
                           </div>
 
                         </div>
 
@@ -3251,7 +3251,7 @@
 
               <div class="sentenTop" :index="stIndex + 1">
 
                 <div>题目设置</div>
 
                 <div>
 
-                  <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle"></el-input>
 
+                  <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle" :maxlength="10"></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
                 <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
@@ -4467,6 +4467,8 @@ export default {
 
     },
 
     unitSet(i) {
 
       this.unitIndex = i;
 
+      this.isClickColor = 1
 
+      
       // this.$refs.rightboxR.scrollTop = 0;
 
       this.$refs.unitBox.scrollTop = 0
 
     },
 
@@ -8524,9 +8526,8 @@ export default {
 
       if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
       }else{
 
-        $(".rightBox")[0].scrollTop =
 
-        $(".taskBorder")[i + 1].offsetTop +
 
-        $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
+        document.querySelectorAll(".basic_box")[0].scrollTop =
 
+        document.querySelectorAll(".taskBorder")[i].offsetTop - 100;
 
       this.isClickColor = i + 1;
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
       }
 
@@ -8880,6 +8881,7 @@ export default {
 
       let target = document.querySelector(`#gj${i}${j}`);
 
       if (target) {
 
         target.scrollIntoView(true);
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolChoose[j].isFold3 = true
 
         setTimeout(() => {
 
           this.$refs.unitBox.scrollTop = this.$refs.unitBox.scrollTop - 100;
 
         }, 0);
 
@@ -9645,21 +9647,26 @@ export default {
 
   margin-right: 20px;
 
   width: 100%;
 
   align-items: center;
 
+  position: relative;
 
 }
 
 
 .course_input_box>.binfo_input {
 
-  width: calc(100% - 48px - 200px - 20px);
 
+  width: calc(100% - 0 - 200px - 20px);
 
   margin: 0 10px;
 
 }
 
 
 .bb_courseIcon {
 
-  width: 48px;
 
-  height: 48px;
 
-  background: #3681FC;
 
-  border-radius: 6px;
 
+  width: 57px;
 
+  height: 45px;
 
+  background: #F0F4FA;
 
+  border-radius: 5px 0px 0px 5px;
 
   display: flex;
 
   align-items: center;
 
   justify-content: center;
 
+  border-right:  1.5px solid rgb(202, 209, 220);
 
+  box-sizing: border-box;
 
+  position: absolute;
 
+  left:1.5px
 
 }
 
 
 .bb_courseIcon>img {
 
@@ -11913,7 +11920,8 @@ ol {
 
 
 .isCard,
 
 .isCard1 {
 
-  width: 200px;
 
+  width: auto;
 
+  padding: 0 20px;
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
@@ -11938,7 +11946,7 @@ ol {
 
   white-space: nowrap;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
-  width: 80%;
 
+  width: 100%;
 
   margin: 0 auto;
 
 }

+ 21 - 14
src/components/pages/easy/addCourse.vue
Ver fichero 

@@ -41,9 +41,10 @@
 
                       }">
 
                         <div style="width: 100%;">
 
                           <div class="course_input_box">
 
-                            <div class="bb_courseIcon"><img src="../../../assets/icon/new/course_icon.png" /></div>
 
+                            <div class="bb_courseIcon"><img src="../../../assets/icon/new/course.png" /></div>
 
                             <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName"
 
-                              style="border: 1.5px solid #CAD1DC;background: #f6f6f6;" />
 
+                            style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;" />
 
+                              <!-- background: #f6f6f6; -->
 
                             <el-switch v-model="isTeacherSee" active-text="是否公开此课程"
 
                               style="justify-content: center;width: 200px;"></el-switch>
 
                           </div>
 
@@ -4202,7 +4203,7 @@
 
               <div class="sentenTop" :index="stIndex + 1">
 
                 <div>题目设置</div>
 
                 <div>
 
-                  <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle"></el-input>
 
+                  <el-input placeholder="请输入卡片内容" v-model="st.sentenceTitle" :maxlength="10"></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
                 <div class="remove1" v-if="sentenceList.length > 1" @click="deleteSentence(stIndex)"></div>
 
@@ -9192,9 +9193,9 @@ export default {
 
       if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
       }else{
 
-        $(".rightBox")[0].scrollTop =
 
-        $(".taskBorder")[i + 1].offsetTop +
 
-        $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
+        document.querySelectorAll(".rightBox")[0].scrollTop =
 
+        document.querySelectorAll(".taskBorder")[i + 1].offsetTop +
 
+        document.querySelectorAll(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
       this.isClickColor = i + 1;
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
       }
 
@@ -9529,6 +9530,7 @@ export default {
 
       let target = document.querySelector(`#gj${i}${j}`);
 
       if (target) {
 
         target.scrollIntoView(true);
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolChoose[j].isFold3 = true
 
         // setTimeout(() => {
 
         //   this.$refs.rightboxR.scrollTop = this.$refs.rightboxR.scrollTop - 100;
 
         // }, 0);
 
@@ -10296,21 +10298,26 @@ export default {
 
   margin-right: 20px;
 
   width: 100%;
 
   align-items: center;
 
+  position: relative;
 
 }
 
 
 .course_input_box>.binfo_input {
 
-  width: calc(100% - 48px - 200px - 20px);
 
+  width: calc(100% - 0 - 200px - 20px);
 
   margin: 0 10px;
 
 }
 
 
 .bb_courseIcon {
 
-  width: 48px;
 
-  height: 48px;
 
-  background: #3681FC;
 
-  border-radius: 6px;
 
+  width: 57px;
 
+  height: 45px;
 
+  background: #F0F4FA;
 
+  border-radius: 5px 0px 0px 5px;
 
   display: flex;
 
   align-items: center;
 
   justify-content: center;
 
+  border-right:  1.5px solid rgb(202, 209, 220);
 
+  box-sizing: border-box;
 
+  position: absolute;
 
+  left:1.5px
 
 }
 
 
 .bb_courseIcon>img {
 
@@ -12461,7 +12468,8 @@ ol {
 
 
 .isCard,
 
 .isCard1 {
 
-  width: 200px;
 
+  width: auto;
 
+  padding: 0 20px;
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
@@ -12486,10 +12494,9 @@ ol {
 
   white-space: nowrap;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
-  width: 80%;
 
+  width: 100%;
 
   margin: 0 auto;
 
 }
 
-
 
 .card {
 
   width: 140px;
 
   height: 65px;

+ 4 - 3
src/components/pages/student.vue
Ver fichero 

@@ -20,7 +20,7 @@
 
         </div>
 
         <div class="head_right">
 
           <el-button @click="addStudent">添加学生</el-button>
 
-          <el-upload v-show="false" class="upload-demo newCss" :http-request="handleChange" :on-remove="handleRemove"
 
+          <el-upload v-show="role == 1" class="upload-demo newCss" :http-request="handleChange" :on-remove="handleRemove"
 
             action="#" :file-list="fileListUpload" accept=".xlsx">
 
             <el-button size="primary" type="primary">批量添加</el-button>
 
             <div slot="tip" class="el-upload__tip" style="margin-left: 10px">
 
@@ -28,7 +28,7 @@
 
             </div>
 
           </el-upload>
 
           <!-- <el-button @click="exportExcel">导出学生</el-button> -->
 
-          <div @click="getExcel" v-show="false">xls 上传样例</div>
 
+          <div @click="getExcel" v-show="role == 1">xls 上传样例</div>
 
         </div>
 
       </div>
 
     </div>
 
@@ -234,6 +234,7 @@ export default {
 
       userid: this.$route.query.userid,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
+      role: this.$route.query.role,
 
       cid: "",
 
       tx: require("../../assets/avatar.png"),
 
       userSuffix:""
 
@@ -295,7 +296,7 @@ export default {
 
     getExcel(res) {
 
       require.ensure([], () => {
 
         const { export_json_to_excel } = require("../../common/Export2Excel");
 
-        const tHeader = ["学号", "学生姓名", "学生账号", "学生手机号", "班级"];
 
+        const tHeader = ["学生姓名", "学生账号", "班级"];//"学号", "学生手机号", 
         const data = [];
 
         export_json_to_excel(tHeader, data, "上传学生样例");
 
       });

+ 24 - 15
src/components/pages/task/addCourse.vue
Ver fichero 

@@ -54,9 +54,9 @@
 
                       }">
 
                         <div style="width: 100%;">
 
                           <div class="course_input_box">
 
-                            <div class="bb_courseIcon"><img src="../../../assets/icon/new/course_icon.png" /></div>
 
+                            <div class="bb_courseIcon"><img src="../../../assets/icon/new/course.png" /></div>
 
                             <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName"
 
-                              style="border: 1.5px solid #CAD1DC;background: #f6f6f6;" />
 
+                            style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;" />
 
                             <el-switch v-model="isTeacherSee" active-text="是否公开此课程" style="justify-content: center;width: 200px;"></el-switch>
 
                           </div>
 
                         </div>
 
@@ -6564,6 +6564,7 @@
 
                   <el-input
 
                     placeholder="请输入卡片内容"
 
                     v-model="st.sentenceTitle"
 
+                    :maxlength="10"
 
                   ></el-input>
 
                 </div>
 
                 <div @click="addSen(stIndex)">添加</div>
 
@@ -11645,9 +11646,9 @@ export default {
 
       if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
       }else{
 
-        $(".rightBox")[0].scrollTop =
 
-        $(".taskBorder")[i + 1].offsetTop +
 
-        $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
+        document.querySelectorAll(".rightBox")[0].scrollTop =
 
+        document.querySelectorAll(".taskBorder")[i].offsetTop +
 
+        document.querySelectorAll(".taskBorder")[i].parentElement.parentElement.offsetTop;
 
       this.isClickColor = i + 1;
 
         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
       }
 
@@ -11955,6 +11956,7 @@ export default {
 
       let target = document.querySelector(`#gj${i}${j}`);
 
       if (target) {
 
         target.scrollIntoView(true);
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolChoose[j].isFold3 = true
 
         // setTimeout(() => {
 
         //   this.$refs.rightboxR.scrollTop = this.$refs.rightboxR.scrollTop - 100;
 
         // }, 0);
 
@@ -12722,21 +12724,26 @@ export default {
 
   margin-right: 20px;
 
   width: 100%;
 
   align-items: center;
 
+  position: relative;
 
 }
 
 
 .course_input_box>.binfo_input {
 
-  width: calc(100% - 48px - 200px - 20px);
 
+  width: calc(100% - 0 - 200px - 20px);
 
   margin: 0 10px;
 
 }
 
 
 .bb_courseIcon {
 
-  width: 48px;
 
-  height: 48px;
 
-  background: #3681FC;
 
-  border-radius: 6px;
 
+  width: 57px;
 
+  height: 45px;
 
+  background: #F0F4FA;
 
+  border-radius: 5px 0px 0px 5px;
 
   display: flex;
 
   align-items: center;
 
   justify-content: center;
 
+  border-right:  1.5px solid rgb(202, 209, 220);
 
+  box-sizing: border-box;
 
+  position: absolute;
 
+  left:1.5px
 
 }
 
 
 .bb_courseIcon>img {
 
@@ -12744,6 +12751,7 @@ export default {
 
   height: auto
 
 }
 
 
+
 
 .big_box {
 
   /* margin-top: 20px; */
 
   display: flex;
 
@@ -14882,9 +14890,11 @@ ol {
 
   align-content: center;
 
 }
 
 
+.isCard,
 
 .isCard,
 
 .isCard1 {
 
-  width: 200px;
 
+  width: auto;
 
+  padding: 0 20px;
 
   height: 65px;
 
   text-align: center;
 
   line-height: 65px;
 
@@ -14904,15 +14914,14 @@ ol {
 
   display: block;
 
 }
 
 
-.isCard > div:nth-child(1),
 
-.isCard1 > div:nth-child(1) {
 
+.isCard>div:nth-child(1),
 
+.isCard1>div:nth-child(1) {
 
   white-space: nowrap;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
-  width: 80%;
 
+  width: 100%;
 
   margin: 0 auto;
 
 }
 
-
 
 .card {
 
   width: 140px;
 
   height: 65px;

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio