浏览代码

修改问题

zengyicheng 2 年之前
父节点
当前提交
1542de1637
共有 2 个文件被更改,包括 60 次插入53 次删除
  1. 46 42
      src/components/pages/race/eventCenter/anliDetail.vue
  2. 14 11
      src/components/pages/race/eventCenter/myAnli.vue

+ 46 - 42
src/components/pages/race/eventCenter/anliDetail.vue

@@ -177,7 +177,10 @@
               anliBox[0].info.data.length)
               anliBox[0].info.data.length)
           "
           "
         >
         >
-          <div class="whiteBg whiteLeft">
+          <div
+            class="whiteBg whiteLeft"
+            style="min-height: 200px; max-height: 200px"
+          >
             <div class="navBgTop">
             <div class="navBgTop">
               <div class="navBg">项目简介</div>
               <div class="navBg">项目简介</div>
               <el-button
               <el-button
@@ -219,6 +222,7 @@
               <div
               <div
                 class="proOverNav"
                 class="proOverNav"
                 v-html="anliBox[0].info ? anliBox[0].info.courseText : ''"
                 v-html="anliBox[0].info ? anliBox[0].info.courseText : ''"
+                style="height: 200px"
               ></div>
               ></div>
             </div>
             </div>
             <div class="noFile" v-else>
             <div class="noFile" v-else>
@@ -249,40 +253,40 @@
               </div>
               </div>
               <div class="upCss">
               <div class="upCss">
                 <div class="look_file">
                 <div class="look_file">
-                  <pdf
-                    v-if="pptImgUrl2.infoData.showType == 1"
-                    :pdfUrl="pptImgUrl2.infoData.url"
-                    style="width: 100%; height: 400px; overflow: auto"
-                    :class="{ fullStyle: full }"
-                  ></pdf>
-                  <iframe
-                    v-else-if="pptImgUrl2.infoData.showType == 2"
-                    :src="pptImgUrl2.infoData.url"
-                    frameborder="0"
-                    width="100%"
-                    height="400"
-                    :class="{ fullStyle: full }"
-                  ></iframe>
-                  <div
-                    class="workd_media"
-                    style="height: 400px"
-                    v-else-if="pptImgUrl2.infoData.showType == 3"
-                  >
-                    <video-player
-                      class="video-player vjs-custom-skin"
-                      :playsinline="true"
-                      :options="pptImgUrl2.infoData.playerO"
-                      @play="onPlayerPlay($event)"
-                      style="width: 70%; height: 400px; margin: 0 auto"
-                    ></video-player>
-                  </div>
-                  <div
-                    class="leftImg"
-                    style="height: 400px"
-                    v-else-if="pptImgUrl2.infoData.showType == 4"
-                  >
-                    <img :src="pptImgUrl2.infoData.url" alt="" />
-                  </div>
+                    <pdf
+                      v-if="pptImgUrl2.infoData.showType == 1"
+                      :pdfUrl="pptImgUrl2.infoData.url"
+                      style="width: 100%; height: 400px; overflow: auto"
+                      :class="{ fullStyle: full }"
+                    ></pdf>
+                    <iframe
+                      v-else-if="pptImgUrl2.infoData.showType == 2"
+                      :src="pptImgUrl2.infoData.url"
+                      frameborder="0"
+                      width="100%"
+                      height="400"
+                      :class="{ fullStyle: full }"
+                    ></iframe>
+                    <div
+                      class="workd_media"
+                      style="height: 400px"
+                      v-else-if="pptImgUrl2.infoData.showType == 3"
+                    >
+                      <video-player
+                        class="video-player vjs-custom-skin"
+                        :playsinline="true"
+                        :options="pptImgUrl2.infoData.playerO"
+                        @play="onPlayerPlay($event)"
+                        style="width: 70%; height: 400px; margin: 0 auto"
+                      ></video-player>
+                    </div>
+                    <div
+                      class="leftImg"
+                      style="height: 400px"
+                      v-else-if="pptImgUrl2.infoData.showType == 4"
+                    >
+                      <img :src="pptImgUrl2.infoData.url" alt="" />
+                    </div>
                 </div>
                 </div>
                 <div class="fileBox">
                 <div class="fileBox">
                   <div
                   <div
@@ -885,7 +889,7 @@
           <div
           <div
             v-for="(jd, jdIndex) in anliBox[0].process.stageBox"
             v-for="(jd, jdIndex) in anliBox[0].process.stageBox"
             :key="jdIndex"
             :key="jdIndex"
-            style="margin-top: 20px"
+            style="margin: 20px 0 20px 0"
           >
           >
             <div class="jdTopBox" v-if="jd.staTitle != ''">
             <div class="jdTopBox" v-if="jd.staTitle != ''">
               <div class="jdTopNav">
               <div class="jdTopNav">
@@ -951,7 +955,7 @@
                   <div class="jdRightNav" v-if="hd.actTime">
                   <div class="jdRightNav" v-if="hd.actTime">
                     {{ hd.actTime }}课时
                     {{ hd.actTime }}课时
                   </div>
                   </div>
-                  <div class="funBlock" style="padding: 0">
+                  <!-- <div class="funBlock" style="padding: 0">
                     <div
                     <div
                       class="fold"
                       class="fold"
                       @click="fold(hdIndex, jdIndex, $event, 1)"
                       @click="fold(hdIndex, jdIndex, $event, 1)"
@@ -966,7 +970,7 @@
                     >
                     >
                       <div>展开</div>
                       <div>展开</div>
                     </div>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
                 </div>
               </div>
               </div>
               <div
               <div
@@ -2878,8 +2882,8 @@ export default {
   /* .proOverNav {
   /* .proOverNav {
     width: 52% !important;
     width: 52% !important;
   } */
   } */
-  .fileBox{
-    width: 35% !important;
+  .fileBox {
+    width: 30% !important;
   }
   }
 }
 }
 html,
 html,
@@ -3160,8 +3164,8 @@ body {
   background: #fff;
   background: #fff;
   border-bottom-left-radius: 10px;
   border-bottom-left-radius: 10px;
   border-bottom-right-radius: 10px;
   border-bottom-right-radius: 10px;
-  width: 30%;
-  margin-left: 30px;
+  width: 26%;
+  margin-left: 10px;
 }
 }
 .fileList {
 .fileList {
   width: 100%;
   width: 100%;

+ 14 - 11
src/components/pages/race/eventCenter/myAnli.vue

@@ -55,15 +55,19 @@
                 >
                 >
                   {{ JSON.parse(an.info).courseText }}
                   {{ JSON.parse(an.info).courseText }}
                 </div>
                 </div>
-                <div
-                  class="selectJj"
-                  @click="selectJj(anIndex, 1)"
-                  v-if="!an.isAll"
-                >
-                  <img src="../../../../assets/icon/expand.png" alt="" />
-                </div>
-                <div class="selectJj" @click="selectJj(anIndex, 0)" v-else>
-                  <img src="../../../../assets/icon/fold.png" alt="" />
+                <div v-if="JSON.parse(an.info).courseText.length > 90">
+                  <div
+                    class="selectJj"
+                    @click="selectJj(anIndex, 1)"
+                    v-if="!an.isAll"
+                  >
+                    展开
+                    <!-- <img src="../../../../assets/icon/expand.png" alt="" /> -->
+                  </div>
+                  <div class="selectJj" @click="selectJj(anIndex, 0)" v-else>
+                    收缩
+                    <!-- <img src="../../../../assets/icon/fold.png" alt="" /> -->
+                  </div>
                 </div>
                 </div>
               </div>
               </div>
               <div class="personAndAutor">
               <div class="personAndAutor">
@@ -605,9 +609,8 @@ export default {
 }
 }
 
 
 .selectJj {
 .selectJj {
-  width: 20px;
-  height: 20px;
   cursor: pointer;
   cursor: pointer;
+  color: #ccc;
 }
 }
 
 
 .selectJj > img {
 .selectJj > img {