Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

# Conflicts:
#	src/config/api.js

src/components/wangeditor/index.vue

@@ -0,0 +1,77 @@
+<template>
+    <div id="websiteEditorElem" style="height: 400px"></div>
+</template>
+
+<script>
+    import E from 'wangeditor'
+    export default {
+        name: "index",
+        props:[
+          'content'
+        ],
+        watch: {
+            text(newVal, oldVal) {
+                console.log(newVal, oldVal)
+                //this.phoneEditor.txt.html(this.text)
+                if (!newVal && oldVal) {
+                    this.text = newVal
+                    this.intiPhoneEditor()
+                }
+                this.sendContent()
+            }
+        },
+        data() {
+          return {
+              text: this.content,
+              phoneEditor: ''
+          }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.intiPhoneEditor()
+            })
+        },
+        methods: {
+            sendContent() {
+                this.$emit('get-content', this.text)
+            },
+            intiPhoneEditor() {
+                console.log('初始化值：', this.text)
+                const _that = this
+                _that.phoneEditor = new E('#websiteEditorElem')
+                const phoneEditor = _that.phoneEditor
+                phoneEditor.customConfig.zIndex = 1
+                phoneEditor.customConfig.onchange = function (html) {
+                    _that.text = html
+                }
+                // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
+                // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
+
+                // phoneEditor.customConfig.customUploadImg = function (files, insert) {
+                //     _that.uploadImg(files[0]).then(data => {
+                //         insert(data)
+                //     })
+                // }
+                phoneEditor.customConfig.menus = [
+                    'head',  // 标题
+                    'bold',  // 粗体
+                    'fontSize',  // 字号
+                    'fontName',  // 字体
+                    'italic',  // 斜体
+                    'underline',  // 下划线
+                    'strikeThrough',  // 删除线
+                    'foreColor',  // 文字颜色
+                    'backColor',  // 背景颜色
+                    'justify',  // 对齐方式
+                    'image',  // 插入图片
+                ]
+                phoneEditor.create()
+                phoneEditor.txt.html(this.text)
+            },
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/config/api.js

@@ -193,6 +193,28 @@ const apis = {
       url: `${commPrefix}/tdPointsRules/change`
     }
   },
+  news: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/taNews`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/taNews`
+    },
+    delete: {
+      method: 'delete',
+      url: `${commPrefix}/taNews/:id`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/taNews/:id`
+    },
+    getById: {
+      method: 'get',
+      url: `${commPrefix}/taNews/:id`
+    }
+  }
 }
 
 export default apis

src/store/modules/news.js

@@ -71,6 +71,67 @@ export default {
                     reject(err)
                 })
             })
+        },
+        getList({ commit }, payload) { // 查询所有资迅
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.news.list,
+                    params: payload,
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        getById({ commit }, payload) { // 根据Id查询资迅
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.news.getById,
+                    urlData: { id: payload.newsId },
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        add({ commit }, payload) { // 添加
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.news.add,
+                    data: payload,
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        update({ commit }, payload) { // 修改
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.news.update,
+                    urlData:{ id: payload.newsId },
+                    data:payload
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        delete({ commit }, payload) { // 删除
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.news.delete,
+                    urlData: { id: payload.newsId },
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
         }
     }
 }

src/views/index.js

@@ -276,7 +276,25 @@ const pages = [
           menuShow: false,
           title: '编辑资迅类型',
         },
-      }
+      },
+      {
+        path: '/news/list',
+        name: 'news-list',
+        component: () => import('./news/index.vue'),
+        meta: {
+          menuShow: true,
+          title: '资迅列表',
+        },
+      },
+      {
+        path: '/news/edi',
+        name: 'news-edi',
+        component: () => import('./news/edi/index.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑资迅',
+        },
+      },
     ]
   },
   {

src/views/news/edi/index.vue

@@ -0,0 +1,221 @@
+<template>
+    <div id="root">
+        <el-form ref="form" :model="form" label-width="80px" class="form">
+            <el-form-item label="所属项目">
+                <el-select v-model="form.buildingId" placeholder="请选择">
+                    <el-option
+                            v-for="item in buildingList"
+                            :key="item.buildingId"
+                            :label="item.buildingName"
+                            :value="item.buildingId">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="资讯图片">
+<!--                class="avatar-uploader"-->
+                <el-upload
+                        :headers="uploadHeaders"
+                        :action="upFileUrl"
+                        :show-file-list="false"
+                        :on-success="handleAvatarSuccess">
+                    <img v-if="imageUrl" :src="imageUrl" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="资讯标题">
+                <el-input v-model="form.newsName"></el-input>
+            </el-form-item>
+            <el-form-item label="资讯类型">
+                <el-select v-model="form.newsTypeId" placeholder="请选择">
+                    <el-option
+                            v-for="item in typeList"
+                            :key="item.newsTypeId"
+                            :label="item.newsTypeName"
+                            :value="item.newsTypeId">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="资讯详情">
+                <my-wangeditor :content="form.newsDetail" @get-content="getEdiCentent"></my-wangeditor>
+            </el-form-item>
+            <el-form-item label="状态">
+                <el-select v-model="form.newsStatus" placeholder="请选择">
+                    <el-option
+                            v-for="item in optionNewsStatus"
+                            :key="item.newsStatus"
+                            :label="item.name"
+                            :value="item.newsStatus">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitNewsType">保存</el-button>
+                <el-button @click="cancel">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    import myWangeditor from '../../../components/wangeditor'
+    import apis from '../../../config/api'
+    export default {
+        name: "newsEdiIndex",
+        data() {
+            return {
+                upFileUrl: apis.file.upload.url,
+                imageUrl: '',
+                optionNewsStatus: [
+                    {
+                        name: '已发布',
+                        newsStatus: 0
+                    },
+                    {
+                        name: '未发布',
+                        newsStatus: 1
+                    }
+                ],
+                form: {
+                    newsId: '',
+                    newsTypeId: '',
+                    newsImg: '',
+                    newsName: '',
+                    buildingId: '',
+                    newsStatus: '',
+                    newsDetail: ''
+                },
+                buildingList: [],
+                buildingForm: {
+                    pageNum: 1,
+                    pageSize: 100
+                },
+                typeList: [],
+                typeForm: {
+                    buildingId: '',
+                    pageNum: 1,
+                    pageSize: 100
+                },
+
+            }
+        },
+        components: {
+            // eslint-disable-next-line vue/no-unused-components
+            'my-wangeditor': myWangeditor
+        },
+        created() {
+            this.getBuildList()
+            this.getTypeList()
+            this.form.newsId = this.$route.query.id
+            if (this.form.newsId !== undefined) {
+                this.getById()
+            }
+        },
+        mounted () {
+
+        },
+        computed: {
+            uploadHeaders () {
+                const token = localStorage.getItem('x-token') || ''
+                return {
+                    Authorization: `Bearer ${token}`
+                }
+            }
+        },
+        methods: {
+            getEdiCentent(value) {
+                console.log('富文本值：', value)
+                this.form.newsDetail = value
+            },
+            handleAvatarSuccess(res, file) {
+                this.imageUrl = URL.createObjectURL(file.raw);
+                // console.log(res)
+                this.form.newsImg = res.data
+            },
+            getTypeList() {
+                this.$store.dispatch('news/getTypeList', this.typeForm).then((res) => {
+                    this.typeList = res.records
+                }).catch(() => {
+                    console.log('news/getTypeList err')
+                })
+            },
+            getBuildList() {
+                this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+                    this.buildingList = res.records
+                }).catch(() => {
+                    console.log('building/getBuildings err')
+                })
+            },
+            submitNewsType() {
+                if (this.form.newsId === '' || this.form.newsId === undefined) {
+                    this.$store.dispatch('news/add', this.form).then((res) => {
+                        this.$message.success('操作成功！')
+                        this.$router.go(-1)
+                        // console.log(res)
+                    }).catch(() => {
+                        console.log('news/add err')
+                    })
+
+                    return;
+                }
+
+                // 修改
+                this.$store.dispatch('news/update', this.form).then((res) => {
+                    this.$message.success('操作成功！')
+                    this.$router.go(-1)
+                    // console.log(res)
+                }).catch(() => {
+                    console.log('news/update err')
+                })
+
+            },
+            cancel() {
+                this.$router.go(-1)
+            },
+            getById() {
+                this.$store.dispatch('news/getById', this.form).then((res) => {
+                    console.log('news/getById: ', res)
+                    this.form.newsName = res.newsName
+                    this.form.newsTypeId = res.newsTypeId
+                    this.form.newsStatus = res.newsStatus
+                    this.form.newsImg = res.newsImg
+                    this.imageUrl = res.newsImg
+                    this.form.buildingId = res.buildingId
+                    this.form.newsDetail = res.newsDetail
+                }).catch(() => {
+                    console.log('news/getById err')
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409EFF;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+    .form {
+        width: 800px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+</style>

src/views/news/index.vue

@@ -1,9 +1,9 @@
 <template>
     <div id="root">
         <div class="operation-class">
-           <el-button type="primary">新增</el-button>
+           <el-button type="primary" @click="ediNewsType">新增</el-button>
             &nbsp;
-            <el-select v-model="form.buildingId" placeholder="项目">
+            <el-select v-model="form.buildingId" placeholder="项目" @change="getList">
                 <el-option
                         v-for="item in buildingList"
                         :key="item.buildingId"
@@ -14,30 +14,67 @@
         </div>
         <div class="body">
             <el-table
-                    :data="[]"
-                    height="250"
+                    :data="list"
                     border
                     style="width: 100%">
                 <el-table-column
-                        prop="date"
-                        label="类型图"
+                        prop="newsImg"
+                        label="资讯主图"
                         align="center">
                     <template slot-scope="scope">
-                        <img :src="scope.row.news_type_img" width="50" height="50"/>
+                        <img :src="scope.row.newsImg" width="50" height="50"/>
                     </template>
                 </el-table-column>
+                <el-table-column
+                        prop="newsName"
+                        label="标题"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newsType.newsTypeName"
+                        label="资讯类型"
+                        align="center">
+
+                </el-table-column>
+                <el-table-column
+                        prop="createDate"
+                        label="发布时间"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="pvNum"
+                        label="阅读量"
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         prop="newsTypeName"
-                        label="名称"
+                        label="转发数"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="favorNum"
+                        label="点赞数"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="saveNum"
+                        label="收藏数"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newsStatus"
+                        label="状态"
+                        align="center">
+                    <template slot-scope="scope">{{ scope.row.newsStatus === 0 ? '已发布' : '未发布' }}</template>
+                </el-table-column>
                 <el-table-column
                         prop="newsTypeId"
                         align="center"
                         label="操作">
                     <template slot-scope="scope">
-                        <router-link :to="{ name:'newsTypeEdi', query: { id: scope.row.newsTypeId } }">编辑</router-link>
-                        <span @click="deleteNews(scope.row.newsTypeId)">删除</span>
+                        <router-link :to="{ name:'news-edi', query: { id: scope.row.newsId } }">编辑</router-link>
+                        <a href="javascript:void(0);" @click="deleteNews(scope.row.newsId)" class="delClass">删除</a>
+                        <a href="javascript:void(0);" @click="releaseNews(scope.row)" class="delClass">{{ scope.row.newsStatus === 0 ? '取消发布' : '发布' }}</a>
                     </template>
                 </el-table-column>
             </el-table>
@@ -64,21 +101,72 @@
                 buildingList: [],
                 form: {
                     buildingId: '',
-                    pageNum: 0,
+                    pageNum: 1,
                     pageSize: 10
                 },
-                total: 0
+                buildingForm: {
+                    pageNum: 1,
+                    pageSize: 100
+                },
+                total: 0,
+                list: []
             }
         },
+        created() {
+          this.getList()
+          this.getBuildList()
+        },
         methods: {
             deleteNews(id) {
                 // 删除操作
+                const data = { newsId: id }
+                this.$store.dispatch('news/delete', data).then((res) => {
+                    this.getList()
+                }).catch(() => {
+                    console.log('news/delete err');
+                })
             },
             handleSizeChange(val) {
                 console.log(`每页 ${val} 条`);
+                this.form.pageSize = val
+                this.form.pageNum = 1
+                this.getList()
             },
             handleCurrentChange(val) {
                 console.log(`当前页: ${val}`);
+                this.form.pageNum = val
+                this.getList()
+            },
+            getList() {
+              this.$store.dispatch('news/getList', this.form).then((res) => {
+                this.list = res.records
+                this.form.pageNum = res.current
+                this.form.pageSize = res.size
+                this.total = res.total
+              }).catch(() => {
+                  console.log('news/getList err')
+              })
+            },
+            getBuildList() {
+                this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+                    this.buildingList = res.records
+                }).catch(() => {
+                    console.log('building/getBuildings err')
+                })
+            },
+            ediNewsType() {
+                this.$router.push({ name: 'news-edi' })
+            },
+            releaseNews(news) {
+                news.newsStatus = news.newsStatus === 0 ? 1 : 0
+                // 修改
+                this.$store.dispatch('news/update', news).then((res) => {
+                    this.$message.success('操作成功！')
+                    this.getList()
+                    // console.log(res)
+                }).catch(() => {
+                    console.log('news/updateType err')
+                })
             }
         }
     }
@@ -95,4 +183,7 @@
     display: flex;
     justify-content: flex-end;
 }
+.delClass {
+    padding-left: 10px;
+}
 </style>

src/views/news/type/edi/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="root">
         <el-form ref="form" :model="form" label-width="80px" class="form">
-            <el-form-item label="项目">
+            <el-form-item label="所属项目">
                 <el-select v-model="form.buildingId" placeholder="请选择">
                     <el-option
                             v-for="item in buildingList"
@@ -36,7 +36,7 @@
 <script>
     import apis from '../../../../config/api'
     export default {
-        name: "index",
+        name: "newsTypeEdiIndex",
         data() {
             return {
                 upFileUrl: apis.file.upload.url,
@@ -83,9 +83,7 @@
                 })
             },
             submitNewsType() {
-                console.log(this.form.newsTypeId)
                 if (this.form.newsTypeId === '' || this.form.newsTypeId === undefined) {
-                    console.log('添加')
                     this.$store.dispatch('news/addType', this.form).then((res) => {
                         this.$message.success('操作成功！')
                         this.$router.go(-1)

src/views/news/type/index.vue

@@ -57,7 +57,7 @@
 
 <script>
     export default {
-        name: "newsIndex",
+        name: "newsTypeIndex",
         data() {
             return {
                 buildingList: [],