diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 9d359e8..06f3653 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -95,12 +95,14 @@
                     <template slot-scope="scope" v-if="scope.row">
                         <!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
                         <el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button>
-                        <el-button v-if="scope.row.status == 2 && scope.row.stuState == 1" type="text" disabled>未提交</el-button>
+                        <el-button v-if="(scope.row.status == 2 && scope.row.stuState == 1) || (scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId == null)" type="text" disabled>
+                            未提交
+                        </el-button>
                         <el-button v-if="scope.row.status != 2 && (scope.row.stuState == 0 || scope.row.stuState == 1)" type="text"
                                    @click="entry(scope.row)" :disabled="scope.row.status !== 1">进入
                         </el-button>
                         <el-button v-if="scope.row.status == 1 && scope.row.stuState == 2" type="text" disabled>已提交</el-button>
-                        <el-button v-if="scope.row.status == 2 && scope.row.stuState == 2" type="text"
+                        <el-button v-if="scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId" type="text"
                                    @click="show(scope.row)">查看成绩
                         </el-button>
                     </template>
@@ -325,6 +327,12 @@ export default {
             };
             this.$post(this.api.pageStuAssessment, data).then(res => {
                 this.listData = res.list;
+                for (var i=0;i<this.listData.length;i++){
+                    if (this.listData[i].reportId == undefined){
+                        this.listData[i].reportId = null
+                    }
+                }
+                console.log(this.listData)
                 this.totals = res.total;
                 this.listData.forEach(i => {
                     i.show = false;