Sfoglia il codice sorgente

调整评测数据存储

zhousheng 4 anni fa
parent
commit
3c9c561ad8

+ 9 - 0
TEAMModelOS/ClientApp/src/components/learnactivity/ClassList.less

@@ -85,4 +85,13 @@
             margin-left: 5px;
         }
     }
+
+    .student-list {
+        display: block;
+        padding: 10px;
+    }
+
+    .search-box{
+        height:6%;
+    }
 }

+ 61 - 42
TEAMModelOS/ClientApp/src/components/learnactivity/ClassList.vue

@@ -1,30 +1,29 @@
 <template>
     <div class="content">
-            <div class="class-list">
-                <div class="activity-target-header">
-                    <span>测试科目</span>
-                </div>
-                <div @click="selectActivity(index)" v-for="(item,index) in activityList" :class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
-                    <p class="target-name">
-                        {{item.classroomName}}
-                        <span class="activity-status">进行中</span>
-                    </p>
-                    <p style="margin-top:6px;">
-                        <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />测试类型:</span>
-                        <span class="info-value">{{item.type}}</span>
-                    </p>
-                    <p style="margin-top:6px;" v-if="item.type == '自主学习'">
-                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
-                        <span class="info-value">{{item.startTime}}</span>
-                    </p>
-                    <p style="margin-top:6px;" v-else>
-                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
-                        <span class="info-value">{{item.endTime}}</span>
-                    </p>
-                </div>
+        <div class="class-list">
+            <div class="activity-target-header">
+                <span>测试科目</span>
             </div>
+            <div @click="selectActivity(index)" v-for="(item,index) in paper" :key="index":class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
+                <p class="target-name">
+                    {{jsFn.getSubjectName(jsFn.getPeriod($store.state.schoolBaseInfo.schoolBaseInfo, item.periodCode), item.subjectCode)}}
+                    <span class="activity-status">进行中</span>
+                </p>
+                <p style="margin-top:6px;">
+                    <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />测试类型:</span>
+                    <span class="info-value">{{typeList[item.level].label}}</span>
+                </p>
+                <p style="margin-top:6px;" >
+                    <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
+                    <span class="info-value">{{ $tools.formatTime(item.createTime *1000 , 'yyyy-MM-dd')}}</span>
+                </p>
+                <!--<p style="margin-top:6px;" v-else>
+                    <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
+                    <span class="info-value">{{item.endTime}}</span>
+                </p>-->
+            </div>
+        </div>
             <div class="class-info">
-               
                 <div class="learn-progress-main dark-iview-table" v-if="currentActivityIndex == 0">
                     <vuescroll>
                         <p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩分析</p>
@@ -52,7 +51,7 @@
                     <div class="dark-iview-table" v-if="currentActivityIndex != 0">
                         <p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩评审</p>
                         <div style="margin-top:15px;margin-left:30px;">
-                            <grade-list></grade-list>
+                            <grade-list :paperInfo="paperData"></grade-list>
                         </div>
                     </div>
             </div>
@@ -61,8 +60,15 @@
 <script>
     import Grade from '@/components/learnactivity/GradeChart.vue'
     import Table from '@/components/learnactivity/GradeTable.vue'
+    import jsFn from '@/utils/js-fn.js'
     import GradeList from '@/components/learnactivity/GradeList.vue'
     export default {
+        props: {
+            paper: {
+                type: Array,
+                default:[],
+            }
+        },
         components: {
             Grade,
             Table,
@@ -70,28 +76,31 @@
         },
         data() {
             return {
+                jsFn,
                 showAnswer: false,
-                currentActivityIndex:0,
-                activityList: [
+                currentActivityIndex: 0,
+                studentData: [],
+                studentList: [],
+                testStatus: false,
+                typeList: [
                     {
-                        classroomName:'语文',
-                        classroomCode: '123',
-                        type: '平常考',
-                        startTime: '2020-05-06',
-                        endTime:'2020-07-07'
+                        value: '1',
+                        label: '联考'
                     },
                     {
-                        classroomName:'数学',
-                        classroomCode: '123',
-                        type:'平常考',
-                        startTime: '2020-05-06',
-                        endTime:'2020-05-07'
+                        value: '2',
+                        label: '段考'
                     },
-
+                    {
+                        value: '3',
+                        label: '平常考'
+                    },
+                    {
+                        value: '4',
+                        label: '其他'
+                    }
                 ],
-                studentData: [], 
-                studentList: [],
-                testStatus:false
+                paperData: {}
             }
         },
         methods: {
@@ -99,7 +108,11 @@
                 this.testStatus = !this.testStatus
             },
             selectActivity(index) {
+                this.paperData = {}
+                this.currentActivityIndex = 0 
                 this.currentActivityIndex = index
+                this.paperData = this.paper[this.currentActivityIndex]
+                console.log(this.paperData)
             },
             getData() {
                 let data = this.$Mock.data.studentList
@@ -115,7 +128,6 @@
                             }
                         }
                     } else {
-
                         this.studentList = this.studentData[0].studentScore
                     }
                 } else {
@@ -127,7 +139,14 @@
             },
             closeAnswerDetail() {
                 this.showAnswer = false
-            }
+            },
+            //dataFormate() {
+            //    if (this.paper.length !== 0) {
+            //        for (let i = 0; i < this.paper.length; i++) {
+            //            this.paper[i].createTime = this.$tools.formatTime(this.paper[i].createTime * 1000)
+            //        }
+            //    } 
+            //}
         },
         mounted() {
             this.getData()

+ 40 - 23
TEAMModelOS/ClientApp/src/components/learnactivity/GradeList.vue

@@ -1,16 +1,17 @@
 <template>
     <div class="body">
-        <div class="search-box dark-iview-input">
-            <Input placeholder="查询学生姓名..." v-model="inputData" style="width:25%;margin:5px;">
-            <Icon type="ios-contact" slot="prefix" />
-            </Input>
-        </div>
+
         <div class="content">
             <div class="left-box">
                 <div class="student-box">
+                    <div class="search-box dark-iview-input">
+                        <Input placeholder="查询学生姓名..." v-model="inputData" style="width:85%;margin:5px;margin-bottom:5px">
+                        <Icon type="ios-contact" slot="prefix" />
+                        </Input>
+                    </div>
                     <vuescroll>
                         <ul>
-                            <li :class="index == selectIndex ?' block-bg-active block-bg':' block-bg'" v-for="(item,index) in studentList" @click="getStudentInfo(item,index)" >
+                            <li :class="index == selectIndex ?' block-bg-active block-bg':' block-bg'" v-for="(item,index) in studentList" @click="getStudentInfo(item,index)">
                                 <div class="student-list">
                                     <span>{{item.name}}</span><br />
                                 </div>
@@ -21,8 +22,7 @@
             </div>
             <div class="grade-box">
                 <vuescroll>
-                    <ReviewPaper :paper="paperInfo" style="color:#515a6e;" :isShowTools="isShowTools">
-                    </ReviewPaper>
+                    <ReviewPaper :paper="paperData" style="color:#515a6e;" :isShowTools="isShowTools"> </ReviewPaper>
                 </vuescroll>
             </div>
         </div>
@@ -33,24 +33,32 @@
 <script>
     import ReviewPaper from '../learnactivity/ReviewPaper.vue'
     export default {
+        props: {
+            paperInfo: {
+                type: Object,
+                default: {}
+            }
+        },
         components: {
             ReviewPaper,
         },
         data() {
             return {
-                paperCode: "632dd8b3-c48c-4ee5-8448-7e539f764272",
-                paperInfo: {},
+                paperData: {},
                 examAnalysisStatus: false,
                 isShowTools: true,
                 dataInfo: {},
                 inputData: "",
                 studentData: [],
-                selectIndex:0
+                selectIndex: 0,
+                testData: {
+                    code: '632dd8b3-c48c-4ee5-8448-7e539f764272',
+                }
             }
         },
         computed:{
             studentList() {
-                this.studentData = this.$Mock.data.studentList[0].studentScore
+                
                 let filterData = this.studentData
                 if (this.inputData) {
                     filterData = this.studentData.filter(res => {
@@ -66,28 +74,29 @@
             getStudentInfo(data, index) {
                 this.selectIndex = index
             },
+
+
             //获取学生测验数据
             getStudentData() {
                 let requestData = {}
-                let datas = this.$Mock.data.studentList
-                console.log(datas)
-                requestData.examCode = "632dd8b3-c48c-4ee5-8448-7e539f764272"
-                requestData.id = "c3da2274-94ab-4cf1-92d8-dd30e8532aaf"
-                if (requestData.id !== undefined) {
+                requestData.examCode = this.testData.code
+                requestData.id = this.testData.id
+                if (requestData.examCode !== undefined) {
                     this.$api.learnActivity.FindSummaryRecord(requestData).then(
                         res => {
+                            console.log(res)
                             if (res.error == null) {
                                 let data = []
                                 data = res.result.data.map((item) => {
                                     return item.code
                                 })
                                 let students = {}
-                                students.id = data
+                                students.studentId = data
                                 students.code = "HBCN"
                                 this.$api.learnActivity.FindStudent(students).then(
                                     res => {
                                         if (res.error == null) {
-                                            console.log(res.result.data)
+                                            this.studentData = res.result.data
                                         }
                                     }
                                 )
@@ -98,24 +107,29 @@
                     )
                 }
             },
+
+
             //获取试卷主观题信息
             getPaperInfo() {
+                console.log('试卷主观题信息')
                 if (this.paperCode !== "") {
                     let requestData = {
-                        code: this.paperCode
+                        code: this.paperInfo.code
                     }
                     this.examAnalysisStatus = false
                     if (requestData.code !== "") {
                         this.$api.learnActivity.FindExamPaper(requestData).then(
                             res => {
                                 if (res.error == null) {
-                                    this.paperInfo = res.result.data[0]
+                                    this.paperData = res.result.data[0]
                                     let data = res.result.data[0].item
-                                    this.paperInfo.item = []
+                                    this.paperData.item = []
                                     for (let i = 0; i < data.length; i++) {
-                                        this.paperInfo.item.push(data[i])
+                                        this.paperData.item.push(data[i])
                                     }
                                     this.examAnalysisStatus = true
+                                    console.log('试卷信息2')
+                                    console.log(this.paperData)
                                 } else {
                                     this.$Message.error('API ERROR!')
                                 }
@@ -126,6 +140,9 @@
             }
         },
         mounted() {
+            console.log('试卷数据信息')
+            console.log(this.paperInfo)
+            console.log(this.studentData)
             this.getStudentData()
             this.getPaperInfo()
         }

+ 297 - 0
TEAMModelOS/ClientApp/src/components/learnactivity/ReviewPaper.less

@@ -0,0 +1,297 @@
+.paper-container {
+    user-select: none !important;
+    font-family: '微軟正黑體', 'Heiti TC' !important;
+
+
+    .paper-title {
+        font-size: 30px;
+        font-weight: bold;
+        vertical-align: middle;
+        text-align: center;
+        cursor: pointer;
+    }
+
+    .paper-subTitle {
+        font-size: 16px;
+        font-weight: bold;
+        margin: 15px;
+        text-align: center;
+        vertical-align: middle;
+    }
+
+    .paper-info {
+        font-size: 14px;
+        vertical-align: middle;
+    }
+
+    .paper-toolbar {
+        background: #fff;
+        padding: 20px;
+
+        .filter-title {
+            font-size: 14px;
+        }
+    }
+}
+
+.paper-main-wrap {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 10px;
+    padding: 20px 0;
+
+    .paper-analysis {
+        position: sticky;
+        top: 0;
+        background: White;
+        width: 20%;
+        padding: 20px 10px;
+
+        .ivu-radio-group {
+            margin: 15px 0 0 0;
+        }
+
+        .analysis-btns {
+            width: 100%;
+            .flex-row-center;
+            justify-content: space-around;
+
+            .ivu-btn {
+                width: 30%;
+                height: 40px;
+            }
+        }
+
+        .analysis-infos {
+            margin-top: 15px;
+            border-top: 1px dotted #cfcfcf;
+            padding: 0 20px 0 20px;
+
+            .analysis-title {
+                font-size: 18px;
+                margin: 30px 0 10px 0;
+                font-weight: bold;
+
+                &::before {
+                    content: "";
+                    height: 14px;
+                    width: 5px;
+                    margin-top: 2px;
+                    margin-right: 8px;
+                    border-radius: 5px;
+                    background: #01b4ef;
+                    display: inline-block;
+                    vertical-align: baseline;
+                }
+            }
+
+            .flex-row-center {
+                justify-content: space-between;
+            }
+
+            .analysis-info {
+                font-weight: bold;
+                color: #69baec;
+                margin: 0 5px;
+            }
+
+            .analysis-index-wrap {
+                display: flex;
+                flex-wrap: wrap;
+            }
+
+            .exercise-index-item {
+                width: 34px;
+                height: 34px;
+                line-height: 34px;
+                text-align: center;
+                margin-right: 10px;
+                margin-top: 10px;
+                background: #69BAEC;
+                color: #fff;
+                border-radius: 5px;
+                cursor: pointer;
+                .flex-row-center;
+
+                &:hover {
+                    background: #0097F4;
+                }
+            }
+        }
+    }
+}
+
+.paper-content {
+    width: 100%;
+    background: #fff;
+    padding: 20px;
+    display: flex;
+    flex-direction: row;
+
+    .paper-body {
+        width: 94%;
+        padding-left: 50px;
+
+        .paper-header {
+            margin-top: 20px;
+        }
+    }
+
+    .paper-base-info {
+        height: 60px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px dashed #cfcfcf;
+
+        .base-info-item:not(:first-child) {
+            margin-left: 30px;
+        }
+
+        .base-info-btn:not(:last-child) {
+            margin-right: 10px;
+        }
+
+        .analysis-info {
+            font-weight: bold;
+            color: #69baec;
+            margin: 0 5px;
+        }
+    }
+
+    .paper-part {
+        padding: 15px;
+    }
+
+    .exercise-item {
+        position: relative;
+        font-size: 14px !important;
+        margin-top: 0 !important;
+        padding: 5px 10px !important;
+        box-sizing: border-box;
+        background: transparent;
+        border: 1px solid rgba(1,1,1,0);
+
+        .item-concept {
+            margin-top: 10px;
+        }
+
+        .item-tools {
+            position: absolute;
+            right: -2px;
+            top: -30px;
+            width: auto;
+            height: 30px;
+            margin: 0;
+            padding: 0;
+            background: #01b4ef;
+            display: none;
+        }
+
+        .item-tools-t {
+            height: 100%;
+            padding: 0 15px;
+            float: left;
+            color: white;
+            cursor: pointer;
+
+            &:hover {
+                background: #4a5ae6;
+            }
+
+            .ivu-icon {
+                color: white;
+                font-size: 14px;
+                margin: 0 3px;
+            }
+        }
+
+        &:hover {
+            box-shadow: none !important;
+            border-color: #cfcfcf;
+        }
+    }
+
+    .paper-content-section {
+        font-size: 18px;
+        font-weight: bold;
+        margin-top: 20px;
+
+        span {
+            font-size: 14px;
+            font-weight: 500;
+            margin-left: 10px;
+        }
+    }
+}
+/*.paper-content .paper-part:hover {
+            background: #bfcdad45;
+        }*/
+.paper-content .item-answer, .paper-content .item-explain {
+    line-height: 26px;
+}
+
+.paper-tools {
+    width: 100%;
+    height: 60px;
+    margin-top: 10px;
+    border-top: 1px dashed #cfcfcf;
+    padding: 10px 0;
+
+    .paper-tools-title {
+        font-size: 14px;
+        font-weight: bold;
+        margin-right: 10px;
+    }
+
+    .ivu-checkbox-wrapper {
+        font-size: 14px;
+        margin-left: 10px;
+    }
+
+    .ivu-checkbox {
+        margin: 0 4px;
+        vertical-align: text-bottom;
+    }
+
+    .ivu-checkbox-checked {
+        .ivu-checkbox-inner {
+            background: #01b4ef;
+            border-color: #01b4ef;
+        }
+    }
+}
+
+.rules-modal {
+
+    .ivu-modal-body {
+
+        .rule-item {
+            display: flex;
+            flex-direction: column;
+
+            &-title {
+                margin: 10px 0;
+                font-weight: bold;
+            }
+        }
+    }
+}
+
+
+/*横向垂直水平居中*/
+.flex-row-center {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
+/*向垂直水平居中*/
+.flex-col-center {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}

+ 20 - 39
TEAMModelOS/ClientApp/src/components/learnactivity/ReviewPaper.vue

@@ -12,7 +12,7 @@
                             <span class="base-info-item">总分:<span class="analysis-info">52</span></span>
                         </div>
                         <div>
-                            <Button class="base-info-btn" type="info" @click="onHandleToggle" v-show="paperInfo.item.length">{{ isAllOpen ? '全部折叠' : '全部展开'}}</Button>
+                            <!--<Button class="base-info-btn" type="info" @click="onHandleToggle" v-show="paperInfo.item.length">{{ isAllOpen ? '全部折叠' : '全部展开'}}</Button>-->
                             <Button class="base-info-btn" type="success" @click="savePaper">提交分数</Button>
                         </div>
                     </div>
@@ -52,27 +52,7 @@
                 exersicesList: [],
                 list: [],
                 schoolInfo: {},
-                paperInfo: {
-                    name: "",
-                    score: 100,
-                    answers: [],
-                    markConfig: {
-                        auto: false,
-                        type: 0,
-                        score: 0
-                    },
-                    item: []
-                },
-                exersicesType: {
-                    Single: '单选题',
-                    Multiple: '多选题',
-                    Judge: '判断题',
-                    Complete: '填空题',
-                    Subjective: '问答题',
-                    Compose: '综合题'
-                },
-                exersicesDiff: ['容易', '较易', '一般', '较难', '困难'],
-                diffColors: ['#32CF74', '#E8BE15', '#F19300', '#EB5E00', '#D30000'],
+                paperInfo: {},
                 filterType: '0',
                 filterDiff: '0',
                 filterSort: '0',
@@ -101,6 +81,7 @@
             }
         },
         mounted() {
+            console.log(this.paper)
             this.onHandleToggle()
             this.onToggleChange()
         },
@@ -119,9 +100,9 @@
              * exList的collapseList变化
              * @param list
              */
-            onToggleChange(list) {
-                this.isAllOpen = list.length !== 0
-            },
+            //onToggleChange(list) {
+            //    this.isAllOpen = list.length !== 0
+            //},
 
             /** 返回试卷库 */
             onBackToBank() {
@@ -138,14 +119,14 @@
                
             },
             /** 重新挑题 */
-            goToPickExercise() {
-                this.$router.push({
-                    name: 'exercisesList',
-                    params: {
-                        paperInfo: this.paperInfo
-                    }
-                })
-            },
+            //goToPickExercise() {
+            //    this.$router.push({
+            //        name: 'exercisesList',
+            //        params: {
+            //            paperInfo: this.paperInfo
+            //        }
+            //    })
+            //},
 
             /** 点击题型配分 */
             onSetScoreByType() {
@@ -176,11 +157,11 @@
         },
         mounted() {
             this.isShowSave = window.location.pathname === '/home/evaluation/testPaper'
-            let paper = this.paper || this.$route.params.paper || JSON.parse(localStorage.getItem('_paperInfo'))
-            if (!paper) return
-            localStorage.setItem('_paperInfo', JSON.stringify(paper))
-            this.paperInfo = paper // 自己页面的值
-            this.paperDiff = paper.item ? this.handleDiffCalc(paper.item) : 0
+            //let paper = this.paper || this.$route.params.paper || JSON.parse(localStorage.getItem('_paperInfo'))
+            //if (!paper) return
+            //localStorage.setItem('_paperInfo', JSON.stringify(paper))
+            this.paperInfo = this.paper // 自己页面的值
+            this.paperDiff = this.paper.item ? this.handleDiffCalc(this.paper.item) : 0
         },
         computed: {
             isAuto() {
@@ -195,7 +176,7 @@
                 handler(newValue, oldValue) {
                     console.log(newValue)
                     this.paperInfo = newValue
-                    localStorage.setItem('_paperInfo', JSON.stringify(newValue))
+                    //localStorage.setItem('_paperInfo', JSON.stringify(newValue))
                     this.paperDiff = newValue.item ? this.handleDiffCalc(newValue.item) : 4
                 },
                 deep: true

+ 76 - 81
TEAMModelOS/ClientApp/src/view/learnactivity/ManageEvaluation.vue

@@ -90,7 +90,7 @@
             </div>
             <div :class="currentBraIndex == 1 ? 'animated fadeIn evaluation-base-info':'evaluation-base-info animated fadeOutRight'" v-show="currentBraIndex == 1">
                 <vuescroll>
-                    <ClassList></ClassList>
+                    <ClassList :paper="examPaperList"></ClassList>
                 </vuescroll>
             </div>
         </div>
@@ -506,8 +506,6 @@
             },
             selectEvaluation(index) {
                 this.avtiveEvaluationIndex = index
-                console.log(index)
-                console.log(this.evaluationList[this.avtiveEvaluationIndex])
                 this.getMyDate(this.evaluationList[this.avtiveEvaluationIndex].startTime, this.evaluationList[this.avtiveEvaluationIndex].endTime)
                 this.findExamPaper()
             },
@@ -526,8 +524,6 @@
                     res => {
                         if (res.error == null) {
                             this.evaluationList = res.result.data
-                            console.log('獲取评测列表')
-                            console.log(this.evaluationList)
                             if (this.evaluationList.length > 0) {
                                 this.selectEvaluation(0)
                             }
@@ -548,7 +544,6 @@
                     res => {
                         if (res.error == null) {
                             this.examPaperList = res.result.data
-                            console.log(this.examPaperList)
                             this.groupQuestion = {}
                             if (this.examPaperList.length > 0) {
                                 let groupResult = jsFn.groupBy(this.examPaperList[0].item, 'type')
@@ -568,82 +563,82 @@
                     }
                 )
             },
-            checkCount(count) {
-                switch (count) {
-                    case 0:
-                        return '一、'
-                        break
-                    case 1:
-                        return '二、'
-                        break
-                    case 2:
-                        return '三、'
-                        break
-                    case 3:
-                        return '四、'
-                        break
-                    case 4:
-                        return '五、'
-                        break
-                    case 5:
-                        return '六、'
-                        break
-                    default:
-                        return ''
-                        break
-                }
-            },
-            getOrder(type) {
-                let count = 0
-                switch (type) {
-                    case 'Single':
-                        return '一、'
-                        break
-                    case 'Multiple':
-                        if (this.groupQuestion.Single != undefined) {
-                            return '二、'
-                        } else {
-                            return '一、'
-                        }
-                        break
-                    case 'Complete':
-                        for (let key in this.groupQuestion) {
-                            if (key == 'Single' || key == 'Multiple') {
-                                count++
-                            }
-                        }
-                        return this.checkCount(count)
-                        break
-                    case 'Judge':
+            //checkCount(count) {
+            //    switch (count) {
+            //        case 0:
+            //            return '一、'
+            //            break
+            //        case 1:
+            //            return '二、'
+            //            break
+            //        case 2:
+            //            return '三、'
+            //            break
+            //        case 3:
+            //            return '四、'
+            //            break
+            //        case 4:
+            //            return '五、'
+            //            break
+            //        case 5:
+            //            return '六、'
+            //            break
+            //        default:
+            //            return ''
+            //            break
+            //    }
+            //},
+            //getOrder(type) {
+            //    let count = 0
+            //    switch (type) {
+            //        case 'Single':
+            //            return '一、'
+            //            break
+            //        case 'Multiple':
+            //            if (this.groupQuestion.Single != undefined) {
+            //                return '二、'
+            //            } else {
+            //                return '一、'
+            //            }
+            //            break
+            //        case 'Complete':
+            //            for (let key in this.groupQuestion) {
+            //                if (key == 'Single' || key == 'Multiple') {
+            //                    count++
+            //                }
+            //            }
+            //            return this.checkCount(count)
+            //            break
+            //        case 'Judge':
 
-                        for (let key in this.groupQuestion) {
-                            if (key == 'Single' || key == 'Complete' || key == 'Multiple') {
-                                count++
-                            }
-                        }
-                        return this.checkCount(count)
-                        break
-                    case 'Subjective':
-                        for (let key in this.groupQuestion) {
-                            if (key == 'Single' || key == 'Complete' || key == 'Multiple' || key == 'Judge') {
-                                count++
-                            }
-                        }
-                        return this.checkCount(count)
-                        break
-                    case 'Compose':
-                        for (let key in this.groupQuestion) {
-                            if (key == 'Single' || key == 'Complete' || key == 'Multiple' || key == 'Judge' || key == 'Subjective') {
-                                count++
-                            }
-                        }
-                        return this.checkCount(count)
-                        break
-                    default:
-                        return ''
-                        break
-                }
-            }
+            //            for (let key in this.groupQuestion) {
+            //                if (key == 'Single' || key == 'Complete' || key == 'Multiple') {
+            //                    count++
+            //                }
+            //            }
+            //            return this.checkCount(count)
+            //            break
+            //        case 'Subjective':
+            //            for (let key in this.groupQuestion) {
+            //                if (key == 'Single' || key == 'Complete' || key == 'Multiple' || key == 'Judge') {
+            //                    count++
+            //                }
+            //            }
+            //            return this.checkCount(count)
+            //            break
+            //        case 'Compose':
+            //            for (let key in this.groupQuestion) {
+            //                if (key == 'Single' || key == 'Complete' || key == 'Multiple' || key == 'Judge' || key == 'Subjective') {
+            //                    count++
+            //                }
+            //            }
+            //            return this.checkCount(count)
+            //            break
+            //        default:
+            //            return ''
+            //            break
+            //    }
+            //}
         },
         mounted() {
             //console.log('sas')