홈 탐색 도움말
로그인
CocoRoboLabs
/
pbl-teacher-table
3
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

update

lsc 1 년 전
부모
eb973a3e10
커밋
f61357a0be
14개의 변경된 파일과 264개의 추가작업 그리고 36개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.4dff62363374b542f581dd8f59f66cc7.css
  3. 0 0
      dist/static/css/app.4dff62363374b542f581dd8f59f66cc7.css.map
  4. 0 0
      dist/static/js/app.358f93b64303eebf4bad.js
  5. 0 0
      dist/static/js/app.358f93b64303eebf4bad.js.map
  6. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  7. 6 4
      src/components/pages/addCourse.vue
  8. 8 8
      src/components/pages/course/index.vue
  9. 9 9
      src/components/pages/dataBoardNew/school/index.vue
  10. 1 0
      src/components/pages/testPerson/index.vue
  11. 3 1
      src/components/pages/testPerson/test/index.vue
  12. 217 0
      src/components/pages/testPerson/test/trActivity.vue
  13. 6 3
      src/components/pages/trainCourse/addCourse.vue
  14. 13 10
      src/components/pages/trainCourse/index.vue

+ 1 - 1
dist/index.html
파일 보기 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.194d827d71fec96aa87eef837f448580.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.12880dfe32fe2b13b171.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.4dff62363374b542f581dd8f59f66cc7.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.358f93b64303eebf4bad.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.4dff62363374b542f581dd8f59f66cc7.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/css/app.4dff62363374b542f581dd8f59f66cc7.css.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.358f93b64303eebf4bad.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/app.358f93b64303eebf4bad.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 6 - 4
src/components/pages/addCourse.vue
파일 보기 

@@ -357,7 +357,6 @@
 
                   <div class="wordPic">
 
                     <img src="../../assets/icon/new/template_none.png" alt />
 
                   </div>
 
-
 
                   <div style="
 
                       margin-top: 10px;
 
                       line-height: 19px;
 
@@ -3815,17 +3814,20 @@
 
                   <div class="wordPic">
 
                     <img src="../../assets/icon/new/course_template.png" alt />
 
                   </div>
 
-
 
-                  <div style="
 
+                  <el-tooltip effect="dark" :content="aa.title" placement="top">
 
+                    <div style="
 
                       margin-top: 10px;
 
                       line-height: 19px;
 
                       overflow: hidden;
 
                       text-overflow: ellipsis;
 
                       white-space: nowrap;
 
-                      padding: 0 20px;
 
+                      padding: 0 10px;
 
+                      box-sizing: border-box;
 
+                      width: 100%;
 
                     ">
 
                     {{ aa.title }}
 
                   </div>
 
+                  </el-tooltip>
 
         </div>
 
         <div class="wordTeacher" @click="checkctJson({id: 1})" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'" :class="{wordTeacherA:ctJson.id == 1}">
 
                   <div class="wordPic">

+ 8 - 8
src/components/pages/course/index.vue
파일 보기 

@@ -62,14 +62,14 @@
 
                 全部
 
               </div>
 
               <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
-                我的培训
 
+                我创建的
 
               </div>
 
               <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
-                协同培训
 
+                我协同的
 
               </div>
 
-              <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
 
+              <!-- <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
 
                 他人培训
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="all_choose" v-else>
 
@@ -79,10 +79,10 @@
 
                 全部
 
               </div>
 
               <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
-                我的培训
 
+                我创建的
 
               </div>
 
               <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
-                协同培训
 
+                我协同的
 
               </div>
 
             </div>
 
           </div>
 
@@ -112,7 +112,7 @@
 
                       <div>{{ item.typename }}</div>
 
                     </el-tooltip>
 
 
-                    <div>{{ JSON.parse(item.chapters).length }}阶段</div>
 
+                    <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
 
                   </div>
 
                   <div class="school_box">
 
                     <el-tooltip effect="light" :content="item.school" placement="top">
 
@@ -164,7 +164,7 @@
 
                           <div>{{ item.typename }}</div>
 
                         </el-tooltip>
 
 
-                        <div>{{ JSON.parse(item.chapters).length }}阶段</div>
 
+                        <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
 
                       </div>
 
                       <div class="school_box">
 
                         <el-tooltip effect="light" :content="item.school" placement="top">

+ 9 - 9
src/components/pages/dataBoardNew/school/index.vue
파일 보기 

@@ -657,7 +657,7 @@ export default {
 
                 cid: _workCourse[i].courseId,
 
                 title: _workCourse[i].title,
 
                 task: 0,
 
-                work: 0,
 
+                work: _workCourse[i].pcount,
 
               };
 
               let chapters = JSON.parse(_workCourse[i].chapters);
 
               for (var j = 0; j < chapters.length; j++) {
 
@@ -672,14 +672,14 @@ export default {
 
               }
 
             }
 
           }
 
-          for (var i = 0; i < _workCourse.length; i++) {
 
-            let a = Object.keys(wList);
 
-            for (var j = 0; j < Object.keys(wList).length; j++) {
 
-              if (_workCourse[i].courseId == wList[a[j]].cid && _workCourse[i].id) {
 
-                wList[a[j]].work++;
 
-              }
 
-            }
 
-          }
 
+          // for (var i = 0; i < _workCourse.length; i++) {
 
+          //   let a = Object.keys(wList);
 
+          //   for (var j = 0; j < Object.keys(wList).length; j++) {
 
+          //     if (_workCourse[i].courseId == wList[a[j]].cid && _workCourse[i].id) {
 
+          //       wList[a[j]].work++;
 
+          //     }
 
+          //   }
 
+          // }
 
           var workNumList = Object.values(wList).map((item) => [
 
             item.task,
 
             item.work,

+ 1 - 0
src/components/pages/testPerson/index.vue
파일 보기 

@@ -56,4 +56,5 @@ export default {
 
         margin: 0 0 0 10px;
 
         height: 100%;
 
     }
 
+
 
 </style>

+ 3 - 1
src/components/pages/testPerson/test/index.vue
파일 보기 

@@ -14,6 +14,7 @@
 
     <Test :oid="oid" :userid="userid" v-if="type == 1"></Test>
 
     <TrainCourse v-if="type == 2"></TrainCourse>
 
     <Course v-if="type == 3"></Course>
 
+    <trActivity v-if="type == 4" :oid="oid" :userid="userid"></trActivity>
 
   </div>
 
 </template>
 
 
@@ -21,6 +22,7 @@
 
 import Test from './test.vue'
 
 import TrainCourse from '../../trainCourse/index.vue'
 
 import Course from '../../course/index.vue'
 
+import trActivity from './trActivity.vue'
 
 export default {
 
   props: {
 
     userid: {
 
@@ -31,7 +33,7 @@ export default {
 
     },
 
   },
 
   components: {
 
-    Test,TrainCourse,Course
 
+    Test,TrainCourse,Course,trActivity
 
   },
 
   data() {
 
     return {

+ 217 - 0
src/components/pages/testPerson/test/trActivity.vue
파일 보기 

@@ -0,0 +1,217 @@
 
+<template>
 
+    <div class="i_body_box">
 
+        <div class="i_header">
 
+            <div class="i_header_box">
 
+                <div class="i_header_span">
 
+                    <span>25</span>
 
+                    <span>节</span>
 
+                </div>
 
+                <div class="i_header_content">评论课程数</div>
 
+            </div>
 
+            <div class="i_header_box">
 
+                <div class="i_header_span">
 
+                    <span>25</span>
 
+                    <span>条</span>
 
+                </div>
 
+                <div class="i_header_content">评论总数</div>
 
+            </div>
 
+            <div class="i_header_box">
 
+                <div class="i_header_span">
 
+                    <span>25</span>
 
+                    <span>字</span>
 
+                </div>
 
+                <div class="i_header_content">评论总字数</div>
 
+            </div>
 
+            <div class="i_header_box">
 
+                <div class="i_header_span">
 
+                    <span>25</span>
 
+                    <span>条</span>
 
+                </div>
 
+                <div class="i_header_content">评论录音数</div>
 
+            </div>
 
+        </div>
 
+        <div class="i_body">
 
+            <div class="i_course_box">
 
+                <div class="i_course_header">
 
+                    <span :class="{ active: bool }" @click="bool = !bool"></span>
 
+                    <span>课程名称</span>
 
+                    <span>课程创建者</span>
 
+                    <span>课程分类</span>
 
+                </div>
 
+                <div class="i_course_content" v-show="bool">
 
+                    <div class="i_course_c_box">
 
+                        <div class="i_course_c_img"></div>
 
+                        <div class="i_course_c_body"></div>
 
+                        <div class="i_course_c_type">
 
+                            <span>2023.11.12 17.09</span>
 
+                            <span>发表个人评论</span>
 
+                        </div>
 
+                    </div>
 
+                    <div class="i_course_c_box">
 
+                        <div class="i_course_c_img"></div>
 
+                        <div class="i_course_c_body"></div>
 
+                        <div class="i_course_c_type">
 
+                            <span>2023.11.12 17.09</span>
 
+                            <span>回复了刘雨桐</span>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    props: {
 
+        oid: {
 
+            type: String,
 
+        },
 
+        userid: {
 
+            type: String,
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+            bool: false
 
+        }
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.i_body_box {
 
+    height: calc(100% - 15px);
 
+    padding: 15px 0 0;
 
+    box-sizing: border-box;
 
+    overflow: auto;
 
+}
 
+
 
+
 
+.i_header {
 
+    display: flex;
 
+    width: 100%;
 
+    align-items: center;
 
+}
 
+
 
+.i_header_box {
 
+    width: calc(100% / 4 - (30px / 4));
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: space-between;
 
+    min-height: 100px;
 
+    border: 1px solid #dbdbdb;
 
+    border-radius: 18px;
 
+    font-size: 23px;
 
+    padding: 0 20px;
 
+}
 
+
 
+.i_header_box+.i_header_box {
 
+    margin-left: 10px;
 
+}
 
+
 
+.i_header_span {}
 
+
 
+.i_header_span>span {
 
+    color: #007dff;
 
+}
 
+
 
+.i_header_span>span:nth-child(1) {
 
+    font-size: 35px;
 
+    font-weight: bold;
 
+}
 
+
 
+.i_header_span>span:nth-child(2) {
 
+    font-size: 20px;
 
+}
 
+
 
+.i_header_content {
 
+    font-weight: bold;
 
+}
 
+
 
+.i_body {
 
+    margin-top: 20px;
 
+    width: 100%;
 
+}
 
+
 
+.i_course_box {
 
+    box-shadow: 0 0 4px 3px #e0e0e0;
 
+    width: calc(100% - 4px);
 
+    box-sizing: border-box;
 
+    margin: 0 auto;
 
+    border-radius: 5px;
 
+}
 
+
 
+.i_course_header {
 
+    height: 50px;
 
+    display: flex;
 
+    align-items: center;
 
+    padding: 0 20px;
 
+    box-sizing: border-box;
 
+}
 
+
 
+.i_course_header>span {
 
+    margin: 0 20px 0 0;
 
+}
 
+
 
+.i_course_header>span:nth-child(1) {
 
+    background-image: url(../../../../assets/icon/expand.png);
 
+    width: 15px;
 
+    height: 15px;
 
+    background-size: 100% 100%;
 
+    cursor: pointer;
 
+    transform: rotate(-90deg);
 
+    transition: all .3s;
 
+}
 
+
 
+.i_course_header>span.active {
 
+    transform: rotate(0deg);
 
+}
 
+
 
+.i_course_content {
 
+    width: 100%;
 
+}
 
+
 
+.i_course_c_box+.i_course_c_box {
 
+    border-top: 1px solid #e0e0e0;
 
+}
 
+
 
+.i_course_c_box {
 
+    padding: 10px 20px;
 
+    box-sizing: border-box;
 
+    width: 100%;
 
+    display: flex;
 
+    align-items: flex-start;
 
+    justify-content: space-between;
 
+}
 
+
 
+.i_course_c_img {
 
+    height: 40px;
 
+    width: 40px;
 
+    background: #3760af;
 
+    border-radius: 50%;
 
+}
 
+
 
+.i_course_c_body {
 
+    width: calc(100% - 40px - 120px - 20px);
 
+    word-break: break-all;
 
+}
 
+
 
+.i_course_c_type {
 
+    display: flex;
 
+    flex-direction: column;
 
+    align-items: flex-end;
 
+    height: 40px;
 
+    width: 120px;
 
+    font-size: 14px;
 
+    justify-content: space-between;
 
+    color: #7d7d7d;
 
+}
 
+
 
+.i_course_c_type>span {
 
+    max-width: 100%;
 
+    overflow: hidden;
 
+    word-break: break-all;
 
+    white-space: nowrap;
 
+    text-overflow: ellipsis;
 
+}</style>

+ 6 - 3
src/components/pages/trainCourse/addCourse.vue
파일 보기 

@@ -3815,17 +3815,20 @@
 
                   <div class="wordPic">
 
                     <img src="../../../assets/icon/new/course_template.png" alt />
 
                   </div>
 
-
 
-                  <div style="
 
+                  <el-tooltip effect="dark" :content="aa.title" placement="top">
 
+                    <div style="
 
                       margin-top: 10px;
 
                       line-height: 19px;
 
                       overflow: hidden;
 
                       text-overflow: ellipsis;
 
                       white-space: nowrap;
 
-                      padding: 0 20px;
 
+                      padding: 0 10px;
 
+                      box-sizing: border-box;
 
+                      width: 100%;
 
                     ">
 
                     {{ aa.title }}
 
                   </div>
 
+                  </el-tooltip>
 
         </div>
 
         <div class="wordTeacher" @click="checkctJson({id: 1})" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'" :class="{wordTeacherA:ctJson.id == 1}">
 
                   <div class="wordPic">

+ 13 - 10
src/components/pages/trainCourse/index.vue
파일 보기 

@@ -62,28 +62,31 @@
 
                 全部
 
               </div>
 
               <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
-                我的培训
 
+                我参与的
 
               </div>
 
-              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
+              <!-- <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
                 协同培训
 
               </div>
 
               <div class="cName" :class="groupA == '1' ? 'isCType' : ''" @click="groupA = '1'; search();">
 
                 他人培训
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="all_choose" v-else>
 
             <span><span>所有者</span></span>
 
             <div class="typeCss">
 
-              <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0'; search();">
 
+              <!-- <div class="cName" :class="groupA == '0' ? 'isCType' : ''" @click="groupA = '0'; search();">
 
+                全部
 
+              </div> -->
 
+              <div class="cName" :class="groupA == '4' ? 'isCType' : ''" @click="groupA = '4'; search();">
 
                 全部
 
               </div>
 
               <div class="cName" :class="groupA == '2' ? 'isCType' : ''" @click="groupA = '2'; search();">
 
-                我的培训
 
+                我参与的
 
               </div>
 
-              <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
+              <!-- <div class="cName" :class="groupA == '3' ? 'isCType' : ''" @click="groupA = '3'; search();">
 
                 协同培训
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
         </div>
 
@@ -110,7 +113,7 @@
 
                       <div>{{ item.typename }}</div>
 
                     </el-tooltip>
 
 
-                    <div>{{ JSON.parse(item.chapters).length }}阶段</div>
 
+                    <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
 
                   </div>
 
                   <div class="school_box">
 
                     <el-tooltip effect="light" :content="item.school" placement="top">
 
@@ -162,7 +165,7 @@
 
                           <div>{{ item.typename }}</div>
 
                         </el-tooltip>
 
 
-                        <div>{{ JSON.parse(item.chapters).length }}阶段</div>
 
+                        <div style="min-width: fit-content;">{{ JSON.parse(item.chapters).length }}阶段</div>
 
                       </div>
 
                       <div class="school_box">
 
                         <el-tooltip effect="light" :content="item.school" placement="top">
 
@@ -246,7 +249,7 @@ export default {
 
       CourseType3: [],
 
       pTypeCheck:[],
 
       pTypeCheckName: [],
 
-      groupA: "0",
 
+      groupA: "4",
 
     };
 
   },
 
   watch: {

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.