liuyu 4 rokov pred
rodič
commit
edd353e0f9

+ 3 - 19
src/views/meetingBrief/detail.vue

@@ -17,24 +17,8 @@
             <el-col :span="24" class="newsInfo">
               <p>{{ newsInfo.title }}</p>
               <p>
-                <span>{{
-                  newsInfo.type == '0'
-                    ? '会议简介'
-                    : newsInfo.type == '1'
-                    ? '会议日程'
-                    : newsInfo.type == '2'
-                    ? '主办方介绍'
-                    : newsInfo.type == '3'
-                    ? '协办方介绍'
-                    : newsInfo.type == '4'
-                    ? '专家介绍'
-                    : newsInfo.type == '5'
-                    ? '继续教育学分申请'
-                    : newsInfo.type == '6'
-                    ? '温馨提示'
-                    : '暂无'
-                }}</span>
                 <span>发布时间:{{ newsInfo.publish_time }}</span>
+                <span></span>
               </p>
               <el-image :src="newsInfo.filedir" class="image"></el-image>
               <p v-html="newsInfo.content"></p>
@@ -177,8 +161,8 @@ export default {
       }
     }
     .image {
-      width: 100%;
-      height: 200px;
+      max-width: 100%;
+      max-height: 200px;
     }
   }
 }

+ 40 - 24
src/views/meetingBrief/index.vue

@@ -13,31 +13,41 @@
             :key="index"
             @click.native="$router.push({ path: '/meetingBrief/detail', query: { type: item.type, id: item.id } })"
           >
-            <el-col :span="8" class="image">
-              <el-image :src="item.filedir"></el-image>
+            <el-col :span="24" class="zjjs" v-if="item.type === '4'">
+              <el-col :span="24" class="image">
+                <el-image :src="item.filedir" style="max-width:100%;max-height: 100%;"></el-image>
+              </el-col>
+              <el-col :span="24" class="text">
+                <p class="title textOver">{{ item.title }}</p>
+              </el-col>
             </el-col>
-            <el-col :span="16" class="text">
-              <p class="title textOver">{{ item.title }}</p>
-              <p class="type">
-                {{
-                  item.type == '0'
-                    ? '会议简介'
-                    : item.type == '1'
-                    ? '会议日程'
-                    : item.type == '2'
-                    ? '主办方介绍'
-                    : item.type == '3'
-                    ? '协办方介绍'
-                    : item.type == '4'
-                    ? '专家介绍'
-                    : item.type == '5'
-                    ? '继续教育学分申请'
-                    : item.type == '6'
-                    ? '温馨提示'
-                    : '暂无'
-                }}
-              </p>
-              <p class="time">发布时间:{{ item.publish_time }}</p>
+            <el-col :span="24" v-else>
+              <el-col :span="8" class="image">
+                <el-image :src="item.filedir"></el-image>
+              </el-col>
+              <el-col :span="16" class="text">
+                <p class="title textOver">{{ item.title }}</p>
+                <p class="type">
+                  {{
+                    item.type == '0'
+                      ? '会议简介'
+                      : item.type == '1'
+                      ? '会议日程'
+                      : item.type == '2'
+                      ? '主办方介绍'
+                      : item.type == '3'
+                      ? '协办方介绍'
+                      : item.type == '4'
+                      ? '专家介绍'
+                      : item.type == '5'
+                      ? '继续教育学分申请'
+                      : item.type == '6'
+                      ? '温馨提示'
+                      : '暂无'
+                  }}
+                </p>
+                <p class="time">发布时间:{{ item.publish_time }}</p>
+              </el-col>
             </el-col>
           </el-col>
         </el-col>
@@ -132,7 +142,13 @@ export default {
     margin: 10px;
     border-bottom: 1px dashed #ccc;
     width: 95%;
+    .zjjs {
+      float: left;
+      width: 50%;
+      height: 161px;
+    }
     .image {
+      height: 120px;
       .el-image {
         border-radius: 10px;
       }