From b4d295e52024302389321e21d20b21e12459e90c Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 15 Jul 2020 10:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/allnews.vue   | 37 ++++++++++++++++++----------
 src/views/modules/news/allnotice.vue | 31 ++++++++++++++++-------
 src/views/modules/news/banner.vue    | 32 +++++++++++++++---------
 src/views/modules/news/news.vue      | 33 ++++++++++++++++---------
 src/views/modules/news/newsdraft.vue | 30 +++++++++++++---------
 src/views/modules/news/notice.vue    | 19 +++++++-------
 6 files changed, 118 insertions(+), 64 deletions(-)

diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 46e04e1..24132e8 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -96,48 +96,59 @@
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
         <el-table-column label="序号"
-                         width="70px">
+                         width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="newsTitle"
+        <el-table-column show-overflow-tooltip
+                         prop="newsTitle"
                          label="标题名称"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="400"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="unLikeNumber"
                          label="不支持数"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="allDeptNames"
+                         align="center"
+                         width="100"></el-table-column>
+        <el-table-column show-overflow-tooltip
+                         prop="allDeptNames"
                          label="所属网格"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="200"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="creatorName"
                          label="提交人"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column label="有效时间">
+                         align="center"
+                         show-overflow-tooltip
+                         width="100"></el-table-column>
+        <el-table-column label="有效时间" width="360" header-align="center" align="center">
           <template slot-scope="scope">
-            {{scope.row.newsReleaseStartTime}}<br /> 到 <br /> {{scope.row.newsReleaseEndTime}}
+            {{scope.row.newsReleaseStartTime}} 到 {{scope.row.newsReleaseEndTime}}
           </template>
         </el-table-column>
         <el-table-column label="发布状态"
                          :formatter="publishState"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="100">
         </el-table-column>
         <!-- <el-table-column prop="newsUpDownState" label="新闻上下线状态" :formatter="newsUpDownState" header-align="center" align="center"></el-table-column> -->
         <el-table-column :label="$t('handle')"
diff --git a/src/views/modules/news/allnotice.vue b/src/views/modules/news/allnotice.vue
index 9dc2c1a..4a49149 100644
--- a/src/views/modules/news/allnotice.vue
+++ b/src/views/modules/news/allnotice.vue
@@ -10,7 +10,7 @@
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
-        </el-form-item>       
+        </el-form-item>
         <el-form-item>
           <el-input v-model="dataForm.noticeTitle"
                     placeholder="通知标题"
@@ -35,23 +35,34 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column type="selection"
+        <!-- <el-table-column type="selection"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"></el-table-column> -->
+             <el-table-column label="序号"
+                         width="50px"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="noticeTitle"
                          label="通知标题"
                          header-align="center"
                          align="center"
-                         width="350"></el-table-column>
+                         show-overflow-tooltip
+                         min-width="400"></el-table-column>
         <el-table-column prop="deptName"
                          label="通知所属部门"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         show-overflow-tooltip
+                         width="150"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"
                          align="center"
-                         width="100"></el-table-column>
+                         width="70"></el-table-column>
         <el-table-column prop="creatorName"
                          label="创建人"
                          header-align="center"
@@ -59,17 +70,19 @@
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="noticeReleaseState"
                          label="已发布"
                          header-align="center"
                          :formatter="showIsPublishFormatter"
                          align="center"
-                         width="100"></el-table-column>
+                         width="70"></el-table-column>
         <el-table-column prop="releaseTime"
                          label="发布时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/news/banner.vue b/src/views/modules/news/banner.vue
index 5a1395e..6cf9cf4 100644
--- a/src/views/modules/news/banner.vue
+++ b/src/views/modules/news/banner.vue
@@ -23,34 +23,40 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column prop="title"
+        <el-table-column show-overflow-tooltip
+                         prop="title"
                          label="标题"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="400"></el-table-column>
         <el-table-column prop="imgUrl"
                          label="banner图片"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
             <img :src="scope.row.imgUrl"
-                 width="40"
-                 height="40" />
+                 width="100"
+                 height="100" />
           </template>
         </el-table-column>
         <el-table-column prop="bannerType"
                          label="banner类型"
                          :formatter="setBannerType"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="100"></el-table-column>
         <el-table-column prop="state"
                          label="上下架状态"
                          :formatter="bannerState"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="100"></el-table-column>
         <el-table-column prop="stateTime"
                          label="上下架时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <!-- <el-table-column prop="createdBy"
                          label="创建人"
                          header-align="center"
@@ -58,16 +64,20 @@
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="position"
                          label="位置"
                          header-align="center"
                          :formatter="setPosition"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="100"
+                         show-overflow-tooltip></el-table-column>
         <el-table-column prop="updatedTime"
                          label="更新时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index 8e6c247..ca2a173 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -96,44 +96,55 @@
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
         <el-table-column label="序号"
-                         width="70px">
+                         width="50px"
+                         header-align="center"
+                         align="center">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="newsTitle"
+        <el-table-column show-overflow-tooltip
+                         prop="newsTitle"
                          label="标题名称"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="400"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="unLikeNumber"
                          label="不支持数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="100"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="creatorName"
                          label="提交人"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column label="有效时间">
+                         align="center"
+                         show-overflow-tooltip
+                         width="100"></el-table-column>
+        <el-table-column label="有效时间" width="360" header-align="center" align="center">
           <template slot-scope="scope">
-            {{scope.row.newsReleaseStartTime}}<br /> 到 <br /> {{scope.row.newsReleaseEndTime}}
+            {{scope.row.newsReleaseStartTime}} 到 {{scope.row.newsReleaseEndTime}}
           </template>
         </el-table-column>
         <el-table-column label="发布状态"
                          :formatter="publishState"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="100">
         </el-table-column>
         <!-- <el-table-column prop="newsUpDownState" label="新闻上下线状态" :formatter="newsUpDownState" header-align="center" align="center"></el-table-column> -->
         <el-table-column :label="$t('handle')"
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index fed1490..fb90647 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -96,38 +96,46 @@
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
         <el-table-column label="序号"
-                         width="70px">
+                         width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="newsTitle"
+        <el-table-column show-overflow-tooltip
+                         prop="newsTitle"
                          label="标题名称"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="400"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="70"></el-table-column>
         <el-table-column prop="unLikeNumber"
                          label="不支持数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="100"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="creatorName"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column show-overflow-tooltip
+                         prop="creatorName"
                          label="提交人"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column label="有效时间">
+                         align="center"
+                         width="100"></el-table-column>
+        <el-table-column label="有效时间" width="360" header-align="center" align="center">
           <template slot-scope="scope">
-            {{scope.row.newsReleaseStartTime}}<br /> 到 <br /> {{scope.row.newsReleaseEndTime}}
+            {{scope.row.newsReleaseStartTime}} 到 {{scope.row.newsReleaseEndTime}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('handle')"
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index 521ce4f..0786dbc 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -46,7 +46,8 @@
                          label="通知标题"
                          header-align="center"
                          align="center"
-                         width="350"></el-table-column>
+                         show-overflow-tooltip
+                         min-width="400"></el-table-column>
         <el-table-column prop="noticeCategory"
                          label="所属模块"
                          header-align="center"
@@ -67,24 +68,24 @@
                          label="发布时间"
                          header-align="center"
                          align="center"
-                         width="220"></el-table-column>
+                         width="180"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="240">
+                         width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('news:notice:update')"
-                       type="primary"
-                       size="mini"
+                       type="text"
+                       size="small"
                        @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('news:notice:publish') && scope.row.noticeReleaseState === '0'"
-                       type="primary"
-                       size="mini"
+                       type="text"
+                       size="small"
                        @click="noticePublishHandle(scope.row.id)">发布</el-button>
             <el-button v-if="$hasPermission('news:notice:delete')"
-                       type="danger"
-                       size="mini"
+                       type="text"
+                       size="small"
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>