From cbf4286ef5cefda1d95ed35e94442da46058c065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 28 May 2024 15:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7-=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E7=BB=93=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=AD=94=E5=8D=B7=E7=BB=93=E6=9E=9C=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxDcwj/WjxDcwjList.vue          |  2 +-
 .../components/WjxWjxxTmlbAllDjjgsList.vue    |  4 ++--
 .../components/WjxWjxxTmlbDjjgsDcList.vue     | 23 ++++++++++++-------
 .../components/WjxWjxxTmlbDjjgsDcModal.vue    |  6 +++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index c7c70b5..bbf939b 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -66,7 +66,7 @@
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">问卷预览</a-button>
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷详情</a-button>
               <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷预览</a-button>
-              <a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷结果</a-button>
+              <a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷结果</a-button>
             </a-col>
 <!--            <a-col :span="24" style="text-align:center;margin-top:20px;">-->
 <!--              <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">答卷</a-button>-->
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
index 49f5856..e75b1b3 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue
@@ -97,7 +97,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
    * 操作栏
    */
   function getTableAction(record) {
-    if(record.totalScore>0){
+    if(record.commitTime != null && record.commitTime != ''){
       return [
         {
           label: '答卷结果',
@@ -107,7 +107,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
     }else{
       return [];
     }
-    
+
   }
 
   function init(record,flag){
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
index 97e4b9e..88c4ad3 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div> 
+  <div>
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
@@ -27,7 +27,7 @@
     <!--引用表格-->
     <BasicTable @register="registerTable" >
       <!--操作栏-->
-      <template #action="{ record }" v-if="isFinished=='1'">
+      <template #action="{ record }">
         <TableAction :actions="getTableAction(record)"/>
       </template>
     </BasicTable>
@@ -89,15 +89,22 @@ import {ref, reactive, defineExpose, unref} from 'vue';
    * 操作栏
    */
   function getTableAction(record) {
-    return [
-      {
-        label: '答卷结果',
-        onClick: handlePeizhiDjjg.bind(null, record),
-      }
-    ]
+    console.log(record);
+    if(record.commitTime != null && record.commitTime != ''){
+      return [
+        {
+          label: '答卷结果',
+          onClick: handlePeizhiDjjg.bind(null, record),
+        }
+      ]
+    }else{
+      return [];
+    }
   }
 
   function init(record,flag){
+    console.log(record);
+    console.log(flag);
     queryParam.value.id = record.id;
     queryParam.value.rwbh = record.rwbh;
     queryParam.value.isFinished = flag;
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue
index 531a213..1fba48b 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue
@@ -22,8 +22,10 @@
   function edit(record,flag) {
     if(flag == '1'){
       title.value = '已完成答卷学生列表';
-    }else{
-      title.value = '已完成答卷学生列表';
+    }else if(flag == '0'){
+      title.value = '未完成答卷学生列表';
+    }else if(flag == ''){
+      title.value = '全部答卷学生列表';
     }
     visible.value = true;
     nextTick(() => {