Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/LessonTestReportCharts/StudentScore.vue

@@ -138,13 +138,11 @@
                 </ul>
             </div>
             <div class="score-table">
-                <div class="table-list">
-                    <table class="gridtable" v-if="stuScore.length" style="width: 100%; max-width: 100%;margin-bottom: 20px;">
+                <div>
+                    <table class="gridtable" v-show="stuScore.length" style="margin-bottom:20px;">
                         <tr>
                             <th>{{$t("studentWeb.exam.studentScore.subjects")}}</th>
                             <th>{{$t("studentWeb.exam.studentScore.item")}}</th>
-                            <th>{{$t("studentWeb.exam.studentScore.objItems")}}</th>
-                            <th>{{$t("studentWeb.exam.studentScore.subItems")}}</th>
                         </tr>
                         <tbody v-for="(que,index) in stuScore" :key="index">
                             <tr>
@@ -152,6 +150,24 @@
                             </tr>
                             <tr>
                                 <td width="8%">{{$t("studentWeb.exam.studentScore.itemIndex")}}</td>
+                            </tr>
+                            <tr>
+                                <td width="8%">{{$t("studentWeb.exam.studentScore.standardIndex")}}</td>
+                            </tr>
+                            <tr>
+                                <td width="8%">{{$t("studentWeb.exam.studentScore.stuAnsIndex")}}</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div class="table-list">
+                    <table class="gridtable" v-show="stuScore.length" style="margin-bottom: 20px;">
+                        <tr>
+                            <th>{{$t("studentWeb.exam.studentScore.objItems")}}</th>
+                            <th>{{$t("studentWeb.exam.studentScore.subItems")}}</th>
+                        </tr>
+                        <tbody v-for="(que,index) in stuScore" :key="index">
+                            <tr>
                                 <td>
                                     <div class="score-box">
                                         <span v-for="(objQue,obj) in que.item.objItem" :key="obj">{{objQue.paperIndex}}</span>
@@ -164,7 +180,6 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td width="8%">{{$t("studentWeb.exam.studentScore.standardIndex")}}</td>
                                 <td>
                                     <div class="score-box">
                                         <span v-for="(objAns,obja) in que.item.objItem" :key="obja">{{objAns.answer.length > 1 ? '[?]': objAns.answer[0]}}</span>
@@ -177,7 +192,6 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td width="8%">{{$t("studentWeb.exam.studentScore.stuAnsIndex")}}</td>
                                 <td>
                                     <div class="score-box">
                                         <span v-for="(objScore,objs) in que.item.objItem" :key="objs">{{objScore.stuScore == 0 ? objScore.stuAns[0] : '-'}}</span>
@@ -192,7 +206,6 @@
                         </tbody>
                     </table>
                 </div>
-
             </div>
             <div class="score-table">
                 <p style="color:#24b880">{{$t("studentWeb.exam.studentScore.notice")}}</p>
@@ -227,6 +240,7 @@
         methods: {
             async getPaperData() {
                 this.stuScore = []
+                let data = []
                 if (this.stuData.papers) {
                     for (let i = 0; i < this.stuData.papers.length; i++) {
                         let subData = {}
@@ -268,7 +282,7 @@
                             res.classCount = classCount
                             this.scoreInfo = res
                         } else {
-                            this.$Message.warning(this.$t('studentWeb.exam.report.gradeErr'))
+                            this.$Message.warning(this.$t('studentWeb.exam.studentScore.gradeErr'))
                         }
                     })
                 }
@@ -290,8 +304,6 @@
                     subItem: [],
                 }
                 if (data !== undefined) {
-                    console.log(data)
-                    console.log(this.$store.getters.getItemTitle.scope)
                         let code = {
                             scope: data.scope,
                             code: this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId,
@@ -385,6 +397,9 @@
     }
 </script>
 <style lang="less" scoped>
+    table {
+        width: 100%;
+    }
     .stu-analyse table {
         border-collapse: collapse;
     }
@@ -403,65 +418,7 @@
         top: 0px;
     }
 
-    .stu-analyse td:first-child {
-        color: #333;
-        position: sticky;
-        left: 0px;
-    }
-
-    .stu-analyse th:first-child {
-        left: 0px;
-    }
-
-
-    .stu-analyse table.gridtable {
-        /*font-family: verdana,arial,sans-serif;*/
-        width: calc(100% - 10px);
-        font-size: 11px;
-        color: #333333;
-        border-width: 1px;
-        border-color: #666666;
-        border-collapse: collapse;
-    }
-
-        .stu-analyse table.gridtable th {
-            border-width: 1px;
-            padding: 8px;
-            border-style: solid;
-            border-color: #666666;
-            /*background-color: #dedede;*/
-        }
-
-        .stu-analyse table.gridtable td {
-            border-width: 1px;
-            padding: 8px;
-            border-style: solid;
-            border-color: #666666;
-            background-color: #ffffff;
-        }
-
-    .stu-analyse .score-table{
-        overflow-x:scroll;
-    }
-    .stu-analyse .score-table .gridtable span {
-        display: block;
-        /*height:100%;*/
-        text-align: center;
-        width: 30px;
-        /*border-right:1px solid #666666;*/
-    }
-
-    .stu-analyse .score-table .gridtable .score-box {
-        text-align: left;
-        display: flex;
-    }
-/*    .stu-analyse .stu-score .item-title td{
-        width:80px;
-    }*/
-
-
     .stu-analyse {
-        /*height: 300px;*/
         width: 100%;
         border-radius: 5px;
         background-color: #F0F0F0;
@@ -474,7 +431,6 @@
             .stu-analyse .stu-info ul {
                 display: flex;
                 list-style: none;
-                width: 98%;
                 border-radius: 5px;
                 margin-left: 10px;
             }
@@ -535,8 +491,6 @@
         }
 
             .stu-analyse .sub-title ul {
-                /*       background-color: #ffffff;
-            opacity: 0.8;*/
                 font-size: 18px;
                 display: flex;
                 list-style: none;
@@ -566,8 +520,6 @@
             }
 
             .stu-analyse .sub-title .sub-show {
-                /*background-color:#ffffff;*/
-                /*height:20px;*/
                 margin-top: 15px;
                 border-left: 5px solid #24b880;
             }
@@ -617,7 +569,7 @@
             font-size: 18px;
             display: flex;
             list-style: none;
-            width: 98%;
+            /*width: 98%;*/
             margin-left: 10px;
             margin-top: 20px;
         }
@@ -637,10 +589,48 @@
             width: calc(100% - 10px);
             padding-bottom: 10px;
             padding-right: 10px;
-            overflow: hidden;
+            /*overflow: hidden;*/
         }
     .stu-analyse .score-table .table-list{
-        width:100%;
-        overflow:scroll;
+        overflow-x:scroll;
     }
+
+        .stu-analyse table.gridtable {
+            width: calc(100% - 10px);
+            font-size: 11px;
+            color: #333333;
+            border-width: 1px;
+            border-color: #666666;
+            border-collapse: collapse;
+        }
+
+            .stu-analyse table.gridtable th {
+                border-width: 1px;
+                padding: 8px;
+                border-style: solid;
+                border-color: #666666;
+            }
+
+            .stu-analyse table.gridtable td {
+                border-width: 1px;
+                padding: 8px;
+                border-style: solid;
+                border-color: #666666;
+            }
+
+        .stu-analyse .score-table {
+            overflow-x: scroll;
+            display: flex
+        }
+
+            .stu-analyse .score-table .gridtable span {
+                display: block;
+                text-align: center;
+                width: 40px;
+            }
+
+            .stu-analyse .score-table .gridtable .score-box {
+                text-align: left;
+                display: flex;
+            }
 </style>

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/PaperView.vue

@@ -139,14 +139,12 @@
                                             k++
                                         }
                                     }
-                                    console.log(this.paperData)
                                     if (k == 0 && this.paperData[i].progress == 'finish') {
                                         isTest++
                                     }
                                 }
                             }
                         }
-                        console.log(isTest)
                         if (isTest == this.paperData.length ) {
                             this.isTestOver = true
                         }

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/Vote.vue

@@ -181,12 +181,9 @@
                 }
             },
            async getVoteRes() {
-                console.log('投票数据', this.voteInfo)
                 if (this.voteInfo.recordUrl !== "") {
-                    console.log(this.voteInfo.recordUrl)
                     let data = await this.getBlobItems(this.voteInfo)
                     this.setData(data[0])
-                    console.log(data)
                 }
             },
             // 获取blob里的试题数据

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/VoteResultChart.vue

@@ -2,12 +2,14 @@
     <div class="vote-result-chart">
         <Card class="vote-chart-card">
             <div id="main" style="height:350px;width:600px"></div>
-            <!--<span v-if="voteData.length == 0">暂未投票结果数据</span>-->
+            <span v-if="voteData.length == 0">{{$t("studentWeb.vote.noData")}}</span>
         </Card>
     </div>
 </template>
 
 <script>
+import studentWeb from "../../../../api/studentWeb";
+
     export default {
         props: {
             voteData: {
@@ -29,7 +31,6 @@
             };
         },
         mounted() {
-            console.log(this.voteData)
             if (this.voteData.length) {
                 this.setMyMap()
             }
@@ -47,7 +48,7 @@
                             fontFamily: "Ariel",
                             fontWeight: "bolder",
                         },
-                        formatter: '选项{b0}: <span class="studyhrs">{c0}</span> 人'
+                        formatter:  this.$t('studentWeb.vote.option') + '{b0}: <span class="studyhrs">{c0}</span>'
                     },
                     grid: {
                         top: "15%",

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -223,7 +223,11 @@ export default {
         warning2: '已超出最大投票数！',
         voteRes: '投票结果',
         voteRecord: '投票记录',
-        voteTime: '投票时间'
+        voteTime: '投票时间',
+        noData: '暂无投票结果数据',
+        option: '选项',
+
+
     },
     homework: {
         homeworkUpload: '作业上传区',