From c65dac78eacce0b0b23d9ef140e74ecb9536438f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 10:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AB=99=E5=86=85--=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=AE=A1=E7=90=86=EF=BC=9A=E6=B6=88=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/notice/notice.vue | 58 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/back/src/views/modules/notice/notice.vue b/back/src/views/modules/notice/notice.vue
index 903edf55..a89c69f8 100644
--- a/back/src/views/modules/notice/notice.vue
+++ b/back/src/views/modules/notice/notice.vue
@@ -15,37 +15,47 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
+        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center" width="180">
+        </el-table-column>
+        <!-- 内容 prop="content"-->
+        <el-table-column :label="$t('news.content')" header-align="center" align="center">
           <template slot-scope="scope">
-              {{ $getDictLabel("notice_type", scope.row.type) }}
+            <el-tooltip effect="dark" :content="scope.row.content" placement="top">
+              <span class="text-ellipsis">{{ scope.row.content }}</span>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center" width="170"></el-table-column>
+        <el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            {{ $getDictLabel("notice_type", scope.row.type) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center"
+          width="150"></el-table-column>
+        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center"
+          width="170"></el-table-column>
         <el-table-column prop="status" :label="$t('notice.status')" header-align="center" align="center" width="130">
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
-              <el-tag v-else size="small" type="success">{{ $t('notice.status1') }}</el-tag>
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
+            <el-tag v-else size="small" type="success">{{ $t('notice.status1') }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{ $t('notice.view') }}</el-button>
+            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
+              {{ $t('update') }}</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{
+                $t('notice.view')
+            }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -60,7 +70,7 @@ import AddOrUpdate from './notice-add-or-update'
 import { addDynamicRoute } from '@/router'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/notice/page',
@@ -77,7 +87,7 @@ export default {
     AddOrUpdate
   },
   methods: {
-    viewHandle (row) {
+    viewHandle(row) {
       // 路由参数
       const routeParams = {
         routeName: `${this.$route.name}__${row.id}`,
@@ -93,3 +103,13 @@ export default {
   }
 }
 </script>
+<style scoped>
+.text-ellipsis {
+  /*1. 先强制一行内显示文本*/
+  white-space: nowrap;
+  /*2. 超出的部分隐藏*/
+  overflow: hidden;
+  /*3. 文字用省略号替代超出的部分*/
+  text-overflow: ellipsis;
+}
+</style>