From 2ca8bd4fff4fc11ada7069385d01b41c742e573e Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 7 Jul 2020 14:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=84=E7=A7=8D=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/allnews-healthy.vue  | 283 ++++++++++++++++++
 src/views/modules/news/allnews-safety.vue   | 309 ++++++++++++++++++++
 src/views/modules/news/allnews-services.vue | 283 ++++++++++++++++++
 src/views/modules/news/allnews.vue          |   1 +
 src/views/modules/news/news-healthy.vue     |   2 +-
 src/views/modules/news/news-safety.vue      |   2 +-
 src/views/modules/news/news-services.vue    |   2 +-
 7 files changed, 879 insertions(+), 3 deletions(-)
 create mode 100644 src/views/modules/news/allnews-healthy.vue
 create mode 100644 src/views/modules/news/allnews-safety.vue
 create mode 100644 src/views/modules/news/allnews-services.vue

diff --git a/src/views/modules/news/allnews-healthy.vue b/src/views/modules/news/allnews-healthy.vue
new file mode 100644
index 0000000..e34d2ca
--- /dev/null
+++ b/src/views/modules/news/allnews-healthy.vue
@@ -0,0 +1,283 @@
+<template>
+  <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-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </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"
+                     clearable
+                     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-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-form-item>
+        <el-form-item>
+          <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">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="newsTitle"
+                         label="文章标题"
+                         width="360px"
+                         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 :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="200">
+          <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>
+          </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './news-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/news/pagenew',
+        getDataListIsPage: true,
+        deleteURL: '/news/news',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        deptId: '',
+        startTime: '',
+        endTime: '',
+        keyword: '',
+        sectionCode: 'healthy_living',
+        category: ''
+      },
+      time: '',
+      options: [],
+      deptIdList: [],
+      categorys: [],
+      onLine: {
+        id: '',
+        onLineState: ''
+      }
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.getListCategory()
+  },
+  methods: {
+    newsUpDownState: function (row) {
+      return row.newsUpDownState === '1' ? '下线' : '上线'
+    },
+    publishState: function (row) {
+      var stdt = new Date(row.newsReleaseStartTime.replace('-', '/'))
+      var eddt = new Date(row.newsReleaseEndTime.replace('-', '/'))
+      var nowdt = new Date()
+      if (row.newsUpDownState === '1') {
+        // 手动下线
+        return '已下线'
+      }
+      if (nowdt > stdt && nowdt < eddt && row.newsUpDownState === '0') {
+        return '已上线'
+      }
+      if (nowdt < stdt) {
+        return '未上线'
+      }
+      if (nowdt > eddt) {
+        return '已下线'
+      }
+    },
+    setRegistTime () {
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
+    getListCategory () {
+      this.$http.get(`/news/newscategory/category/${this.dataForm.sectionCode}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categorys = res.data
+      }).catch(() => { })
+    },
+    modifyOnLine (row) {
+      this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.onLine.id = row.id
+        this.onLine.onLineState = '0'
+        this.$http.post(`/news/news/modifyOnLine/`, this.onLine).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+            }
+          })
+          this.getDataList()
+        }).catch(() => { })
+      }).catch(() => { })
+    },
+    // 获取数据列表
+    getDataList () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataListLoading = true
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.deptId = val[val.length - 1]
+      } else {
+        this.dataForm.deptId = ''
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/news/allnews-safety.vue b/src/views/modules/news/allnews-safety.vue
new file mode 100644
index 0000000..fa2bda5
--- /dev/null
+++ b/src/views/modules/news/allnews-safety.vue
@@ -0,0 +1,309 @@
+<template>
+  <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-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </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"
+                     clearable
+                     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-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-form-item>
+        <el-form-item>
+          <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">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="newsTitle"
+                         label="文章标题"
+                         width="360px"
+                         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 :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="200">
+          <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>
+          </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './news-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/news/pagenew',
+        getDataListIsPage: true,
+        deleteURL: '/news/news',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        deptId: '',
+        startTime: '',
+        endTime: '',
+        keyword: '',
+        sectionCode: 'safety_living',
+        category: ''
+      },
+      time: '',
+      options: [],
+      deptIdList: [],
+      categorys: [],
+      onLine: {
+        id: '',
+        onLineState: ''
+      }
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.getListCategory()
+  },
+  methods: {
+    newsUpDownState: function (row) {
+      return row.newsUpDownState === '1' ? '下线' : '上线'
+    },
+    publishState: function (row) {
+      var stdt = new Date(row.newsReleaseStartTime.replace('-', '/'))
+      var eddt = new Date(row.newsReleaseEndTime.replace('-', '/'))
+      var nowdt = new Date()
+      if (row.newsUpDownState === '1') {
+        // 手动下线
+        return '已下线'
+      }
+      if (nowdt > stdt && nowdt < eddt && row.newsUpDownState === '0') {
+        return '已上线'
+      }
+      if (nowdt < stdt) {
+        return '未上线'
+      }
+      if (nowdt > eddt) {
+        return '已下线'
+      }
+    },
+    setRegistTime () {
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
+    getListCategory () {
+      this.$http.get(`/news/newscategory/category/${this.dataForm.sectionCode}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categorys = res.data
+      }).catch(() => { })
+    },
+    modifyOnLine (row) {
+      this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.onLine.id = row.id
+        this.onLine.onLineState = '0'
+        this.$http.post(`/news/news/modifyOnLine/`, this.onLine).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+            }
+          })
+          this.getDataList()
+        }).catch(() => { })
+      }).catch(() => { })
+    },
+    // 获取数据列表
+    getDataList () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataListLoading = true
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    },
+    newsToBanner (row) {
+      this.$confirm(this.$t('prompt.info', { 'handle': '上banner' }), this.$t('上banner'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.post(`/news/news/newsToBanner/` + row.id).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+            }
+          })
+          this.getDataList()
+        }).catch(() => { })
+      }).catch(() => { })
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.deptId = val[val.length - 1]
+      } else {
+        this.dataForm.deptId = ''
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/news/allnews-services.vue b/src/views/modules/news/allnews-services.vue
new file mode 100644
index 0000000..876b054
--- /dev/null
+++ b/src/views/modules/news/allnews-services.vue
@@ -0,0 +1,283 @@
+<template>
+  <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-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </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"
+                     clearable
+                     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-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-form-item>
+        <el-form-item>
+          <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">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="newsTitle"
+                         label="文章标题"
+                         width="360px"
+                         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 :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="200">
+          <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>
+          </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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './news-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/news/pagenew',
+        getDataListIsPage: true,
+        deleteURL: '/news/news',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        deptId: '',
+        startTime: '',
+        endTime: '',
+        keyword: '',
+        sectionCode: 'integrated_services',
+        category: ''
+      },
+      time: '',
+      options: [],
+      deptIdList: [],
+      categorys: [],
+      onLine: {
+        id: '',
+        onLineState: ''
+      }
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.getListCategory()
+  },
+  methods: {
+    newsUpDownState: function (row) {
+      return row.newsUpDownState === '1' ? '下线' : '上线'
+    },
+    publishState: function (row) {
+      var stdt = new Date(row.newsReleaseStartTime.replace('-', '/'))
+      var eddt = new Date(row.newsReleaseEndTime.replace('-', '/'))
+      var nowdt = new Date()
+      if (row.newsUpDownState === '1') {
+        // 手动下线
+        return '已下线'
+      }
+      if (nowdt > stdt && nowdt < eddt && row.newsUpDownState === '0') {
+        return '已上线'
+      }
+      if (nowdt < stdt) {
+        return '未上线'
+      }
+      if (nowdt > eddt) {
+        return '已下线'
+      }
+    },
+    setRegistTime () {
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
+    getListCategory () {
+      this.$http.get(`/news/newscategory/category/${this.dataForm.sectionCode}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.categorys = res.data
+      }).catch(() => { })
+    },
+    modifyOnLine (row) {
+      this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.onLine.id = row.id
+        this.onLine.onLineState = '0'
+        this.$http.post(`/news/news/modifyOnLine/`, this.onLine).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+            }
+          })
+          this.getDataList()
+        }).catch(() => { })
+      }).catch(() => { })
+    },
+    // 获取数据列表
+    getDataList () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+      this.dataListLoading = true
+      this.$http.get(
+        this.mixinViewModuleOptions.getDataListURL,
+        {
+          params: {
+            order: this.order,
+            orderField: this.orderField,
+            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+            ...this.dataForm
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.deptId = val[val.length - 1]
+      } else {
+        this.dataForm.deptId = ''
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 9457561..9296bab 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -66,6 +66,7 @@
         </el-table-column>
         <el-table-column prop="newsTitle"
                          label="标题名称"
+                         width="360px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
diff --git a/src/views/modules/news/news-healthy.vue b/src/views/modules/news/news-healthy.vue
index e34d2ca..62dfb40 100644
--- a/src/views/modules/news/news-healthy.vue
+++ b/src/views/modules/news/news-healthy.vue
@@ -142,7 +142,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/news/pagenew',
+        getDataListURL: '/news/news/page',
         getDataListIsPage: true,
         deleteURL: '/news/news',
         deleteIsBatch: true
diff --git a/src/views/modules/news/news-safety.vue b/src/views/modules/news/news-safety.vue
index fa2bda5..68e815b 100644
--- a/src/views/modules/news/news-safety.vue
+++ b/src/views/modules/news/news-safety.vue
@@ -147,7 +147,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/news/pagenew',
+        getDataListURL: '/news/news/page',
         getDataListIsPage: true,
         deleteURL: '/news/news',
         deleteIsBatch: true
diff --git a/src/views/modules/news/news-services.vue b/src/views/modules/news/news-services.vue
index 876b054..fd8de9e 100644
--- a/src/views/modules/news/news-services.vue
+++ b/src/views/modules/news/news-services.vue
@@ -142,7 +142,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/news/pagenew',
+        getDataListURL: '/news/news/page',
         getDataListIsPage: true,
         deleteURL: '/news/news',
         deleteIsBatch: true