From 7561f7af27bec43be6c0573865e206c7398113b1 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 25 Oct 2022 14:03:37 +0800
Subject: [PATCH] 2

---
 .../AppRatingTask/components/FormDetail.vue   | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/project/hlj/app/AppRatingTask/components/FormDetail.vue b/project/hlj/app/AppRatingTask/components/FormDetail.vue
index e01fae56..4de59ec5 100644
--- a/project/hlj/app/AppRatingTask/components/FormDetail.vue
+++ b/project/hlj/app/AppRatingTask/components/FormDetail.vue
@@ -42,7 +42,8 @@
                     v-model="search1.status"
                     clearable
                     placeholder="请选择完成情况"
-                    :selectList="dictList">
+                    :selectList="dictList"
+                    @change="getList1()">
                   </ai-select>
                 </template>
                 <template #right>
@@ -109,7 +110,7 @@
                 tableSize="small"
                 :current.sync="search2.current"
                 :size.sync="search2.size"
-                @getList="getGroupInfo">
+                @getList="getList2">
               </ai-table>
             </div>
           </div>
@@ -151,15 +152,15 @@
         info: {},
         currIndex: 0,
         colConfigs1: [
-          { slot: 'user', label: '参评人' },
-          { prop: 'groupCount', label: '评分人', align: 'center' },
-          { prop: 'groupCount', label: '提交时间', align: 'center' },
-          { prop: 'groupCount', label: '总分', align: 'center' }
+          { prop: 'evaluatorsName', label: '参评人', align: 'center' },
+          { prop: 'scorerName', label: '评分人', align: 'center' },
+          { prop: 'commitTime', label: '提交时间', align: 'center' },
+          { prop: 'totalScore', label: '总分', align: 'center' }
         ],
         colConfigs2: [
-          { prop: 'groupName', label: '参评人' },
-          { prop: 'memberCount', label: '评分人数', align: 'center' },
-          { slot: 'user', label: '平均分', align: 'center' },
+          { prop: 'evaluatorsName', label: '参评人', align: 'center' },
+          { prop: 'scorerCount', label: '评分人数', align: 'center' },
+          { prop: 'avgScore', label: '平均分', align: 'center' },
         ],
         dictList: [
           {
@@ -177,6 +178,7 @@
     created () {
       this.getInfo(this.params.formId)
       this.getList1()
+      this.getList2()
     },
 
     methods: {
@@ -188,22 +190,8 @@
         })
       },
 
-      getList1 () {
-        this.instance.post(`/app/appassessmentscortask/assessStatistics`, null, {
-          params: {
-            id: this.params.formId,
-            ...this.search1
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData1 = res.data.records
-            this.total1 = res.data.total
-          }
-        })
-      },
-
       getList2 () {
-        this.instance.post(`/app/appassessmentscortask/fillStatistics`, null, {
+        this.instance.post(`/app/appassessmentscortask/assessStatistics`, null, {
           params: {
             id: this.params.formId,
             ...this.search2
@@ -216,6 +204,20 @@
         })
       },
 
+      getList1 () {
+        this.instance.post(`/app/appassessmentscortask/fillStatistics`, null, {
+          params: {
+            id: this.params.formId,
+            ...this.search1
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.tableData1 = res.data.records
+            this.total1 = res.data.total
+          }
+        })
+      },
+
       cancel () {
         this.$emit('change', {
           type: 'Detail',