lsc 2 年之前
父节点
当前提交
40c2aad9c8

+ 1 - 1
src/components/GM/indexGM.vue

@@ -411,7 +411,7 @@ export default {
         page: this.page,
       };
       this.ajax
-        .get(this.$store.state.api + "selectTypeCourse2", params)
+        .get(this.$store.state.api + "selectTypeCourse2GM", params)
         .then((res) => {
           if (this.loading) {
             this.loading.close();

+ 8 - 7
src/components/GM/studyStudentGM.vue

@@ -1008,7 +1008,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex"
                         :class="w.type == 1 ? 'isTypeOne' : ''">
                         <div class="workImg" v-if="w.type == 0">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1361,7 +1361,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1431,7 +1431,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1501,7 +1501,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1571,7 +1571,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -7762,6 +7762,7 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
   position: relative;
+  justify-content: center;
 }
 
 .answerBg>div:nth-child(1) {
@@ -7771,13 +7772,13 @@ export default {
 
 .answerContent {
   width: 215px;
-  height: 60px;
+  max-height: 60px;
   word-break: break-all;
   text-align: center;
   /* white-space: nowrap; */
   overflow: hidden;
   text-overflow: ellipsis;
-  padding: 23px 0 0;
+  /* padding: 23px 0 0; */
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
   display: -webkit-box;

+ 9 - 8
src/components/student/studyStudent.vue

@@ -1066,7 +1066,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex"
                         :class="w.type == 1 ? 'isTypeOne' : ''">
                         <div class="workImg" v-if="w.type == 0">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 || w.ateacher == userid }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1422,7 +1422,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1492,7 +1492,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1562,7 +1562,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1632,7 +1632,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -2150,7 +2150,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex][gindex]" :key="wIndex"
                               :class="w.type == 1 ? 'isTypeOne' : ''">
                               <div class="workImg" v-if="w.type == 0">
-                                <img :src="w.works" @click="commentOther(w, toolIndex, wIndex, gindex)" alt />
+                                <img :src="w.works" @click="previewImg(w.works)" alt />
                                 <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                                   :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 || w.ateacher == userid }">
                                   {{ JSON.parse(w.score).wScore }}分
@@ -9229,6 +9229,7 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
   position: relative;
+  justify-content: center;
 }
 
 .answerBg>div:nth-child(1) {
@@ -9238,13 +9239,13 @@ export default {
 
 .answerContent {
   width: 215px;
-  height: 60px;
+  max-height: 60px;
   word-break: break-all;
   text-align: center;
   /* white-space: nowrap; */
   overflow: hidden;
   text-overflow: ellipsis;
-  padding: 23px 0 0;
+  /* padding: 23px 0 0; */
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
   display: -webkit-box;

+ 11 - 9
src/components/studyStudent.vue

@@ -1066,7 +1066,8 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex"
                         :class="w.type == 1 ? 'isTypeOne' : ''">
                         <div class="workImg" v-if="w.type == 0">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <!-- @click="commentOther(w, toolIndex, wIndex)" -->
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 || w.ateacher == userid }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1420,9 +1421,9 @@
                           border-radius: 15px;
                           box-shadow: 0 0 6px 1px #dfdada;
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
-                        <!-- @click="previewImg(w.works)" -->
+                        <!-- @click="previewImg(w.works)" @click="commentOther(w, toolIndex, wIndex)"-->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1492,7 +1493,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1562,7 +1563,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -1632,7 +1633,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex]" :key="wIndex">
                         <!-- @click="previewImg(w.works)" -->
                         <div class="workImg">
-                          <img :src="w.works" @click="commentOther(w, toolIndex, wIndex)" alt />
+                          <img :src="w.works" @click="previewImg(w.works)" alt />
                           <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                             :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 }">
                             {{ JSON.parse(w.score).wScore }}分
@@ -2150,7 +2151,7 @@
                         " v-for="(w, wIndex) in worksStudent[toolIndex][gindex]" :key="wIndex"
                               :class="w.type == 1 ? 'isTypeOne' : ''">
                               <div class="workImg" v-if="w.type == 0">
-                                <img :src="w.works" @click="commentOther(w, toolIndex, wIndex, gindex)" alt />
+                                <img :src="w.works" @click="previewImg(w.works)" alt />
                                 <div class="answerScore" v-if="w.score" @click.stop="openScore(w)"
                                   :class="{ rightW: w.userid == userid || tType == 1 || tType == 4 || w.ateacher == userid }">
                                   {{ JSON.parse(w.score).wScore }}分
@@ -9228,6 +9229,7 @@ export default {
   flex-wrap: nowrap;
   align-items: center;
   position: relative;
+  justify-content: center;
 }
 
 .answerBg>div:nth-child(1) {
@@ -9237,13 +9239,13 @@ export default {
 
 .answerContent {
   width: 215px;
-  height: 60px;
+  max-height: 60px;
   word-break: break-all;
   text-align: center;
   /* white-space: nowrap; */
   overflow: hidden;
   text-overflow: ellipsis;
-  padding: 23px 0 0;
+  /* padding: 23px 0 0; */
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
   display: -webkit-box;