lsc 2 years ago
parent
commit
c2f0925bf5

+ 19 - 4
src/components/courseDetail.vue

@@ -73,8 +73,10 @@
                 </div>
                 <div
                   class="Tname"
+                  :class="{TnameC:TnameCheck}"
                   v-if="Tname.length > 0"
                   style="margin-left: 32px"
+                  @click="TnameCheck = !TnameCheck"
                 >
                   协同人员:<span
                     v-for="(tname, tIndex) in Tname"
@@ -96,7 +98,9 @@
                     }}人
                   </div>
                 </div>
-                <div class="Tname" v-if="classList.length && tType != 2">
+              </div>
+              <div class="cType" style="font-size: 18px; color: #6c6c6c" v-if="classList.length && tType != 2">
+                <div>
                   授课班级:<el-button
                     @click="gotoCourse(item.id)"
                     v-for="(item, index) in classList"
@@ -106,7 +110,6 @@
                   >
                 </div>
               </div>
-
               <div class="now_study" @click="dialogVisible = true">
                 立即学习
               </div>
@@ -773,6 +776,7 @@ export default {
       chapInfo: [],
       courseType: [],
       Tname: [],
+      TnameCheck:false,
       courseTypeJson: {},
       userinfo: [],
       mr: "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/noBanner1656409780264.jpg",
@@ -1177,12 +1181,12 @@ export default {
 
 <style scoped>
 @media screen and (max-width: 1024px) {
-  .Tname {
+  /* .Tname {
     width: 500px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-  }
+  } */
 }
 
 .body_student {
@@ -1558,6 +1562,17 @@ export default {
 .Tname {
   margin-left: 40px;
   word-break: break-all;
+  width:300px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.TnameC{
+  width:auto;
+  overflow: unset;
+  white-space: unset;
+  text-overflow: unset;
 }
 
 .Tname > span {

+ 18 - 337
src/components/student/courseDetail.vue

@@ -53,30 +53,13 @@
                       courseDetail.username
                   }}</span>
                 </div>
-                <div class="Tname" v-if="Tname.length > 0">
-                  协同人员:<span v-for="(tname, tIndex) in Tname" :key="tIndex" style="margin: 0 5px; color: #000">{{ tname
+                <div class="Tname" :class="{TnameC:TnameCheck}" v-if="Tname.length > 0">
+                  协同人员:<span v-for="(tname, tIndex) in Tname" :key="tIndex" style="margin: 0 5px; color: #000" @click="TnameCheck = !TnameCheck">{{ tname
                   }}</span>
                 </div>
               </div>
               <div class="cType" style="font-size: 18px; color: #6c6c6c">
-                <!-- <div style="display:flex; align-items: center;">
-                  <div>参与人数:</div>
-                  <div class="man">
-                    <img src="../../assets/people.png" alt />
-                  </div>
-                  <div class="person" style=" color: #000">
-                    {{ courseDetail.vcount != null ? courseDetail.vcount : 0 }}人
-                  </div>
-                </div>
-                <div class="Tname" v-if="courseDetail.classname">
-                  授课班级:<span style="margin: 0 5px; color: #000">{{ courseDetail.classname
-                  }}</span>
-                </div> -->
               </div>
-
-              <!-- <div class="now_study" @click="dialogVisible = true">
-                立即学习
-              </div> -->
             </div>
           </div>
         </div>
@@ -86,11 +69,6 @@
             <div class="courseTd">{{ courseDetail.brief }}</div>
           </div>
           <div :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'">
-            <!-- <div v-if="(tType == 1 || tType == 4)" class="checkBox">
-              <span :class="{ active: type == 1 }" @click="type = 1">课程分析</span>
-              <span :class="{ active: type == 2 }" @click="type = 2">阶段选择</span>
-            </div> -->
-            <!-- v-if="((tType == 1 || tType == 4) && type == 2) || tType == 2" -->
             <div :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'">
               <div class="blue_box_one" v-for="(item, index) in chapInfo" :key="index" @click="addUserRate(index)">
                 <div>第{{ index + 1 }}阶段</div>
@@ -98,317 +76,6 @@
                 <div>{{ item.chapterInfo[0].taskJson.length }}个任务</div>
               </div>
             </div>
-            <!-- <div v-if="(tType == 1 || tType == 4) && Object.keys(chaptersJson).length && type == 1" class="detail">
-              <div class="detail_box">
-                <div class="title"><span class="toolIcon">工具分析</span>
-                  <div class="statebox">
-                    <div><span class="taskIcon">全部阶段:</span><span>{{ chaptersJson.state.stage }}</span></div>
-                    <div><span class="finishIcon">已进行:</span><span>{{ chaptersJson.state.finish }}</span></div>
-                    <div><span class="learningIcon">未进行:</span><span>{{ chaptersJson.state.learing }}</span></div>
-                  </div>
-                </div>
-                <div class="box" v-if="chaptersJson.tool.length">
-                  <div class="progress">
-                    <div v-for="(item, index) in chaptersJson.tool" :key="index" class="chapter">
-                      <div class="stage">第{{ index + 1 }}阶段</div>
-                      <div class="task">
-                        <div v-for="(item2, index2) in item" :key="index + '-' + index2" class="taskBox">
-                          <div class="taskName">任务{{ index2 + 1 }}</div>
-                          <div class="p_tool_box">
-                            <span v-for="(item3, index3) in item2" :key="index + '-' + index2 + '-' + index3"
-                              class="p_tool">
-
-                              <div v-if="item3.tool == 1">
-                                <img src="../../assets/icon/secondToolList/whiteBoard.png" alt />
-                                <div>电子白板</div>
-                              </div>
-                              <div v-if="item3.tool == 3">
-                                <img src="../../assets/icon/secondToolList/mindMapping.png" alt />
-                                <div>思维导图</div>
-                              </div>
-                              <div v-if="item3.tool == 6">
-                                <img src="../../assets/icon/secondToolList/doc.png" alt />
-                                <div>协同文档</div>
-                              </div>
-                              <div v-if="item3.tool == 7">
-                                <img src="../../assets/icon/secondToolList/mindNetwork.png" alt />
-                                <div>思维网格</div>
-                              </div>
-                              <div v-if="item3.tool == 8">
-                                <img src="../../assets/icon/secondToolList/library.png" alt />
-                                <div>素材库</div>
-                              </div>
-                              <div v-if="item3.tool == 17">
-                                <img src="../../assets/icon/secondToolList/library.png" alt />
-                                <div>学习资料</div>
-                              </div>
-                              <div v-if="item3.tool == 2">
-                                <img src="../../assets/icon/secondToolList/note.png" alt />
-                                <div>便签</div>
-                              </div>
-                              <div v-if="item3.tool == 4">
-                                <img src="../../assets/icon/thirdToolList/ask.png" alt />
-                                <div>问卷调查</div>
-                              </div>
-                              <div v-if="item3.tool == 45">
-                                <img src="../../assets/icon/thirdToolList/choose.png" alt />
-                                <div>选择题</div>
-                              </div>
-                              <div v-if="item3.tool == 10">
-                                <img src="../../assets/icon/thirdToolList/time.png" alt />
-                                <div>倒计时</div>
-                              </div>
-                              <div v-if="item3.tool == 15">
-                                <img src="../../assets/icon/thirdToolList/answer.png" alt />
-                                <div>问答工具</div>
-                              </div>
-                              <div v-if="item3.tool == 26">
-                                <img src="../../assets/icon/thirdToolList/courseDesign.png" alt />
-                                <div>课程设计</div>
-                              </div>
-                              <div v-if="item3.tool == 18">
-                                <img src="../../assets/icon/thirdToolList/trainPlatform.png" alt />
-                                <div>训练服务器</div>
-                              </div>
-                              <div v-if="item3.tool == 16">
-                                <img src="../../assets/icon/thirdToolList/work.png" alt />
-                                <div>作业提交</div>
-                              </div>
-                              <div v-if="item3.tool == 21">
-                                <img src="../../assets/icon/fourthToolList/program.png" alt />
-                                <div>编程平台</div>
-                              </div>
-                              <div v-if="item3.tool == 22">
-                                <img src="../../assets/icon/fourthToolList/program.png" alt />
-                                <div>AI体验</div>
-                              </div>
-                              <div v-if="item3.tool == 23">
-                                <img src="../../assets/icon/fourthToolList/program.png" alt />
-                                <div>Python</div>
-                              </div>
-                              <div v-if="item3.tool == 24">
-                                <img src="../../assets/icon/fourthToolList/AIprogram.png" alt />
-                                <div>AI平台</div>
-                              </div>
-                              <div v-if="item3.tool == 25">
-                                <img src="../../assets/icon/thirdToolList/evalua.png" alt />
-                                <div>目标管理</div>
-                              </div>
-                              <div v-if="item3.tool == 31">
-                                <img src="../../assets/icon/secondToolList/networkPanel.png" alt />
-                                <div>数学画板</div>
-                              </div>
-                              <div v-if="item3.tool == 28">
-                                <img src="../../assets/icon/secondToolList/translation.png" alt />
-                                <div>翻译</div>
-                              </div>
-                              <div v-if="item3.tool == 37">
-                                <img src="../../assets/icon/secondToolList/mohe.png" alt />
-                                <div>魔盒识字</div>
-                              </div>
-                              <div v-if="item3.tool == 38">
-                                <img src="../../assets/icon/secondToolList/24game.png" alt />
-                                <div>24点</div>
-                              </div>
-                              <div v-if="item3.tool == 39">
-                                <img src="../../assets/icon/secondToolList/GeoGebra.png" alt />
-                                <div>GeoGebra</div>
-                              </div>
-                              <div v-if="item3.tool == 32">
-                                <img src="../../assets/icon/thirdToolList/code.png" alt />
-                                <div>源码编辑</div>
-                              </div>
-                              <div v-if="item3.tool == 40">
-                                <img src="../../assets/icon/secondToolList/eval.png" alt />
-                                <div>学生评价</div>
-                              </div>
-                              <div v-if="item3.tool == 41">
-                                <img src="../../assets/icon/thirdToolList/select.png" alt />
-                                <div>选择填空</div>
-                              </div>
-                              <div v-if="item3.tool == 44">
-                                <img src="../../assets/icon/thirdToolList/hanClass.png" alt />
-                                <div>汉字宫</div>
-                              </div>
-                              <div v-if="item3.tool == 47">
-                                <img src="../../assets/icon/fourthToolList/conSentences.png" alt />
-                                <div>连词成句</div>
-                              </div>
-                              <div v-if="(item3.tool == 48)">
-                                <img src="../../assets/icon/fourthToolList/conSentences.png" alt />
-                                <div>表格</div>
-                              </div>
-                              <div v-if="(item3.tool == 49)">
-                                <img src="../../assets/icon/fourthToolList/group.png" alt />
-                                <div>学生分组</div>
-                              </div>
-                              <div v-if="(item3.tool == undefined)">
-                                <img src="../../assets/icon/empytool.png" alt style="width: 64px;height: 75px;" />
-                              </div>
-                            </span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="detail_box" v-if="Object.keys(chaptersJson.time).length">
-                <div class="title"><span class="frequencyIcon">作业频率</span></div>
-                <div class="box">
-                  <div>
-                    <Heatmap :Josn="chaptersJson.time" :num="chaptersJson.studentCount"></Heatmap>
-                  </div>
-                </div>
-              </div>
-              <div class="detail_box">
-                <div class="title"><span class="timeIcon">实施时间</span></div>
-                <div class="box">
-                  <div style="font-size: 22px;margin: 15px 0 45px;">{{ courseDetail.title }}</div>
-                  <div class="chapter_time_box">
-                    <div v-for="(item, index) in chaptersJson.work" :key="index" class="c_box">
-                      <div class="stage_box">
-                        <div class="yuan"></div>
-                        <div class="stage">第{{ index + 1 }}阶段 {{ item.name }}</div>
-                        <div class="s_up" :class="{ s_up2: !item.is }" @click="item.is = !item.is"><img
-                            src="../../assets/icon/up.png" alt=""></div>
-                      </div>
-                      <div v-show="item.is">
-                        <div v-for="(item2, index2) in item.chapter" :key="index + '-' + index2">
-                          <div style="color:#737373">任务{{ index2 + 1 }}:{{ item2.name }}</div>
-                          <div class="p_tool_box2">
-                            <span v-for="(item3, index3) in item2.task" :key="index + '-' + index2 + '-' + index3"
-                              class="p_tool2">
-                              <div class="toolBigBox">
-                                <div class="toolbox">
-                                  <div>工具{{ index3 + 1 }}:</div>
-                                  <div v-if="item3.tool == 1">
-                                    电子白板
-                                  </div>
-                                  <div v-if="item3.tool == 3">
-                                    思维导图
-                                  </div>
-                                  <div v-if="item3.tool == 6">
-                                    协同文档
-                                  </div>
-                                  <div v-if="item3.tool == 7">
-                                    思维网格
-                                  </div>
-                                  <div v-if="item3.tool == 8">
-                                    素材库
-                                  </div>
-                                  <div v-if="item3.tool == 17">
-                                    学习资料
-                                  </div>
-                                  <div v-if="item3.tool == 2">
-                                    便签
-                                  </div>
-                                  <div v-if="item3.tool == 4">
-                                    问卷调查
-                                  </div>
-                                  <div v-if="item3.tool == 45">
-                                    选择题
-                                  </div>
-                                  <div v-if="item3.tool == 10">
-                                    倒计时
-                                  </div>
-                                  <div v-if="item3.tool == 15">
-                                    问答工具
-                                  </div>
-                                  <div v-if="item3.tool == 26">
-                                    课程设计
-                                  </div>
-                                  <div v-if="item3.tool == 18">
-                                    训练服务器
-                                  </div>
-                                  <div v-if="item3.tool == 16">
-                                    作业提交
-                                  </div>
-                                  <div v-if="item3.tool == 21">
-                                    编程平台
-                                  </div>
-                                  <div v-if="item3.tool == 22">
-                                    AI体验
-                                  </div>
-                                  <div v-if="item3.tool == 23">
-                                    Python
-                                  </div>
-                                  <div v-if="item3.tool == 24">
-                                    AI平台
-                                  </div>
-                                  <div v-if="item3.tool == 25">
-                                    目标管理
-                                  </div>
-                                  <div v-if="item3.tool == 31">
-                                    数学画板
-                                  </div>
-                                  <div v-if="item3.tool == 28">
-                                    翻译
-                                  </div>
-                                  <div v-if="item3.tool == 37">
-                                    魔盒识字
-                                  </div>
-                                  <div v-if="item3.tool == 38">
-                                    24点
-                                  </div>
-                                  <div v-if="item3.tool == 39">
-                                    GeoGebra
-                                  </div>
-                                  <div v-if="item3.tool == 32">
-                                    源码编辑
-                                  </div>
-                                  <div v-if="item3.tool == 40">
-                                    学生评价
-                                  </div>
-                                  <div v-if="item3.tool == 41">
-                                    选择填空
-                                  </div>
-                                  <div v-if="item3.tool == 44">
-                                    汉字宫
-                                  </div>
-                                  <div v-if="item3.tool == 47">
-                                    连词成句
-                                  </div>
-                                  <div v-if="(item3.tool == 48)">
-                                    表格
-                                  </div>
-                                  <div v-if="(item3.tool == 49)">
-                                    学生分组
-                                  </div>
-                                </div>
-                                <div class="toolSta" v-if="item3.works.length">
-                                  <div>
-                                    <div>任务实施情况:</div>
-                                    <div>
-                                      <div>作业数量:{{ item3.works.length }}</div>
-                                      <div v-if="chaptersJson.studentCount">任务完成率:{{ ((item3.works.length /
-                                          chaptersJson.studentCount) * 100).toFixed(2) + '%'
-                                      }} </div>
-                                      <div>
-                                        <div>点赞:{{ item3.likeCount }}</div>
-                                        <div>评论:{{ item3.commentCount }}</div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div v-if="item3.isScore">
-                                    <div>任务效果:</div>
-                                    <div>
-                                      <div>作业评价量:{{ item3.isScore }}</div>
-                                      <div>评价平均分:{{ (item3.score / item3.isScore).toFixed(2)
-                                      }}分</div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div> -->
           </div>
         </div>
 
@@ -456,6 +123,7 @@ export default {
       chapInfo: [],
       courseType: [],
       Tname: [],
+      TnameCheck:false,
       courseTypeJson: {},
       userinfo: [],
       mr: "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/noBanner1656409780264.jpg",
@@ -709,12 +377,12 @@ export default {
 
 <style scoped>
 @media screen and (max-width: 1024px) {
-  .Tname {
+  /* .Tname {
     width: 500px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-  }
+  } */
 }
 
 .body_student {
@@ -1088,10 +756,23 @@ export default {
 }
 
 .Tname {
+  cursor: pointer;
   margin-left: 40px;
   word-break: break-all;
+  width:300px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.TnameC{
+  width:auto;
+  overflow: unset;
+  white-space: unset;
+  text-overflow: unset;
 }
 
+
 .detail {
   width: 100%;
   padding: 15px;

+ 3 - 1
src/components/studentIndex.vue

@@ -160,7 +160,7 @@
           </div>
         </div>
         <div class="student_page" style="margin: 15px 0 0" v-if="zoneClass.length > 0 && !typeCheck">
-          <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page"
+          <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total" v-if="page"
             @current-change="handleCurrentChange">
           </el-pagination>
         </div>
@@ -177,6 +177,7 @@ export default {
       zoneClass: [],
       page: 1,
       total: 0,
+      pageSize: 10,
       isListAjax: false,
       zoneListId: "",
       bannerList: [],
@@ -527,6 +528,7 @@ export default {
         cu: "",
         cn: this.sCourse,
         page: this.page,
+        pageSize: this.pageSize,
       };
       this.ajax
         .get(this.$store.state.api + "selectStudentCourseNew22", params)

+ 8 - 4
src/components/studyStudent.vue

@@ -12472,20 +12472,24 @@ export default {
 }
 
 .up_photo2 {
-  width: 120px;
-  min-width: 120px;
+  width: 180px;
+  box-sizing: border-box;
+  min-width: 180px;
+  height: 180px;
+  max-height: 180px;
+  min-height: 180px;
   cursor: pointer;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   background: rgb(242, 246, 255);
-  padding: 25px;
+  /* padding: 25px; */
   margin-bottom: 10px;
 }
 
 .up_photo2 img {
-  width: 60%;
+  width: 50%;
   height: auto;
 }