fix:修改测验时长显示不对的逻辑

LH_PC
1 parent 45b98e8e
Showing 5 changed files with 73 additions and 37 deletions
.gitignore
src/utils/index.js
src/views/basic/askTestQuestion/components/testBzrMulti.vue
src/views/basic/askTestQuestion/components/testListReport.vue
vue.config.js
@@ -27,3 +27,4 @@ pnpm-debug.log*
 *.sw?
 src/views/portrait/test.vue
 /src/.vs
+/.vs
@@ -411,6 +411,26 @@ export function formatDate(date, fmt) {
   return time_str;
 }
+export function formatTimeWithHours(seconds) {
+  if (!seconds || seconds <= 0) return "0秒";
+  const hours = Math.floor(seconds / 3600);
+  const minutes = Math.floor((seconds % 3600) / 60);
+  const sec = seconds % 60;
+
+  // 根据是否有小时动态调整格式
+  var ret = '';
+  if (hours > 0) {
+    ret += hours + "小时";
+  }
+  if (minutes > 0) {
+    ret += minutes + "分钟";
+  }
+  if (sec > 0) {
+    ret += sec + "秒";
+  }
+  return ret;
+}
+
 // 获取日期时间戳
 export function getTime(dayNum) {
   var myDate = new Date();
@@ -1266,12 +1286,12 @@ export function tablePrint(options) {
   }
   let pagedoc = awin.document.createElement('div')
-  pagedoc.className = "page-number" 
-  awin.document.body.append(pagedoc) 
-  awin.document.body.append(aDom); 
-  
-  let pagedom =  awin.document.querySelectorAll('.page-number');
- 
+  pagedoc.className = "page-number"
+  awin.document.body.append(pagedoc)
+  awin.document.body.append(aDom);
+
+  let pagedom = awin.document.querySelectorAll('.page-number');
+
   awin.print();
   awin.close()
@@ -21,7 +21,11 @@
                             {{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="examStartTime" label="测验时长"></el-table-column>
+                    <el-table-column label="测验时长">
+                        <template slot-scope="scoped">
+                            {{ _formatTimeWithHours(scoped.row.duration) }}
+                        </template>
+                    </el-table-column>
                 </el-table>
             </el-row>
         </div>
@@ -29,8 +33,8 @@
             <el-container style="height: 100%;width: 100%;">
                 <el-main id="print-content">
                     <el-row class="row-type print-hidden">
-                        <div style="float: left;">    
-                             <el-button @click="_backa">返回</el-button>
+                        <div style="float: left;">
+                            <el-button @click="_backa">返回</el-button>
                         </div>
                         <div style="float: right;">
                             <el-button type="primary" @click="_import" class="opration-btn"
@@ -52,37 +56,37 @@
                                 <el-table-column :prop="'examCount' + item" label="测练数"
                                     :class-name="index % 2 == 0 ? 'bg' : ''">
                                     <template slot-scope="scoped">{{
-            scoped.row["examCount" + item] ||
-                Number(scoped.row["examCount" + item]) === 0
-                ? scoped.row["examCount" + item]
-                : "-"
-        }}</template>
+                                        scoped.row["examCount" + item] ||
+                                            Number(scoped.row["examCount" + item]) === 0
+                                        ? scoped.row["examCount" + item]
+                                        : "-"
+                                        }}</template>
                                 </el-table-column>
                                 <el-table-column :prop="'participationCount' + item" label="参与数"
                                     :class-name="index % 2 == 0 ? 'bg' : ''">
                                     <template slot-scope="scoped">{{
-            scoped.row["participationCount" + item] ||
-                Number(scoped.row["participationCount" + item]) === 0
-                ? scoped.row["participationCount" + item]
-                : "-"
-        }}</template>
+                                        scoped.row["participationCount" + item] ||
+                                            Number(scoped.row["participationCount" + item]) === 0
+                                            ? scoped.row["participationCount" + item]
+                                        : "-"
+                                        }}</template>
                                 </el-table-column>
                                 <el-table-column :prop="'score' + item" label="总分"
                                     :class-name="index % 2 == 0 ? 'bg' : ''">
                                     <template slot-scope="scoped">{{
-            scoped.row["score" + item] ||
-                Number(scoped.row["score" + item]) === 0
-                ? scoped.row["score" + item]
-                : "-"
-        }}</template>
+                                        scoped.row["score" + item] ||
+                                            Number(scoped.row["score" + item]) === 0
+                                        ? scoped.row["score" + item]
+                                        : "-"
+                                        }}</template>
                                 </el-table-column>
                                 <el-table-column :prop="'classRank' + item" label="班名"
                                     :class-name="index % 2 == 0 ? 'bg' : ''">
                                     <template slot-scope="scoped">{{
-            scoped.row["classRank" + item] ||
-                                        Number(scoped.row["classRank" + item]) === 0
-                                        ? scoped.row["classRank" + item]
-                                        : "-"
+                                        scoped.row["classRank" + item] ||
+                                            Number(scoped.row["classRank" + item]) === 0
+                                            ? scoped.row["classRank" + item]
+                                            : "-"
                                         }}</template>
                                 </el-table-column>
                             </el-table-column>
@@ -93,7 +97,7 @@
                             </el-table-column>
                         </el-table>
                     </el-row>
-                </el-main> 
+                </el-main>
             </el-container>
         </div>
@@ -106,7 +110,7 @@
     </div>
 </template>
 <script>
-import { formatDate } from "utils";
+import { formatDate, formatTimeWithHours } from "utils";
 import { downloadFile, tablePrint } from "@/utils";
 import RadarChart from "@/components/charts/radarChart";
 export default {
@@ -168,6 +172,9 @@ export default {
     async created() {
     },
     methods: {
+        _formatTimeWithHours(seconds) {
+            return formatTimeWithHours(seconds);
+        },
         _print() {
             tablePrint({
                 id: "print-content",
@@ -177,7 +184,7 @@ export default {
                 fixedColumn: 2,
                 diffNumber: 2,
                 diffStNumber: 15
-            }); 
+            });
         },
         _checkAll() {
             // this.multipleSelection = [...] 
@@ -291,7 +298,7 @@ export default {
                 max = score > max ? score : max;
                 return item.subjectName;
             });
-            max += 10; 
+            max += 10;
             this.radarChart = {
                 indicator: [
                     {
@@ -338,7 +345,7 @@ export default {
             ];
             this.radarChart.title = obj.studentName + "-多科阶段作答表现图";
-            
+
             this.redarVisible = true;
         },
         async _loadData() {
@@ -7,9 +7,13 @@
             <el-table-column prop="examPaperScore" label="卷面分" width="130" />
             <el-table-column prop="classCorrectRate" label="测验人数/班级人数" width="180">
                 <template slot-scope="scoped">{{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}</template>
+            </el-table-column>>z
+            <el-table-column  label="测验时长" width="130" >
+                <template slot-scope="scoped"> 
+                    {{ _formatTimeWithHours(scoped.row.duration) }}
+                </template>
             </el-table-column>
-            <el-table-column prop="questionNum" label="测验时长" width="130" />
-            <el-table-column prop="createdTime" label="测验开始时间" width="210" />
+            <el-table-column prop="examStartTime" label="测验开始时间" width="210" />
             <el-table-column label="操作" width="240">
                 <template slot-scope="scoped">
                     <el-button style="margin-right: 10px;" v-if="scoped.row.answerNum != 0 ||
@@ -50,6 +54,7 @@
 </template>
 <script>
 import ScoreSet from "../../test/components/scoreSet.vue";
+import { formatTimeWithHours } from "utils";
 export default {
     name: "testListReport",
     props: {
@@ -89,6 +94,9 @@ export default {
     },
     methods: {
+        _formatTimeWithHours(seconds){
+            return formatTimeWithHours(seconds);
+        },
         _linkToDetail(dataRow) {
             this.$router.push({
                 path: "/testReportDetail",
@@ -26,8 +26,8 @@ module.exports = {
         // target:"http://ezquiz.sunvotecloud.cn",
         // target:"http://192.168.1.151:8089",
         // target: "https://ezquiz.sunvotecloud.cn",
-        target: "http://121.40.127.171:8090",
-        // target:"http://127.0.0.1:8089",
+        // target: "http://121.40.127.171:8090",
+        target:"http://127.0.0.1:8089",
         changeOrigin: true,
         ws: true,
       },