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
46cdc9dfe3
commit
7401a8d30f
13 changed files with 102 additions and 25 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.1faf5d309d1bf383d93e2e4012aa2ae1.css
  3. 0 0
      dist/static/css/app.1faf5d309d1bf383d93e2e4012aa2ae1.css.map
  4. 0 0
      dist/static/css/app.5cd65174590a1881fa1323e18c391774.css
  5. 0 0
      dist/static/css/app.5cd65174590a1881fa1323e18c391774.css.map
  6. 0 0
      dist/static/js/app.7d961b3159cb66ea4592.js
  7. 0 0
      dist/static/js/app.87686cc0a0510aefae71.js
  8. 0 0
      dist/static/js/app.87686cc0a0510aefae71.js.map
  9. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  10. 1 1
      src/components/courseDetail.vue
  11. 1 1
      src/components/group/group.vue
  12. 31 2
      src/components/index.vue
  13. 68 20
      src/components/studyStudent.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.5cd65174590a1881fa1323e18c391774.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.257b11831736f4184ff9.js></script><script type=text/javascript src=./static/js/app.7d961b3159cb66ea4592.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.1faf5d309d1bf383d93e2e4012aa2ae1.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.257b11831736f4184ff9.js></script><script type=text/javascript src=./static/js/app.87686cc0a0510aefae71.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.1faf5d309d1bf383d93e2e4012aa2ae1.css


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


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


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


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


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


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


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


+ 1 - 1
src/components/courseDetail.vue
View File 

@@ -74,7 +74,7 @@
 
               <div class="cType" style="font-size: 18px; color: #6c6c6c" v-if="classList.length && tType != 2">
 
                 <div>
 
                   授课班级:<el-button @click="gotoCourse('')"
 
-                    style="background: #4a9eed; color: #fff; margin: 0 5px">全部</el-button><el-button
 
+                    style="background: #4a9eed; color: #fff; margin: 0 5px" v-if="classList.length != 1">全部</el-button><el-button
 
                     @click="gotoCourse(item.id)" v-for="(item, index) in classList" :key="index"
 
                     style="background: #4a9eed; color: #fff; margin: 0 5px">{{ item.name }}</el-button>
 
                 </div>

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

@@ -1029,7 +1029,7 @@ export default {
 
 
 .btn_right {
 
     display: flex;
 
-    align-items: flex-end;
 
+    align-items: center;
 
 }
 
 
 .updateChair {

+ 31 - 2
src/components/index.vue
View File 

@@ -496,6 +496,21 @@ export default {
 
         this.selectAll2();
 
       }
 
     },
 
+    arrayToArray(arrayo, arrayt) {
 
+      let array1 = arrayo;
 
+      let array2 = arrayt;
 
+
 
+      let commonElements = [];
 
+
 
+      for (let i = 0; i < array1.length; i++) {
 
+        for (let j = 0; j < array2.length; j++) {
 
+          if (array1[i] === array2[j]) {
 
+            commonElements.push(array1[i]);
 
+          }
 
+        }
 
+      }
 
+      return commonElements;
 
+    },
 
     selectAll() {
 
       this.zoneListId = 0;
 
       this.isListAjax = true;
 
@@ -523,10 +538,24 @@ export default {
 
           this.zoneClass = res.data[0];
 
           // this.total = res.data[0].length ? res.data[0][0].num : 0;
 
           let CourseType2 = JSON.parse(JSON.stringify(this.CourseType[0]))
 
+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
 
+            if(this.pTypeCheckName.length){
 
+              CourseType2 = this.CourseType3.filter(el => {
 
+                return el.name == this.pTypeCheckName
 
+              })
 
+            }else{
 
+              CourseType2 = JSON.parse(JSON.stringify(this.CourseType3))
 
+            }
 
+          }
 
           for (var i = 0; i < CourseType2.length; i++) {
 
             CourseType2[i].course = []
 
             for (var j = 0; j < res.data[0].length; j++) {
 
-              if (res.data[0][j].pid && res.data[0][j].pid.indexOf(CourseType2[i].id) != -1) {
 
+              // if (res.data[0][j].pid && res.data[0][j].pid.indexOf(CourseType2[i].id) != -1) {
 
+              //   CourseType2[i].course.push(res.data[0][j])
 
+              // }
 
+              let pid = CourseType2[i].id
 
+              if(typeof pid != "object") pid.split(",")
 
+              if(res.data[0][j].pid && this.arrayToArray(pid,res.data[0][j].pid.split(",").length)){
 
                 CourseType2[i].course.push(res.data[0][j])
 
               }
 
             }
 
@@ -537,7 +566,7 @@ export default {
 
               noTypeCourse.push(res.data[0][j])
 
             }
 
           }
 
-          if (noTypeCourse.length > 0) {
 
+          if (noTypeCourse.length > 0 && !this.pTypeCheckName.length) {
 
             CourseType2.push({
 
               course: noTypeCourse,
 
               name: '其他'

+ 68 - 20
src/components/studyStudent.vue
View File 

@@ -2492,7 +2492,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -2644,7 +2644,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -2796,7 +2796,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -3035,7 +3035,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -3195,7 +3195,7 @@
 
                       </div>
 
                     </div>
 
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -3336,7 +3336,7 @@
 
                       </div>
 
                     </div>
 
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -3643,7 +3643,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -3916,7 +3916,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -4189,7 +4189,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -4462,7 +4462,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -4734,7 +4734,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -4835,7 +4835,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -4959,7 +4959,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -5124,7 +5124,7 @@
 
                         </div>
 
                       </div> -->
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -5347,7 +5347,7 @@
 
                         />
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -5498,7 +5498,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -5720,7 +5720,7 @@
 
                         </div>
 
                       </div>
 
                     </div>
 
-                    <div style="font-size: 18px">未提交</div>
 
+                    <div style="font-size: 18px" v-if="courseDetail.juri != ''">未提交</div>
 
                     <div class="noWorksS">
 
                       <div
 
                         v-for="(s, sIndex) in noWorksS[toolIndex]"
 
@@ -8476,7 +8476,10 @@
 
       class="dialog_diy"
 
     >
 
       <el-form>
 
-        <div>表格内容</div>
 
+        <div>
 
+          <span>表格内容</span>  
+          <el-button type="primary" size="small" @click="returnTableText">还原模板</el-button>
 
+        </div>
 
         <Table
 
           v-model="tableJson.text"
 
           @change="change"
 
@@ -8521,7 +8524,10 @@
 
       class="dialog_diy"
 
     >
 
       <el-form>
 
-        <div>文档内容</div>
 
+        <div>
 
+          <span>文档内容</span> 
+          <el-button type="primary" size="small" @click="returnWordText">还原模板</el-button>
 
+        </div>
 
         <editor-bar
 
           v-model="wordJson.text"
 
           v-if="dialogVisibleWord"
 
@@ -9368,7 +9374,9 @@ export default {
 
       sentenceList: [{ sentenceTitle: "", addSentence: [], rightAnswer: [] }],
 
       sentenceList1: [],
 
       tableJson: [],
 
+      tableJsonO: [],
 
       wordJson: [],
 
+      wordJsonO: [],
 
       vedio: [],
 
       text: [],
 
       textList: [],
 
@@ -9802,6 +9810,17 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
+    returnTableText(){
 
+      this.$confirm("确定还原此模板吗？", "提示", {
 
+        confirmButtonText: "确定",
 
+        cancelButtonText: "取消",
 
+        type: "warning",
 
+      })
 
+        .then(() => {
 
+          this.tableJson = JSON.parse(JSON.stringify(this.tableJsonO))
 
+        })
 
+        .catch(() => {});
 
+    },
 
     addTableWorks() {
 
       let params = [
 
         {
 
@@ -9860,6 +9879,17 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
+    returnWordText(){
 
+      this.$confirm("确定还原此模板吗？", "提示", {
 
+        confirmButtonText: "确定",
 
+        cancelButtonText: "取消",
 
+        type: "warning",
 
+      })
 
+        .then(() => {
 
+          this.wordJson = JSON.parse(JSON.stringify(this.wordJsonO))
 
+        })
 
+        .catch(() => {});
 
+    },
 
     addWordWorks() {
 
       let params = [{
 
         uid: this.userid,
 
@@ -14496,6 +14526,7 @@ export default {
 
               )
 
             )
 
           : { text: "" };
 
+          this.tableJsonO = JSON.parse(JSON.stringify(this.tableJson))
 
         if (this.worksStudent[i].length) {
 
           for (var k = 0; k < this.worksStudent[i].length; k++) {
 
             if (this.userid == this.worksStudent[i][k].userid) {
 
@@ -14516,6 +14547,15 @@ export default {
 
               )
 
             )
 
           : { text: "" };
 
+        this.wordJsonO = JSON.parse(JSON.stringify(this.wordJson))
 
+        if (this.worksStudent[i].length) {
 
+          for (var k = 0; k < this.worksStudent[i].length; k++) {
 
+            if (this.userid == this.worksStudent[i][k].userid) {
 
+              this.wordJson = JSON.parse(this.worksStudent[i][k].works);
 
+              break;
 
+            }
 
+          }
 
+        }
 
         this.dialogVisibleWord = true;
 
       } else if (t == 49) {
 
         this.groupJson =
 
@@ -14554,6 +14594,14 @@ export default {
 
               )
 
             )
 
           : { text: "" };
 
+        if (this.worksStudent[i].length) {
 
+          for (var k = 0; k < this.worksStudent[i].length; k++) {
 
+            if (this.sStudent.userid == this.worksStudent[i][k].userid) {
 
+              this.wordJson = JSON.parse(this.worksStudent[i][k].works);
 
+              break;
 
+            }
 
+          }
 
+        }
 
         this.dialogVisibleWordTeacher = true; //文档
 
       } else if (t == 4) {
 
         this.radio = [];
 
@@ -18684,7 +18732,7 @@ ol {
 
 .g_d_btnBox {
 
   display: flex;
 
   justify-content: flex-end;
 
-  align-items: flex-end;
 
+  align-items: center;
 
   margin-bottom: 20px;
 
 }

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