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

话题通知 和 话题内容 bug修改

master
songyunpeng 6 years ago
parent
f632287756
commit
73e2b6ec6b
4 changed files with 66 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/master/masternotice-add-or-update.vue
  2. 63
      src/views/modules/master/masternotice.vue
  3. 70
      src/views/modules/master/mastertopic.vue
  4. 3
      src/views/modules/master/mastertopicdetail.vue

2
src/views/modules/master/masternotice-add-or-update.vue
View File

@ -10,7 +10,7 @@
v-model="dataForm.noticeContent" placeholder="请输入内容，限制2000字以内"
maxlength="2000"></el-input>
</el-form-item>
<el-form-item label="添加图片" prop="noticeContent">
<el-form-item label="添加图片">
<el-upload
:action="url"
:file-list="fileList"

63
src/views/modules/master/masternotice.vue
View File

@ -3,7 +3,7 @@
<div class="mod-__masternotice}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="通知内容" prop="noticeContent">
<el-input v-model="dataForm.noticeContent" placeholder="通知内容" clearable></el-input>
<el-input v-model="dataForm.noticeContent" placeholder="通知内容" clearable maxlength="50"></el-input>
</el-form-item>
<el-form-item label="状态" prop="state">
<el-select v-model="dataForm.state" placeholder="状态" clearable>
@ -15,33 +15,32 @@
</el-select>
</el-form-item>
<div class="block">
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button type="primary" v-if="$hasPermission('cloudAnalysis:masternotice:save')" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
</div>
</el-form>
@ -56,13 +55,13 @@
<el-table-column prop="manageFlag" label="发布人身份" header-align="center" align="center" :formatter="manageFlagFormat"></el-table-column>
<el-table-column prop="readCount" label="已阅读人数" header-align="center" align="center" :formatter="readCountFormat"></el-table-column>
<el-table-column prop="unReadCount" label="未阅读人数" header-align="center" align="center" :formatter="unReadCountFormat"></el-table-column>
<el-table-column prop="createdTime" 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="state" label="状态" header-align="center" align="center" :formatter="stateFormat"></el-table-column>
<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="openToTopDialog($event, scope.row)" v-if="scope.row.state == 1">置顶</el-button>
<el-button type="text" size="small" @click="openCancelToTopDialog($event, scope.row)" v-if="scope.row.state == 2">取消置顶</el-button>
<el-button type="text" size="small" @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 1" @click="openToTopDialog($event, scope.row)" >置顶</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:toTop') && scope.row.state == 2" @click="openCancelToTopDialog($event, scope.row)">取消置顶</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:masternotice:close')" @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
<el-button type="text" size="small" @click="manageHandle(scope.row.id)">查看</el-button> </template>
</el-table-column>
</el-table>
@ -81,7 +80,7 @@
title="确定要本条内容置顶吗?"
:visible.sync="toTopDialog"
width="30%">
<span>置顶后，话题会被群成员优先看到，查看内容</span>
<span>置顶后，通知会被群成员优先看到，查看通知详情</span>
<span slot="footer" class="dialog-footer">
<el-button @click="toTopDialog = false">取 消</el-button>
<el-button type="primary" @click="toTopOrCancelToTop" :disabled="toGrey">确 定</el-button>
@ -91,7 +90,7 @@
title="确定要本条内容取消置顶吗?"
:visible.sync="cancelToTopDialog"
width="30%">
<span>取消置顶后，话题会被按照发布时间排序，需要滑动查找内容</span>
<span>取消置顶后，通知会被按照发布时间排序，需要滑动查找通知</span>
<span slot="footer" class="dialog-footer">
<el-button @click="cancelToTopDialog = false">取 消</el-button>
<el-button type="primary" @click="toTopOrCancelToTop" :disabled="toGrey">确 定</el-button>
@ -101,7 +100,7 @@
title="确定要将本条内容关闭吗?"
:visible.sync="closeDialog"
width="30%">
<span>关闭后，在移动端不显示话题内容，管理后台将保留数据，可以查看</span>
<span>关闭后，在移动端不显示通知信息，管理后台将保留数据，可以查看</span>
<span slot="footer" class="dialog-footer">
<el-button @click="closeDialog = false">取 消</el-button>
<el-button type="primary" @click="toTopOrCancelToTop" :disabled="toGrey">确 定</el-button>
@ -137,16 +136,16 @@ export default {
isTop: true,
toGrey: false,
pickerBeginDateBefore: {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
}
@ -162,7 +161,7 @@ export default {
value: '1'
},
{
label: '关闭',
label: '已关闭',
value: '0'
}
]

70
src/views/modules/master/mastertopic.vue
View File

@ -3,7 +3,7 @@
<div class="mod-__mastertopic}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="话题内容" prop="topicContent">
<el-input v-model="dataForm.topicContent" placeholder="话题内容" clearable></el-input>
<el-input v-model="dataForm.topicContent" placeholder="话题内容" clearable maxlength="50"></el-input>
</el-form-item>
<el-form-item label="发言人" prop="nickName">
<el-input v-model="dataForm.nickName" placeholder="发言人" clearable></el-input>
@ -27,43 +27,35 @@
</el-select>
</el-form-item>
<div class="block">
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary"
<el-button type="primary" v-if="$hasPermission('cloudAnalysis:mastertopic:export')"
@click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</div>
<el-form-item>
<el-button v-if="$hasPermission(':mastertopic:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission(':mastertopic: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="序号" header-align="center" align="center" width="50px">
@ -82,9 +74,9 @@
<el-table-column prop="state" label="状态" header-align="center" align="center" :formatter="stateFormat"></el-table-column>
<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="openToTopDialog($event, scope.row)" v-if="scope.row.state == 1">置顶</el-button>
<el-button type="text" size="small" @click="openCancelToTopDialog($event, scope.row)" v-if="scope.row.state == 2">取消置顶</el-button>
<el-button type="text" size="small" @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:toTop') && scope.row.state == 1" @click="openToTopDialog($event, scope.row)">置顶</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:toTop') && scope.row.state == 2" @click="openCancelToTopDialog($event, scope.row)">取消置顶</el-button>
<el-button type="text" size="small" v-if="$hasPermission('cloudAnalysis:mastertopic:close')" @click="openCloseTopicDialog($event, scope.row)" :disabled="scope.row.state == 0">关闭</el-button>
<el-button type="text" size="small" @click="manageHandle(scope.row.id)">查看</el-button>
</template>
</el-table-column>
@ -192,21 +184,21 @@ export default {
value: '1'
},
{
label: '关闭',
label: '已关闭',
value: '0'
}
],
pickerBeginDateBefore: {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
}

3
src/views/modules/master/mastertopicdetail.vue
View File

@ -12,6 +12,9 @@
<el-form-item label="话题内容："
prop="topicContent" v-if="dataForm.topicContent">
<span>{{dataForm.topicContent}}</span>
<div v-for="(item,index) in dataForm.fileArrayList" :key="index">
<img :src="item" style="width: 100%">
</div>
</el-form-item>
<el-form-item label="发布时间："
prop="createdTime" v-if="dataForm.createdTime">

Write Preview
Loading…
Cancel
Save