elink-star
/
epdc-admin-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

话题修改

feature/yujt_analysis_pc
曲树通 5 years ago
parent
d942b765fc
commit
2b3bb90115
4 changed files with 377 additions and 238 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      src/views/modules/property/leaderboard.vue
  2. 23
      src/views/modules/property/topic-close.vue
  3. 84
      src/views/modules/property/topic-detail.vue
  4. 99
      src/views/modules/property/topic-list.vue

79
src/views/modules/property/leaderboard.vue
View File

@ -1,9 +1,15 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-news__topic}"> <div class="mod-news__topic}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable> <el-cascader v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="时间" <el-form-item label="时间"
@ -28,7 +34,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="排名"> <el-form-item label="排名">
<el-select v-model="orderType" clearable <el-select v-model="orderType"
clearable
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in orderTypeOptions" <el-option v-for="item in orderTypeOptions"
:key="item.id" :key="item.id"
@ -41,19 +48,51 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-if="this.orderType === '0'" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-if="this.orderType === '0'"
<el-table-column label="排名" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> v-loading="dataListLoading"
<el-table-column prop="groupName" label="群名" header-align="center" align="center"></el-table-column> :data="dataList"
<el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column> border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="排名"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="groupName"
label="群名"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="allDeptNames"
label="所属网格"
header-align="center"
align="center"></el-table-column>
</el-table> </el-table>
<el-table v-if="this.orderType === '1'" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-if="this.orderType === '1'"
<el-table-column label="排名" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> v-loading="dataListLoading"
<el-table-column prop="groupName" label="群名" header-align="center" align="center"></el-table-column> :data="dataList"
<el-table-column prop="memberNum" label="群成员数量" header-align="center" align="center"></el-table-column> border
<el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="排名"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="groupName"
label="群名"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="memberNum"
label="群成员数量"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="allDeptNames"
label="所属网格"
header-align="center"
align="center"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="limit" :page-size="limit"
:total="total" :total="total"
@ -61,7 +100,9 @@
@size-change="pageSizeChangeHandle" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"> @current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<close v-if="closeVisible" ref="close" @refreshDataList="getDataList"></close> <close v-if="closeVisible"
ref="close"
@refreshDataList="getDataList"></close>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -74,7 +115,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/group/group/activity', getDataListURL: '/property/group/activity',
getDataListIsPage: true getDataListIsPage: true
}, },
closeVisible: false, closeVisible: false,
@ -118,9 +159,9 @@ export default {
watch: { watch: {
'orderType': function (val) { 'orderType': function (val) {
if (val === '0') { if (val === '0') {
this.mixinViewModuleOptions.getDataListURL = '/group/group/activity' this.mixinViewModuleOptions.getDataListURL = '/property/group/activity'
} else { } else {
this.mixinViewModuleOptions.getDataListURL = '/group/group/member' this.mixinViewModuleOptions.getDataListURL = '/property/group/member'
} }
this.getDataList() this.getDataList()
}, },

23
src/views/modules/property/topic-close.vue
View File

@ -1,13 +1,24 @@
<template> <template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible"
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> :title="!dataForm.id ? $t('add') : $t('update')"
<el-form-item label="关闭原因" prop="processingOpinions"> :close-on-click-modal="false"
<el-input v-model="dataForm.processingOpinions" type="textarea" placeholder="50字以内"></el-input> :close-on-press-escape="false">
<el-form :model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="关闭原因"
prop="processingOpinions">
<el-input v-model="dataForm.processingOpinions"
type="textarea"
placeholder="50字以内"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button> <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> <el-button type="primary"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@ -46,7 +57,7 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
this.$http['post']('/group/topic/close', this.dataForm).then(({ data: res }) => { this.$http['post']('/property/topic/close', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

84
src/views/modules/property/topic-detail.vue
View File

@ -1,10 +1,14 @@
<template> <template>
<div class="project-handle"> <div class="project-handle">
<el-form :model="dataForm" ref="dataForm" style="width: 100%; height: 100%;"> <el-form :model="dataForm"
ref="dataForm"
style="width: 100%; height: 100%;">
<div class="project-detail"> <div class="project-detail">
<div class="project-detail-tip">话题详情</div> <div class="project-detail-tip">话题详情</div>
<el-form label-position="right" label-width="120px"> <el-form label-position="right"
<el-form-item label="话题内容:" prop="eventContent"> label-width="120px">
<el-form-item label="话题内容:"
prop="eventContent">
<div>{{dataForm.topicContent}}</div> <div>{{dataForm.topicContent}}</div>
<el-image v-for="url in dataForm.images" <el-image v-for="url in dataForm.images"
style="width: 100px; height: 100px; margin-right: 10px" style="width: 100px; height: 100px; margin-right: 10px"
@ -14,17 +18,21 @@
@click="clickImg(url)"> @click="clickImg(url)">
</el-image> </el-image>
</el-form-item> </el-form-item>
<el-form-item label="所属网格:" prop="allDeptNames"> <el-form-item label="所属网格:"
prop="allDeptNames">
<div>{{dataForm.allDeptNames}}</div> <div>{{dataForm.allDeptNames}}</div>
</el-form-item> </el-form-item>
<el-form-item label="话题来源:" prop="groupName"> <el-form-item label="话题来源:"
prop="groupName">
<div>{{dataForm.groupName}}</div> <div>{{dataForm.groupName}}</div>
</el-form-item> </el-form-item>
<el-form-item label="发言人:" prop="nickName"> <el-form-item label="发言人:"
prop="nickName">
<div>{{dataForm.nickname}}</div> <div>{{dataForm.nickname}}</div>
</el-form-item> </el-form-item>
<el-form-item label="评论:"> <el-form-item label="评论:">
<el-button type="primary" @click="innerVisible = true">点击查看评论</el-button> <el-button type="primary"
@click="innerVisible = true">点击查看评论</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="container"> <div class="container">
@ -33,25 +41,55 @@
</div> </div>
</div> </div>
<div style="width: 100%; text-align:center; float:left;"> <div style="width: 100%; text-align:center; float:left;">
<el-button size="medium" style="width: 95px" type="primary" @click="back">返回</el-button> <el-button size="medium"
style="width: 95px"
type="primary"
@click="back">返回</el-button>
</div> </div>
</el-form> </el-form>
<el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body> <el-dialog width="90%"
<el-table :data="commentsDTOs" border style="width: 100%;"> title="评论"
<el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column> :visible.sync="innerVisible"
<el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column> append-to-body>
<el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column> <el-table :data="commentsDTOs"
<el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column> border
<el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column :label="$t('handle')" header-align="center" align="center" width="150"> <el-table-column prop="user.userName"
label="发言人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentTime"
label="发言时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="content"
label="发言内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="replyComment.userName"
label="被回复人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="replyComment.content"
label="被回复内容"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.shieldFlag === '0'" type="button" size="small" @click="deleteComment(scope.row.commentId)">屏蔽</el-button> <el-button v-if="scope.row.shieldFlag === '0'"
<el-button v-if="scope.row.shieldFlag === '1'" type="text" size="small">已屏蔽</el-button> type="button"
size="small"
@click="deleteComment(scope.row.commentId)">屏蔽</el-button>
<el-button v-if="scope.row.shieldFlag === '1'"
type="text"
size="small">已屏蔽</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="pageIndex"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="limitVal" :page-size="limitVal"
:total="total" :total="total"
@ -115,7 +153,7 @@ export default {
}, },
// 获取信息 // 获取信息
getInfo () { getInfo () {
this.$http.get(`/group/topic/detail/${this.dataForm.id}`).then(({ data: res }) => { this.$http.get(`/property/topic/detail/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -136,7 +174,7 @@ export default {
this.getCommentList() this.getCommentList()
}, },
getCommentList () { getCommentList () {
this.$http.get('/group/topiccomment/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal } this.$http.get('/property/topiccomment/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
}).then(({ data: res }) => { }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
this.commentsDTOs = [] this.commentsDTOs = []
@ -149,7 +187,7 @@ export default {
}, },
deleteComment (val) { deleteComment (val) {
this.$http['post']( this.$http['post'](
'/group/topiccomment/deleteComment', { commentIds: [val] }).then(({ data: res }) => { '/property/topiccomment/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

99
src/views/modules/property/topic-list.vue
View File

@ -1,9 +1,15 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-news__topic}"> <div class="mod-news__topic}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable> <el-cascader v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="时间" <el-form-item label="时间"
@ -28,7 +34,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="群名"> <el-form-item label="群名">
<el-select v-model="dataForm.groupId" clearable <el-select v-model="dataForm.groupId"
clearable
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in groupOptions" <el-option v-for="item in groupOptions"
:key="item.groupId" :key="item.groupId"
@ -37,11 +44,15 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关键词" prop="keyword"> <el-form-item label="关键词"
<el-input v-model="dataForm.keyword" placeholder="" clearable ></el-input> prop="keyword">
<el-input v-model="dataForm.keyword"
placeholder=""
clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序方式"> <el-form-item label="排序方式">
<el-select v-model="dataForm.orderType" clearable <el-select v-model="dataForm.orderType"
clearable
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in orderTypeOptions" <el-option v-for="item in orderTypeOptions"
:key="item.id" :key="item.id"
@ -54,26 +65,62 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button> <el-button v-if="$hasPermission('epdc:topic:export')"
type="primary"
@click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column> :data="dataList"
<el-table-column prop="nickname" label="发言人" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="topicContent" label="话题内容" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> <el-table-column label="序号"
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> type="index"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="nickname"
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="topicContent"
label="话题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button> <el-button type="text"
<el-button v-if="scope.row.state !== 20" type="text" size="small" @click="close(scope.row.id)">{{ $t('close') }}</el-button> size="small"
<el-button type="text" size="small" v-if="scope.row.state ===20" :disabled="true">已关闭</el-button> @click="look(scope.row.id)">{{ $t('look') }}</el-button>
<el-button v-if="scope.row.state !== 20"
type="text"
size="small"
@click="close(scope.row.id)">{{ $t('close') }}</el-button>
<el-button type="text"
size="small"
v-if="scope.row.state ===20"
:disabled="true">已关闭</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
:page-size="limit" :page-size="limit"
:total="total" :total="total"
@ -81,7 +128,9 @@
@size-change="pageSizeChangeHandle" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"> @current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<close v-if="closeVisible" ref="close" @refreshDataList="getDataList"></close> <close v-if="closeVisible"
ref="close"
@refreshDataList="getDataList"></close>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -94,9 +143,9 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/group/topic/page', getDataListURL: '/property/topic/page',
getDataListIsPage: true, getDataListIsPage: true,
exportURL: '/group/topic/export' exportURL: '/property/topic/export'
}, },
closeVisible: false, closeVisible: false,
dataForm: { dataForm: {
@ -185,7 +234,7 @@ export default {
this.$router.push({ path: '/group-topic', query: { id: id } }) this.$router.push({ path: '/group-topic', query: { id: id } })
}, },
getGroupList () { getGroupList () {
this.$http.get('/group/group/groupList').then(({ data: res }) => { this.$http.get('/property/group/groupList').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

Write Preview
Loading…
Cancel
Save