From 96702e987dac7fa46d60486e63e54530a418b045 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 7 Jul 2020 14:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8F=AA=E6=9C=89=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/allnews-add-or-update.vue    |  6 ++++++
 src/views/modules/news/allnews-healthy.vue    | 14 ++++----------
 src/views/modules/news/allnews-safety.vue     | 19 ++++---------------
 src/views/modules/news/allnews-services.vue   | 14 ++++----------
 src/views/modules/news/allnews.vue            |  2 ++
 src/views/modules/news/news-healthy.vue       | 14 ++++----------
 src/views/modules/news/news-safety.vue        | 19 ++++---------------
 src/views/modules/news/news-services.vue      | 14 ++++----------
 src/views/modules/news/news.vue               |  2 ++
 9 files changed, 34 insertions(+), 70 deletions(-)

diff --git a/src/views/modules/news/allnews-add-or-update.vue b/src/views/modules/news/allnews-add-or-update.vue
index 224c098..df9a711 100644
--- a/src/views/modules/news/allnews-add-or-update.vue
+++ b/src/views/modules/news/allnews-add-or-update.vue
@@ -70,6 +70,12 @@
                         end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="发布人"
+                    prop="creatorName">
+        <el-form-item>
+          {{dataForm.creatorName}}
+        </el-form-item>
+      </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
diff --git a/src/views/modules/news/allnews-healthy.vue b/src/views/modules/news/allnews-healthy.vue
index e34d2ca..0152e5a 100644
--- a/src/views/modules/news/allnews-healthy.vue
+++ b/src/views/modules/news/allnews-healthy.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,15 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -136,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/allnews-safety.vue b/src/views/modules/news/allnews-safety.vue
index fa2bda5..499eb34 100644
--- a/src/views/modules/news/allnews-safety.vue
+++ b/src/views/modules/news/allnews-safety.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,20 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
-            <el-button v-if="scope.row.bannerFlag === '0' && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date() "
-                       type="text"
-                       size="small"
-                       @click="newsToBanner(scope.row)">上banner</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -141,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/allnews-services.vue b/src/views/modules/news/allnews-services.vue
index 876b054..4809f5b 100644
--- a/src/views/modules/news/allnews-services.vue
+++ b/src/views/modules/news/allnews-services.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,15 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -136,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 9296bab..2c31ca5 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
diff --git a/src/views/modules/news/news-healthy.vue b/src/views/modules/news/news-healthy.vue
index 62dfb40..cfb2153 100644
--- a/src/views/modules/news/news-healthy.vue
+++ b/src/views/modules/news/news-healthy.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,15 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -136,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/news-safety.vue b/src/views/modules/news/news-safety.vue
index 68e815b..86daed6 100644
--- a/src/views/modules/news/news-safety.vue
+++ b/src/views/modules/news/news-safety.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,20 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
-            <el-button v-if="scope.row.bannerFlag === '0' && scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date() "
-                       type="text"
-                       size="small"
-                       @click="newsToBanner(scope.row)">上banner</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -141,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/news-services.vue b/src/views/modules/news/news-services.vue
index fd8de9e..319f0f9 100644
--- a/src/views/modules/news/news-services.vue
+++ b/src/views/modules/news/news-services.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"
@@ -107,15 +109,7 @@
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-if="scope.row.newsUpDownState === '0' && new Date(scope.row.newsReleaseStartTime.replace('-', '/')) < new Date()
-             && new Date(scope.row.newsReleaseEndTime.replace('-', '/')) > new Date()"
-                       type="text"
-                       size="small"
-                       @click="modifyOnLine(scope.row)">下线</el-button>
+                       @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -136,7 +130,7 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './news-add-or-update'
+import AddOrUpdate from './allnews-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index 6205836..69ab5da 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -71,10 +71,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="likeNumber"
                          label="支持数"
+                         width="70px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="unLikeNumber"