lsc 2 anni fa
parent
commit
6c7a7852d2

+ 1 - 1
src/components/index.vue

@@ -1221,7 +1221,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  /* margin-bottom: 20px; */
+  margin-bottom: 10px;
 }
 
 .typeCheck>span {

+ 1 - 1
src/components/studentIndex.vue

@@ -1222,7 +1222,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  /* margin-bottom: 20px; */
+  margin-bottom: 10px;
 }
 
 .typeCheck>span {

+ 56 - 58
src/components/studio/index.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">
@@ -31,11 +31,10 @@
               </div>
               <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
                 @click="getCourse(item.name, item.id, item1.id, 2)">
-                <div class="cName" :class="
-                  typea == item1.id || typeb == item1.id || typec == item1.id
+                <div class="cName" :class="typea == item1.id || typeb == item1.id || typec == item1.id
                     ? 'isCType'
                     : ''
-                ">
+                  ">
                   {{ item1.name }}
                 </div>
               </div>
@@ -51,31 +50,30 @@
           <div class="main_box" v-loading="loading">
             <div style="display:flex;flex-wrap:wrap" v-if="!typeCheck">
               <div class="box_course" v-for="(item, index) in zoneClass" :key="index" @click="
-                      goTo(
-                    '/coursedetailStudio?courseId=' +
-                    item.courseId +
-                    '&userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org +
-                    '&cid=' +
-                    classId +
-                    '&tType=' +
-                    tType +
-                    '&role=' +
-                    role +
-                    '&screenType=' +
-                    screenType
-                  )
+                goTo(
+                  '/coursedetailStudio?courseId=' +
+                  item.courseId +
+                  '&userid=' +
+                  userid +
+                  '&oid=' +
+                  oid +
+                  '&org=' +
+                  org +
+                  '&cid=' +
+                  classId +
+                  '&tType=' +
+                  tType +
+                  '&role=' +
+                  role +
+                  '&screenType=' +
+                  screenType
+                )
                 ">
                 <div class="wheel">
-                  <img :src="
-                    item.cover
+                  <img :src="item.cover
                       ? JSON.parse(item.cover)[0].url
                       : require('../../assets/wheel.png')
-                  " alt="" />
+                    " alt="" />
                 </div>
                 <div class="middle_white">
                   <div class="textOverflow">{{ item.title }}</div>
@@ -114,7 +112,7 @@
                     '&screenType=' +
                     screenType
                   )
-                ">
+                  ">
                   立即学习
                 </div>
               </div>
@@ -124,31 +122,30 @@
                 <div class="title">{{ type.name }}</div>
                 <div style="display: flex;flex-flow: wrap;margin-top: 20px;">
                   <div class="box_course" v-for="(item, index) in type.course" :key="tindex + '-' + index" @click="
-                      goTo(
-                    '/coursedetailStudio?courseId=' +
-                    item.courseId +
-                    '&userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org +
-                    '&cid=' +
-                    classId +
-                    '&tType=' +
-                    tType +
-                    '&role=' +
-                    role +
-                    '&screenType=' +
-                    screenType
-                  )
-                ">
+                    goTo(
+                      '/coursedetailStudio?courseId=' +
+                      item.courseId +
+                      '&userid=' +
+                      userid +
+                      '&oid=' +
+                      oid +
+                      '&org=' +
+                      org +
+                      '&cid=' +
+                      classId +
+                      '&tType=' +
+                      tType +
+                      '&role=' +
+                      role +
+                      '&screenType=' +
+                      screenType
+                    )
+                    ">
                     <div class="wheel">
-                      <img :src="
-                        item.cover
+                      <img :src="item.cover
                           ? JSON.parse(item.cover)[0].url
                           : require('../../assets/wheel.png')
-                      " alt="" />
+                        " alt="" />
                     </div>
                     <div class="middle_white">
                       <div class="textOverflow">{{ item.title }}</div>
@@ -187,7 +184,7 @@
                         '&screenType=' +
                         screenType
                       )
-                    ">
+                      ">
                       立即学习
                     </div>
                   </div>
@@ -240,25 +237,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()
       }
@@ -1005,13 +1002,14 @@ export default {
   font-weight: 700;
 }
 
-.typeCheck{
+.typeCheck {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  /* margin-bottom: 20px; */
+  margin-bottom: 10px;
 }
-.typeCheck>span{
+
+.typeCheck>span {
   margin-left: 10px;
 }
 </style>

+ 15 - 2
src/components/studyStudent.vue

@@ -149,6 +149,13 @@
             >
               全屏
             </div>
+            <div
+              class="returnBtn"
+              @click="ispzType = 4"
+              v-if="tType == 1"
+            >
+              评课
+            </div>
             <div
               class="returnBtn"
               @click="startRecording"
@@ -6420,7 +6427,7 @@
     <div
       class="pButton"
       @click="(pzDialog = true), selectPz()"
-      v-if="tType == 4"
+      v-if="tType == 4 || ispzType == 4"
     >
       <!-- 批 -->
       <img src="../assets/pzBtn2.png" style="width: 25px" alt="" />
@@ -9560,6 +9567,7 @@ export default {
       fullUrl: "",
       commentIndexJson: {},
       Stbodywidth: 0,
+      ispzType:0,
       pzType: 1,
       wScore: 0,
       scoreDetail: "",
@@ -16281,7 +16289,7 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
-  width: calc(100% - 520px);
+  width: calc(100% - 600px);
 }
 
 .courseIndex > div:nth-child(1) {
@@ -18221,6 +18229,11 @@ export default {
 }
 
 /* code 样式 */
+.cont{
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
 .cont >>> code {
   display: inline-block;
   *display: inline;