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

1

zengyicheng 3 years ago
parent
20481f4019
commit
f330f33fd1
11 changed files with 34 additions and 4 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.2e96f4b162026476f7df0c3c4620f107.css.map
  3. 0 0
      dist/static/css/app.4bcd93a537fdf8de93d0444ddb771d05.css
  4. 0 0
      dist/static/css/app.4bcd93a537fdf8de93d0444ddb771d05.css.map
  5. 0 0
      dist/static/js/app.e89c1b4ef95b5a453a7e.js
  6. 0 0
      dist/static/js/app.e89c1b4ef95b5a453a7e.js.map
  7. 0 0
      dist/static/js/app.f023b532a31fd4cdbdfb.js
  8. 0 0
      dist/static/js/app.f023b532a31fd4cdbdfb.js.map
  9. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  10. 31 1
      src/components/courseDetail.vue
  11. 2 2
      src/components/study.vue

+ 1 - 1
dist/index.html
View File 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.2e96f4b162026476f7df0c3c4620f107.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.35062edb107d42aa0826.js></script><script type=text/javascript src=./static/js/app.f023b532a31fd4cdbdfb.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.4bcd93a537fdf8de93d0444ddb771d05.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.35062edb107d42aa0826.js></script><script type=text/javascript src=./static/js/app.e89c1b4ef95b5a453a7e.js></script></body></html>

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


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


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


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


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


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


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


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


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

@@ -36,6 +36,15 @@
 
                   {{ courseDetail.vcount != null ? courseDetail.vcount : 0 }}人
 
                   {{ courseDetail.vcount != null ? courseDetail.vcount : 0 }}人
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
+              <div class="cType">
 
+                <div
 
+                  v-for="(item, index) in courseType"
 
+                  :key="index"
 
+                  style="margin: 10px 10px 0 0"
 
+                >
 
+                  <span>{{ item }}</span>
 
+                </div>
 
+              </div>
 
               <div class="now_study" @click="dialogVisible = true">
 
               <div class="now_study" @click="dialogVisible = true">
 
                 立即学习
 
                 立即学习
 
               </div>
 
               </div>
 
@@ -152,6 +161,7 @@ export default {
 
       courseDetail: {},
 
       courseDetail: {},
 
       aStudentName: [],
 
       aStudentName: [],
 
       chapInfo: [],
 
       chapInfo: [],
 
+      courseType: [],
 
       mr: require("../assets/icon/wheel.png"),
 
       mr: require("../assets/icon/wheel.png"),
 
     };
 
     };
 
   },
 
   },
 
@@ -228,7 +238,17 @@ export default {
 
           loading.close();
 
           loading.close();
 
           // this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           // this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
           this.courseDetail = res.data[0][0];
 
           this.courseDetail = res.data[0][0];
 
-          this.aStudentName = res.data[1];
 
+          var a = res.data[0];
 
+          var b = res.data[1];
 
+          for (var i = 0; i < a.length; i++) {
 
+            for (var j = 0; j < b.length; j++) {
 
+              if (a[i].pid == b[j].id) {
 
+                this.courseType.push(b[j].name + ":" + a[i].name);
 
+              }
 
+            }
 
+          }
 
+          console.log(this.courseType);
 
+          this.aStudentName = res.data[2];
 
           this.chapInfo = JSON.parse(this.courseDetail.chapters);
 
           this.chapInfo = JSON.parse(this.courseDetail.chapters);
 
         })
 
         })
 
         .catch((err) => {
 
         .catch((err) => {
 
@@ -480,4 +500,14 @@ export default {
 
   width: 100%;
 
   width: 100%;
 
   height: 100%;
 
   height: 100%;
 
 }
 
 }
 
+.cType {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: center;
 
+  align-items: center;
 
+}
 
+.cType > div > span {
 
+  font-size: 18px;
 
+  font-weight: bold;
 
+}
 
 </style>
 
 </style>

+ 2 - 2
src/components/study.vue
View File 

@@ -211,9 +211,10 @@
 
             <div class="upFile" v-if="type == 3 || type == 4">提交</div>
 
             <div class="upFile" v-if="type == 3 || type == 4">提交</div>
 
           </div>
 
           </div>
 
           <div class="project_box" v-if="type == 5">
 
           <div class="project_box" v-if="type == 5">
 
+            <div class="filebox" v-if="chapInfo.chapterInfo[0].toolChoose.length == 0">暂无数据</div>
 
             <div
 
             <div
 
               class="filebox"
 
               class="filebox"
 
-              v-if="chapInfo.chapterInfo[0].toolChoose.length > 0"
 
+              v-else
 
             >
 
             >
 
               <div style="    display: flex;
 
               <div style="    display: flex;
 
     width: 100%;
 
     width: 100%;
 
@@ -257,7 +258,6 @@
 
                 <div>{{ f.name }}</div>
 
                 <div>{{ f.name }}</div>
 
               </div> -->
 
               </div> -->
 
             </div>
 
             </div>
 
-            <div class="filebox" v-else>暂无数据</div>
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
         <el-dialog
 
         <el-dialog

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