Browse Source

置顶bug + 通知标题显示全部 + 评论浏览量点赞点踩时间筛选bug

master
songyunpeng 5 years ago
parent
commit
e81a2c2a3d
  1. 13
      src/views/modules/master/masternotice.vue
  2. 13
      src/views/modules/master/mastertopic.vue
  3. 12
      src/views/modules/master/mastertopiccomment.vue
  4. 12
      src/views/modules/master/mastertopicuserattitude.vue
  5. 12
      src/views/modules/master/mastertopicuserbrowse.vue

13
src/views/modules/master/masternotice.vue

@ -50,7 +50,7 @@
{{scope.$index+1}}
</template>
</el-table-column>
<el-table-column prop="noticeTitle" label="通知标题" header-align="center" align="center" :show-overflow-tooltip='true' width="200"></el-table-column>
<el-table-column prop="noticeTitle" label="通知标题" header-align="center" align="center" width="300"></el-table-column>
<el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
<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>
@ -222,15 +222,16 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.toTopDialog = false
this.cancelToTopDialog = false
this.closeDialog = false
this.toGrey = false
this.getDataList()
this.$message({
type: 'success',
message: '修改成功!',
onClose: () => {
this.toTopDialog = false
this.cancelToTopDialog = false
this.closeDialog = false
this.toGrey = false
this.getDataList()
}
})
})

13
src/views/modules/master/mastertopic.vue

@ -63,7 +63,7 @@
{{scope.$index+1}}
</template>
</el-table-column>
<el-table-column prop="topicContent" label="话题内容" header-align="center" align="center" width="200" :show-overflow-tooltip='true'></el-table-column>
<el-table-column prop="topicContent" label="话题内容" header-align="center" align="center" width="300" :show-overflow-tooltip='true' ></el-table-column>
<el-table-column prop="nickName" 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 prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
@ -241,15 +241,16 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.toTopDialog = false
this.cancelToTopDialog = false
this.closeDialog = false
this.toGrey = false
this.getDataList()
this.$message({
type: 'success',
message: '修改成功!',
onClose: () => {
this.toTopDialog = false
this.cancelToTopDialog = false
this.closeDialog = false
this.toGrey = false
this.getDataList()
}
})
})

12
src/views/modules/master/mastertopiccomment.vue

@ -81,18 +81,18 @@ export default {
id: ''
},
pickerBeginDateBefore: {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').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()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
}

12
src/views/modules/master/mastertopicuserattitude.vue

@ -80,18 +80,18 @@ export default {
flag: ''
},
pickerBeginDateBefore: {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').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()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
}

12
src/views/modules/master/mastertopicuserbrowse.vue

@ -77,18 +77,18 @@ export default {
id: ''
},
pickerBeginDateBefore: {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').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()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
}

Loading…
Cancel
Save