diff --git a/src/icon/svg/time.svg b/src/icon/svg/time.svg new file mode 100644 index 0000000..626cd69 --- /dev/null +++ b/src/icon/svg/time.svg @@ -0,0 +1 @@ + diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue index 6e1cb50..7f87f22 100644 --- a/src/views/Report/ReportDetail.vue +++ b/src/views/Report/ReportDetail.vue @@ -75,11 +75,10 @@
- - - 评论 - - + 评论 + + + @@ -98,7 +97,10 @@
{{ item.comment }}
-
{{ item.createTime && formatDate2(item.createTime) }}
+
+ + {{ item.createTime && formatDate2(item.createTime) }}
删除 @@ -140,8 +142,8 @@ export default { pageSize: 5, }, - userId: this.$store.getters.userInfo.USID, - userName: this.$store.getters.userInfo.USNAME, + userId: this.$store.getters.userInfo.usid, + userName: this.$store.getters.userInfo.usname, } }, methods: { @@ -268,7 +270,7 @@ export default { getReportDetail() { this.$api.report.getReportDetail(this.reportId).then(res => { this.row = res.data - this.isAdmin = this.$store.getters.userInfo.userId==this.row.createUserId + this.isAdmin = this.$store.getters.userInfo.usid==this.row.createUserId // 需要给分数/2 this.previewRow() }) @@ -434,6 +436,7 @@ export default { .content { width: 100%; color: #434343; + margin-bottom: 5px; } .bottom { @@ -443,16 +446,16 @@ export default { width: calc(100% - 40px); bottom: 10px; left: 20px; - height: 30px; + height: 35px; color: #434343; .time { - line-height: 30px; - color: #ccc; + line-height: 35px; + color: #858585; } .delbtn { - vertical-align: center; + //vertical-align: center; } } } @@ -472,4 +475,7 @@ export default { .pointclick { cursor: pointer; } +.showLimit ::v-deep .el-textarea .el-input__count{ + width: 98%; +} diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index e810ed8..4138641 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -122,9 +122,9 @@ @@ -473,7 +473,7 @@ export default { created() { this.init() // 判断当前人是不是管理员 - this.isAdmin = this.$store.getters.userInfo.roleIdList.indexOf('35LLRCAQ8D') > -1 + // this.isAdmin = this.$store.getters.userInfo.levelId <= 0.5 } }