lsc 1 year ago
parent
commit
26f5036342

+ 1 - 1
dist/index.html

@@ -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.92cdbb43118bf000b793e1e86ee93751.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.74000faba9e8c57e7782.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.8f418d1a552badda88c6ef0e2685b61d.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.aaf060920e70df5e50c4.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.8f418d1a552badda88c6ef0e2685b61d.css


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


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


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


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


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


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


+ 1 - 0
src/components/group/group.vue

@@ -1207,6 +1207,7 @@ export default {
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    display: block;
 }
 
 .group_switch{

+ 65 - 39
src/components/studentIndex.vue

@@ -17,7 +17,7 @@
             <div class="search" @click="search">
               <img src="../assets/icon/search.png" alt="" />
             </div>
-            <input class="sInput" type="text" placeholder="请输入关键字" v-model="sCourse" @keyup.enter="search"/>
+            <input class="sInput" type="text" placeholder="请输入关键字" v-model="sCourse" @keyup.enter="search" />
           </div>
         </div>
         <div class="choose">
@@ -76,27 +76,32 @@
                     <div style="color: #b4b4b4">{{ item.utime }}</div>
                   </div>
                 </div>
-                <div class="now_study" @click="
-                  goTo(
-                    '/courseDetailS?courseId=' +
-                    item.courseId +
-                    '&userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org +
-                    '&cid=' +
-                    classId +
-                    '&tType=' +
-                    tType +
-                    '&role=' +
-                    role +
-                    '&screenType=' +
-                    screenType
-                  )
-                ">
-                  立即学习
+                <div class="now_study">
+                  <div @click="
+                    goTo(
+                      '/courseDetailS?courseId=' +
+                      item.courseId +
+                      '&userid=' +
+                      userid +
+                      '&oid=' +
+                      oid +
+                      '&org=' +
+                      org +
+                      '&cid=' +
+                      classId +
+                      '&tType=' +
+                      tType +
+                      '&role=' +
+                      role +
+                      '&screenType=' +
+                      screenType
+                    )
+                  ">
+                    预览
+                  </div>
+                  <div @click="goToCongress(item)">
+                    进展
+                  </div>
                 </div>
               </div>
             </div>
@@ -202,25 +207,25 @@ export default {
       typef: "",
       typeE: [],
       loading: "",
-      typeCheck:false,
+      typeCheck: false,
     };
   },
   watch: {
     typeCheck(newValue, oldValue) {
       this.loading = true
-      if(newValue){
+      if (newValue) {
         this.selectAll()
-      }else{
+      } else {
         this.page = 1
         this.selectAll2()
       }
     }
   },
   methods: {
-    search(){
-      if(this.typeCheck){
+    search() {
+      if (this.typeCheck) {
         this.selectAll()
-      }else{
+      } else {
         this.page = 1
         this.selectAll2()
       }
@@ -228,6 +233,16 @@ export default {
     goTo(path) {
       this.$router.push(path);
     },
+    goToCongress(item){
+      window.location.href='https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/courseProgress?cid=' +
+                      item.courseId +
+                      '&userid=' +
+                      this.userid +
+                      '&oid=' +
+                      this.oid +
+                      '&org=' +
+                      this.org
+    },
     // getZone() {
     //   this.ajax
     //     .get(this.$store.state.api + "getZone", "")
@@ -657,13 +672,13 @@ export default {
               //     this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
               //   }
               // }
-              if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
+              if (this.org == '150e3120-9195-11ed-b13d-005056b86db5') {
                 for (var j = 0; j < res.data[1].length; j++) {
                   if (res.data[0][i].id == res.data[1][j].pid) {
                     this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
                   }
                 }
-              }else{
+              } else {
                 this.CourseType = []
               }
             } else {
@@ -889,16 +904,26 @@ export default {
 .now_study {
   width: 100%;
   height: 40px;
-  color: #fff;
-  background: #4a9eed;
-  text-align: center;
+  color: #222;
   line-height: 40px;
-  font-size: 13px;
+  font-size: 14px;
   cursor: pointer;
+  display: flex;
 }
-
-.now_study:hover {
-  background: #205cc6;
+.now_study > div{
+  text-align: center;
+  height: 100%;
+  width: 100%;
+  background: #dddddd;
+  box-sizing: border-box;
+  transition: all .3s ease-in-out;
+}
+.now_study > div+div{
+  border-left: 1px solid #c7c7c7;
+}
+.now_study > div:hover {
+  background: #6574a2;
+    color: #fff;
 }
 
 .main_box {
@@ -1142,13 +1167,14 @@ export default {
   font-weight: 700;
 }
 
-.typeCheck{
+.typeCheck {
   display: flex;
   align-items: center;
   justify-content: flex-end;
   /* margin-bottom: 20px; */
 }
-.typeCheck>span{
+
+.typeCheck>span {
   margin-left: 10px;
 }
 </style>

+ 6 - 2
src/components/studyStudent.vue

@@ -6009,9 +6009,11 @@ export default {
     selectCStudent() {
       let params = {
         cid: this.classId,
+        oid: this.oid,
+        cn: '',
       };
       this.ajax
-        .get(this.$store.state.api + "selectSnameByCid", params)
+        .get(this.$store.state.api + "selectSnameByCidGroup", params)
         .then((res) => {
           this.classJuri = res.data[0];
         })
@@ -6022,9 +6024,11 @@ export default {
     selectUploadStudent() {
       let params = {
         cid: this.uploadCid,
+        oid: this.oid,
+        cn: '',
       };
       this.ajax
-        .get(this.$store.state.api + "selectSnameByCid", params)
+        .get(this.$store.state.api + "selectSnameByCidGroup", params)
         .then((res) => {
           this.uploadStudentJuri = res.data[0];
         })

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