Merge branch 'master' of http://git.cc-lotus.info/shuiTou/web

src/views/win/introduceParts/combriefIndex.vue

@@ -162,6 +162,19 @@ const toOpen = () => {
         }
 
         .brief {
+          /* 设置为弹性盒模型 */
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          /* 限制显示 2 行 */
+          -webkit-line-clamp: 2;
+          /* 隐藏溢出内容 */
+          overflow: hidden;
+          /* 溢出部分显示省略号 */
+          text-overflow: ellipsis;
+          /* 标准的 box-orient 属性 */
+          box-orient: vertical;
+          /* 标准的 line-clamp 属性 */
+          line-clamp: 2;
           color: rgb(102, 102, 102);
           font-family: '黑体';
           font-size: 20px;
@@ -169,9 +182,14 @@ const toOpen = () => {
           line-height: 32px;
           letter-spacing: 0px;
           margin: 0 0 40px 0;
-        }
-
-        .btns {
+          img {
+            /* 确保图片不会超出容器宽度 */
+            max-width: 100%;
+            /* 图片高度自适应 */
+            height: auto;
+            /* 让图片与文本垂直对齐 */
+            vertical-align: middle;
+          }
         }
       }
     }

src/views/win/newsParts/listIndex.vue

@@ -32,9 +32,7 @@
             <el-col :span="24" class="title">
               {{ item.title }}
             </el-col>
-            <el-col :span="24" class="brief" v-html="item.brief">
-              <!-- {{ item.brief }} -->
-            </el-col>
+            <el-col :span="24" class="brief" v-html="item.brief"> </el-col>
           </el-col>
           <el-col :span="6" class="imgs">
             <el-image class="images" :src="item.url"></el-image>
@@ -241,7 +239,6 @@ onMounted(() => {
             font-weight: 400;
             line-height: 32px;
             letter-spacing: 0px;
-
             overflow: hidden;
             text-overflow: ellipsis;
             -webkit-line-clamp: 3;
@@ -253,6 +250,7 @@ onMounted(() => {
 
         .imgs {
           .images {
+            height: 100%;
           }
         }
       }

src/views/win/queryParts/listIndex.vue

@@ -9,15 +9,14 @@
         @click="toDetail(item)"
       >
         <el-row class="list_1">
-          <el-col :span="20" class="title textOver">
+          <el-col :span="19" class="title textOver">
             {{ item.title }}
           </el-col>
-          <el-col :span="4" class="date">
+          <el-col :span="5" class="date">
             {{ tf(item.release_date) }}
           </el-col>
         </el-row>
-        <el-row class="list_2" v-html="item.txt">
-        </el-row>
+        <el-row class="list_2" v-html="item.txt"> </el-row>
       </el-col>
     </el-col>
     <el-col :span="24" class="pages">
@@ -102,13 +101,27 @@ const toDetail = (data: any) => {
         font-size: 20px;
         font-weight: 400;
         line-height: 29px;
-        letter-spacing: 0px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        -webkit-line-clamp: 2;
-        word-break: break-all;
+        /* 设置为弹性盒模型 */
         display: -webkit-box;
         -webkit-box-orient: vertical;
+        /* 限制显示 2 行 */
+        -webkit-line-clamp: 2;
+        /* 隐藏溢出内容 */
+        overflow: hidden;
+        /* 溢出部分显示省略号 */
+        text-overflow: ellipsis;
+        /* 标准的 box-orient 属性 */
+        box-orient: vertical;
+        /* 标准的 line-clamp 属性 */
+        line-clamp: 2;
+        img {
+          /* 确保图片不会超出容器宽度 */
+          max-width: 100%;
+          /* 图片高度自适应 */
+          height: auto;
+          /* 让图片与文本垂直对齐 */
+          vertical-align: middle;
+        }
       }
     }
 

src/views/win/watersupplyParts/listIndex.vue

@@ -28,10 +28,10 @@
             :key="index"
             @click="toDetail(item)"
           >
-            <el-col :span="20" class="title textOver">
+            <el-col :span="19" class="title textOver">
               {{ item.title }}
             </el-col>
-            <el-col :span="4" class="date">
+            <el-col :span="5" class="date">
               {{ tf(item.date) }}
             </el-col>
           </el-col>

src/views/winParts/introduceIndex.vue

@@ -120,6 +120,27 @@ const toOpen = () => {
       }
 
       .left2 {
+        /* 设置为弹性盒模型 */
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        /* 限制显示 2 行 */
+        -webkit-line-clamp: 2;
+        /* 隐藏溢出内容 */
+        overflow: hidden;
+        /* 溢出部分显示省略号 */
+        text-overflow: ellipsis;
+        /* 标准的 box-orient 属性 */
+        box-orient: vertical;
+        /* 标准的 line-clamp 属性 */
+        line-clamp: 2;
+        img {
+          /* 确保图片不会超出容器宽度 */
+          max-width: 100%;
+          /* 图片高度自适应 */
+          height: auto;
+          /* 让图片与文本垂直对齐 */
+          vertical-align: middle;
+        }
         p {
           color: rgb(25, 25, 26);
           font-family: '黑体';

src/views/winParts/newsIndex.vue

@@ -29,7 +29,7 @@
                   <!-- item.ext.title -->
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
                   <!-- item.txt.txt -->
-                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
                   <!-- item.ext.release_date -->
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
@@ -54,7 +54,7 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -78,7 +78,7 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -102,7 +102,7 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -251,13 +251,27 @@ const toDetail = (data: any) => {
               font-size: 20px;
               font-weight: 400;
               line-height: 29px;
-              letter-spacing: 0px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              -webkit-line-clamp: 2;
-              word-break: break-all;
+              /* 设置为弹性盒模型 */
               display: -webkit-box;
               -webkit-box-orient: vertical;
+              /* 限制显示 2 行 */
+              -webkit-line-clamp: 2;
+              /* 隐藏溢出内容 */
+              overflow: hidden;
+              /* 溢出部分显示省略号 */
+              text-overflow: ellipsis;
+              /* 标准的 box-orient 属性 */
+              box-orient: vertical;
+              /* 标准的 line-clamp 属性 */
+              line-clamp: 2;
+              img {
+                /* 确保图片不会超出容器宽度 */
+                max-width: 100%;
+                /* 图片高度自适应 */
+                height: auto;
+                /* 让图片与文本垂直对齐 */
+                vertical-align: middle;
+              }
             }
 
             .date {