|
|
@@ -42,6 +42,20 @@
|
|
|
<el-table-column prop="msgContent" label="公告内容" min-width="240"></el-table-column>
|
|
|
<el-table-column prop="pushRemark" label="发布备注" width="300"></el-table-column>
|
|
|
<el-table-column prop="pushDateTime" label="发布时间" width="180"></el-table-column>
|
|
|
+ <el-table-column prop="pushDateTime" label="时间配置" width="340">
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <template v-if="row.msgType===1">
|
|
|
+ <span>剩余</span>
|
|
|
+ <el-tag type="danger" effect="dark" size="mini">{{row.msgWarnTime}}分钟</el-tag>
|
|
|
+ <span>进行提醒，</span>
|
|
|
+ <el-tag type="danger" effect="dark" size="mini">{{row.msgCountDownTime}}分钟</el-tag>
|
|
|
+ <span>开始进入倒计时</span>
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <span>-</span>
|
|
|
+ </template>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="creatUserName" label="创建人" width="100"></el-table-column>
|
|
|
<el-table-column prop="cancelDateTime" label="取消时间" width="180"></el-table-column>
|
|
|
<el-table-column prop="pushStatus" label="发布状态" width="80" align="center">
|
|
|
@@ -234,7 +248,10 @@ export default {
|
|
|
//待发布
|
|
|
isReleasedShow: false,
|
|
|
releasedNum: 0,
|
|
|
- releasedData: {},
|
|
|
+ releasedData: {
|
|
|
+ systemMsg: [],
|
|
|
+ updateMsg: []
|
|
|
+ },
|
|
|
//普通公告
|
|
|
isGeneralShow: false,
|
|
|
generalFormModel: {
|
|
|
@@ -332,19 +349,15 @@ export default {
|
|
|
methods: {
|
|
|
//获取待发布公告
|
|
|
async getAwaitMsgApi() {
|
|
|
- const res = await getAwaitMsg()
|
|
|
- const {code, data, msg} = res.data || {}
|
|
|
- if (code!==200) {
|
|
|
- this.$message.error(msg);
|
|
|
- }
|
|
|
- let num = 0
|
|
|
- const arr = data || {}
|
|
|
- arr.systemMsg = arr.systemMsg || []
|
|
|
- arr.updateMsg = arr.updateMsg || []
|
|
|
- this.releasedData = arr
|
|
|
- num = num + arr.systemMsg.length
|
|
|
- num = num + arr.updateMsg.length
|
|
|
- this.releasedNum = num
|
|
|
+ let _this = this
|
|
|
+ getAwaitMsg().then(({data}) => {
|
|
|
+ const {msgTotal, systemMsg, updateMsg} = data.data || {}
|
|
|
+ _this.releasedData = {
|
|
|
+ systemMsg: systemMsg,
|
|
|
+ updateMsg: updateMsg
|
|
|
+ }
|
|
|
+ _this.releasedNum = msgTotal
|
|
|
+ })
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
this.searchForm.size = val
|
