Skip to content

A
attendance-performance-platform
Commit 30fcc170 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents baa4b30b dfedd171
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
attendance-performance-manager-ui/admin/src/views/feedback/list.vue
View file @ 30fcc170
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
str = "已结束" str = "已结束"
} }
return ( return (
<el-tag type={row.processStatus ? row.processStatus == 2 ? 'success' : 'info' : 'danger'} size="small"> <el-tag type={row.processStatus ? row.processStatus == 1 ? 'success' : 'info' : 'danger'} size="small">
{str} {str}
</el-tag> </el-tag>
) )
......
attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
View file @ 30fcc170
...@@ -15,9 +15,8 @@ ...@@ -15,9 +15,8 @@
</div> </div>
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-tag <el-tag
:type="feedbackData.processStatus ? feedbackData.processStatus = 1 ? 'success' : 'info' : 'danger'"> :type="feedbackData.processStatus ? feedbackData.processStatus == 1 ? 'success' : 'info' : 'danger'">
{{ feedbackData.processStatus ? feedbackData.processStatus {{ feedbackData.processStatus ? feedbackData.processStatus == 1 ? '进行中' : '已结束' : '未开始' }}</el-tag>
== 1 ? '进行中' : '已结束' : '未开始' }}</el-tag>
反馈时间：{{ feedbackData.timeStart }} ~ {{ feedbackData.timeEnd }} 反馈时间：{{ feedbackData.timeStart }} ~ {{ feedbackData.timeEnd }}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment