From 2a41f75fea2773422fb3d6141df253891ec1c919 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 17 Sep 2019 19:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8Abanner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/banner-add-or-update.vue     |   2 +-
 src/views/modules/news/news.vue               | 254 +++++++++++-------
 2 files changed, 160 insertions(+), 96 deletions(-)

diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 4af79ce1..80ab50a0 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -282,7 +282,7 @@ export default {
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 578px;
+  width: 378px;
   height: 178px;
   line-height: 178px;
   text-align: center;
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index 581ad3b0..c8aba0de 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -1,119 +1,175 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-news__news}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="所属街道"
-                    prop="deptId">
-        <el-select v-model="dataForm.streetId"
-                   @change="changeStreet"
-                   placeholder="所属街道">
-          <el-option v-for="item in streetList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属社区">
-        <el-select v-model="dataForm.communityId"
-                   @change="changeCommunity"
-                   placeholder="所属社区">
-          <el-option v-for="item in communityList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属网格">
-        <el-select v-model="dataForm.gridId"
-                   @change="changeGrid"
-                   placeholder="所属网格">
-          <el-option v-for="item in gridList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
+                      prop="deptId">
+          <el-select v-model="dataForm.streetId"
+                     @change="changeStreet"
+                     placeholder="所属街道">
+            <el-option v-for="item in streetList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属社区">
+          <el-select v-model="dataForm.communityId"
+                     @change="changeCommunity"
+                     placeholder="所属社区">
+            <el-option v-for="item in communityList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属网格">
+          <el-select v-model="dataForm.gridId"
+                     @change="changeGrid"
+                     placeholder="所属网格">
+            <el-option v-for="item in gridList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <br>
-      <span class="demonstration">注册时间</span>&nbsp;&nbsp;
-          <el-date-picker
-             @change='setRegistTime'
-             v-model="time"
-             value-format="yyyy-MM-dd"
-             type="daterange"
-             range-separator="至"
-             start-placeholder="开始日期"
-             end-placeholder="结束日期">
-          </el-date-picker> &nbsp; &nbsp;
-      <el-form-item label="类别">
-        <el-select v-model="dataForm.category"
-                   placeholder="所属网格">
-          <el-option v-for="item in categorys"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关键字">
-        <el-form-item>
-          <el-input v-model="dataForm.keyword" placeholder="请输入话题" clearable></el-input>
+        <span class="demonstration">注册时间</span>&nbsp;&nbsp;
+        <el-date-picker @change='setRegistTime'
+                        v-model="time"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+        </el-date-picker> &nbsp; &nbsp;
+        <el-form-item label="类别">
+          <el-select v-model="dataForm.category"
+                     placeholder="所属网格">
+            <el-option v-for="item in categorys"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字">
+          <el-form-item>
+            <el-input v-model="dataForm.keyword"
+                      placeholder="请输入话题"
+                      clearable></el-input>
+          </el-form-item>
         </el-form-item>
-      </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:news:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('news:news:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:news:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('news:news:delete')"
+                     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-column
-            label="序号"
-            width="70px">
-        <template slot-scope="scope">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         width="70px">
+          <template slot-scope="scope">
             {{scope.$index+1}}
-        </template>
-      </el-table-column>
-        <el-table-column prop="newsTitle" label="话题名称" header-align="center" align="center"></el-table-column>
-         <el-table-column prop="readingAmount" label="阅读量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="likeNumber" label="点赞数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unLikeNumber" label="点踩数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creatorName" label="提交人" header-align="center" align="center"></el-table-column>
-        <el-table-column label="有效时间" >
-                <template slot-scope="scope" >
-                  {{scope.row.newsReleaseStartTime}}<br/> 到 <br/> {{scope.row.newsReleaseEndTime}}
-                </template>
+          </template>
         </el-table-column>
-        <el-table-column label="发布状态" :formatter="publishState" header-align="center" align="center">
+        <el-table-column prop="newsTitle"
+                         label="话题名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="readingAmount"
+                         label="阅读量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="likeNumber"
+                         label="点赞数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="unLikeNumber"
+                         label="点踩数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="提交时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="creatorName"
+                         label="提交人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column label="有效时间">
+          <template slot-scope="scope">
+            {{scope.row.newsReleaseStartTime}}<br /> 到 <br /> {{scope.row.newsReleaseEndTime}}
+          </template>
+        </el-table-column>
+        <el-table-column label="发布状态"
+                         :formatter="publishState"
+                         header-align="center"
+                         align="center">
         </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')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
           <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 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>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="50">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.bannerFlag === '0' "
+                       type="text"
+                       size="small"
+                       @click="newsToBanner(scope.row)">上banner</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"
-        @current-change="pageCurrentChangeHandle">
+      <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>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>
@@ -229,7 +285,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.categorys = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     modifyOnLine (row) {
       this.onLine.id = row.id
@@ -240,7 +296,15 @@ export default {
           return this.$message.error(res.msg)
         }
         this.getDataList()
-      }).catch(() => {})
+      }).catch(() => { })
+    },
+    newsToBanner (row) {
+      this.$http.post(`/news/news/newsToBanner/` + row.id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.getDataList()
+      }).catch(() => { })
     }
   },
   components: {