对接阅卷数据统计API

TEAMModelOS/ClientApp/src/api/learnActivity.js

@@ -326,5 +326,9 @@ export default {
 	findResearchList: function (data) {
 	    return post('/tchlist/find-list-members', data)
 	},
+    //查看阅卷进度
+    findMarkProgress: function (data) {
+	    return post('/common/exam/analysis-scoring', data)
+	},
 
 }

TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkData.vue

@@ -44,24 +44,24 @@
                 <div class="setting-content">
                     <Table :columns="subCol" :data="subData" class="sub-info-table">
                         <template slot-scope="{ row }" slot="scanPerc">
-                            {{ `${row.scanNum}/${row.num}` }}
+                            {{ `${row.scanNum}/${row.count}` }}
                         </template>
                         <template slot-scope="{ row }" slot="markPerc">
-                            {{ `${row.markNum}/${row.num}` }}
+                            {{ `${row.cs}/${row.count}` }}
                         </template>
                         <template slot-scope="{ row }" slot="err">
-                            {{ `${row.handleErr}/${row.err}` }}
+                            {{ `${row.tqs}/${row.qs}` }}
                         </template>
                         <template slot-scope="{ row }" slot="arb">
-                            {{ `${row.handleArb}/${row.arb}` }}
+                            {{ `${row.tarbs}/${row.arbs}` }}
                         </template>
                         <template slot-scope="{ row }" slot="status">
                             {{ row.status == 0 ? $t('learnActivity.mark.unassigned') : $t('learnActivity.mark.assigned')}}
                         </template>
                         <template slot-scope="{ row }" slot="progress">
                             <div style="display: flex;justify-content: center;">
-                                <i-circle :percent="20" :size="40" :stroke-width="8" :trail-width="7" stroke-color="#ff5500">
-                                    <span style="font-size:12px">20%</span>
+                                <i-circle :percent="row.percent" :size="40" :stroke-width="8" :trail-width="7" stroke-color="#ff5500">
+                                    <span style="font-size:12px">{{row.percent}}%</span>
                                 </i-circle>
                             </div>
                         </template>
@@ -90,6 +90,9 @@
                         <template slot-scope="{ row }" slot="err">
                             {{ `${row.handleErr}/${row.err}` }}
                         </template>
+                        <template slot-scope="{ row }" slot="mark">
+                            {{ `${row.handleErr}/${row.err}` }}
+                        </template>
                         <template slot-scope="{ row }" slot="arb">
                             {{ `${row.handleArb}/${row.arb}` }}
                         </template>
@@ -131,19 +134,9 @@ export default {
                 },
                 {
                     title: this.$t('learnActivity.mark.stuNum'),
-                    key: 'num',
+                    key: 'count',
                     align: 'center'
                 },
-                // {
-                //     title: this.$t('learnActivity.mark.scanProg'),
-                //     slot: 'scanPerc',
-                //     align: 'center'
-                // },
-                // {
-                //     title: this.$t('learnActivity.mark.assignStatus'),
-                //     slot: 'status',
-                //     align: 'center'
-                // },
                 {
                     title: this.$t('learnActivity.mark.errDeclare'),
                     slot: 'err',
@@ -165,41 +158,7 @@ export default {
                     align: 'center'
                 }
             ],
-            subData: [
-                {
-                    name: '语文',
-                    num: 563,
-                    scanNum: 560,
-                    status: 0,
-                    markNum: 400,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-                {
-                    name: '数学',
-                    num: 563,
-                    scanNum: 560,
-                    status: 0,
-                    markNum: 400,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-                {
-                    name: '英语',
-                    num: 563,
-                    scanNum: 560,
-                    status: 0,
-                    markNum: 400,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                }
-            ],
+            subData: [],
             teaCol: [
                 {
                     title: ' ',
@@ -213,7 +172,7 @@ export default {
                 },
                 {
                     title: this.$t('learnActivity.mark.subject'),
-                    key: 'subject',
+                    key: 'sName',
                     align: 'center'
                 },
 
@@ -222,9 +181,14 @@ export default {
                     slot: 'err',
                     align: 'center'
                 },
+                // {
+                //     title: this.$t('learnActivity.mark.arbDeclare'),
+                //     slot: 'arb',
+                //     align: 'center'
+                // },
                 {
-                    title: this.$t('learnActivity.mark.arbDeclare'),
-                    slot: 'arb',
+                    title: this.$t('learnActivity.mark.markProg'),
+                    slot: 'mark',
                     align: 'center'
                 },
                 {
@@ -232,68 +196,52 @@ export default {
                     slot: 'progress',
                     align: 'center'
                 },
-                {
-                    title: this.$t('learnActivity.mark.action'),
-                    slot: 'action',
-                    align: 'center'
-                }
+                // {
+                //     title: this.$t('learnActivity.mark.action'),
+                //     slot: 'action',
+                //     align: 'center'
+                // }
             ],
-            teaData: [
-                {
-                    name: '李芷萱',
-                    subject: '语文',
-                    compNum: 23,
-                    num: 50,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-                {
-                    name: '李芷萱',
-                    subject: '语文',
-                    compNum: 2,
-                    num: 50,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-                {
-                    name: '李芷萱',
-                    subject: '语文',
-                    compNum: 18,
-                    num: 50,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-                {
-                    name: '李芷萱',
-                    subject: '语文',
-                    compNum: 39,
-                    num: 50,
-                    err: 1,
-                    handleErr: 1,
-                    arb: 0,
-                    handleArb: 0
-                },
-            ]
+            teaData: []
         }
     },
     methods: {
+        findMarkProgress() {
+            let params = {
+                id: this.markSetting.id,
+                code: this.$store.state.userInfo.schoolCode
+            }
+            this.$api.learnActivity.findMarkProgress(params).then(
+                res => {
+                    if (!res.error) {
+                        res.sc.forEach(item => {
+                            item.percent = parseFloat((item.cs*100/item.count).toFixed(1))
+                        })
+                        this.subData = res.sc
 
+                        this.teaData = res.teachers
+                    } else {
+                        this.$Message.error('API error')
+                    }
+                },
+                err => {
+                    this.$Message.error('API error')
+                }
+            )
+        }
     },
     created() {
 
     },
     watch: {
-        markSetting: {
+        'markSetting.id': {
             handler(n, o) {
                 console.log('阅卷数据', n)
+                if (n) {
+                    this.findMarkProgress()
+                }
             },
-            deep: true,
+            // deep: true,
             immediate: true
         }
     }

TEAMModelOS/ClientApp/src/view/learnactivity/markpaper/MarkSetting.vue

@@ -154,7 +154,7 @@
                 </div>
             </div>
             <!-- 阅卷数据统计 -->
-            <MarkData v-show="isShowData" :markSetting="setting"></MarkData>
+            <MarkData v-if="isShowData" :markSetting="setting"></MarkData>
         </vuescroll>
         <!-- 按人分配设置阅卷老师 -->
         <Modal v-model="addTeaStatus" :title="$t('learnActivity.mark.addTeaTitle')" @on-ok="okAddTea" :width="1000">

TEAMModelOS/ClientApp/src/view/task/index.less

@@ -222,4 +222,11 @@
 .objective-tips {
     font-size: 12px;
     color: #ff9900;
+}
+.progress-compare{
+    // background: ;
+    width: 350px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
 }

TEAMModelOS/ClientApp/src/view/task/index.vue

@@ -65,8 +65,22 @@
                     <!-- 数据统计 平均分、最高分、最低分、标准差 -->
                     <div class="setting-block">
                         <p class="block-title">{{$t('task.dataCount')}}</p>
-                        <div class="setting-content data-content dark-iview-table">
-                            <DataCompare></DataCompare>
+                        <div class="setting-content data-content dark-iview-table" style="background:white">
+                            <!-- <DataCompare></DataCompare> -->
+                            <div class="progress-compare">
+                                <div class="">
+                                    <span>
+                                        我的进度：
+                                    </span>
+                                    <Progress :percent="25" />
+                                </div>
+                                <div style="margin-top:40px">
+                                    <span>
+                                        整体进度：
+                                    </span>
+                                    <Progress :percent="25" />
+                                </div>
+                            </div>
                             <ProgPie :count="[marked.length,marking.length,unmarked]"></ProgPie>
                         </div>
                     </div>

TEAMModelOS/ClientApp/src/view/task/mark/Compare.vue

@@ -7,7 +7,7 @@ export default {
     data() {
         return {
             techScoreGau: undefined,
-            xData: [ '最低分', '最高分', '平均分','标准差'],
+            xData: [ '进度', '最高分', '平均分','标准差'],
             // lineData: [100, 100, 100, 100, 100, 100, 100],
             myData: [3, 20, 62, 34, 55, 65, 33],
             allData: [11, 38, 23, 39, 66, 66, 79],