Merge branch 'feature/yuananting/20210327/test-paper' of…

Merge branch 'feature/yuananting/20210327/test-paper' of https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210327/test-paper

Merge branch 'feature/yuananting/20210327/test-paper' of…
Merge branch 'feature/yuananting/20210327/test-paper' of https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210327/test-paper
1e9b34d8 · yuananting · 4a65aacb · 1f9a932d · 1e9b34d8 · 1e9b34d8
Commit 1e9b34d8 authored Apr 10, 2021 by yuananting
6 changed files
--- a/src/core/function.js
+++ b/src/core/function.js
@@ -10,7 +10,7 @@ import React from 'react'
 // 时间控件优化方法
 window.setCorrectDate = date => {
  let _date = date;
  if ((date - (+new Date()) < 30 * 60 * 1000)) {
    const currentMinute = new Date().getMinutes();
@@ -33,7 +33,7 @@ if (!Number.prototype.toFixedCorrect) {
 window.processMonthCourseDate = courseList => {
  if (Array.isArray(courseList) && courseList.length > 0) {
    // 因为所购买的时间不可能有重叠，先排序
-    courseList = courseList.sort(function(now, next) {
+    courseList = courseList.sort(function (now, next) {
      return parseInt(now.startDate) - parseInt(next.startDate)
    })
@@ -41,7 +41,7 @@ window.processMonthCourseDate = courseList => {
    let sumDays = 0,
      finishDays = 0,
      givingDays = 0
-    courseList.forEach(function(item) {
+    courseList.forEach(function (item) {
      if (item.endDate != item.purchaseEndDate) {
        givingDays += moment(parseInt(item.endDate)).diff(
          parseInt(item.purchaseEndDate),
@@ -73,8 +73,8 @@ window.processMonthCourseDate = courseList => {
        .valueOf())
      const endDate = (course.endDate = course.endDate
        ? moment(parseInt(course.endDate))
-            .endOf('day')
+          .endOf('day')
-            .valueOf()
+          .valueOf()
        : undefined)
      if (i == 0 && Date.now() < startDate) {
@@ -327,7 +327,7 @@ window.getRequest = () => {
  return theRequest
 }
-window.getParameterByName = function(name) {
+window.getParameterByName = function (name) {
  name = name.replace(/[\\[]/, '\\[').replace(/[\]]/, '\\]')
  const regex = new RegExp('[\\?&]' + name + '=([^&#]*)')
  const results = regex.exec(window.location.href)
@@ -344,7 +344,7 @@ window.getUrlParam = function () {
  return isNaN(param) ? '' : str;
 }
-window.getStringParamete = function(string, name) {
+window.getStringParamete = function (string, name) {
  const theRequest = {}
  if (string.indexOf('?') != -1) {
    const str = string.substr(1)
@@ -379,8 +379,8 @@ window.timeFormat = (time, defaultValue) => {
  const stringTime = time
    ? (time / CONFIG.timeUnit).toFixed(2)
    : defaultValue == undefined
-    ? 0
+      ? 0
-    : defaultValue
+      : defaultValue
  return Number(stringTime)
 }
@@ -410,8 +410,8 @@ window.timeFormatSixty = (time, defaultValue) => {
  const stringTime = time
    ? (time / 60).toFixed(2)
    : defaultValue == undefined
-    ? 0
+      ? 0
-    : defaultValue
+      : defaultValue
  return Number(stringTime)
 }
@@ -465,8 +465,8 @@ window.moneyFormat = (money, defaultValue) => {
  const stringMoney = money
    ? (Math.round(money) / CONFIG.moneyUnit).toFixed(2)
    : defaultValue == undefined
-    ? 0
+      ? 0
-    : defaultValue
+      : defaultValue
  return Number(stringMoney)
 }
@@ -487,9 +487,9 @@ window.moneyFormatThousands = (number, places, symbol, thousand, decimal) => {
    i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand) +
    (places
      ? decimal +
-        Math.abs(number - i)
+      Math.abs(number - i)
-          .toFixed(places)
+        .toFixed(places)
-          .slice(2)
+        .slice(2)
      : '')
  )
 }
@@ -530,6 +530,14 @@ window.getMonthLastDate = timestamp => {
  return time
 }
+window.formatHourTime = (timestr) => {
+  const h = Math.floor(timestr / 1000 / 60 / 60);
+  const m = Math.floor((timestr - h * 1000 * 60 * 60) / 1000 / 60);
+  const s = Math.floor((timestr - h * 1000 * 60 * 60 - m * 1000 * 60) / 1000);
+  return `${h > 9 ? h : ('0' + h)}:${m > 9 ? m : ('0' + m)}:${s > 9 ? s : ('0' + s)}`
+}
 /*
  获取日期相差多少天
 * */
@@ -666,7 +674,7 @@ window.getLeftExpiredDay = (expiredDate, minWarningDays, onlyShowTimeover) => {
 }
 // 处理月份
-window.handleMonth = (num) => {  
+window.handleMonth = (num) => {
  var result = ''
  if (num < 12) {
    result = `${num}个月`
@@ -832,7 +840,7 @@ window.getNumberInput = (str, ret = 1) => {
  return str * ret
 }
-window.removeNull = function(param) {
+window.removeNull = function (param) {
  if (!param) {
    return
  }
@@ -853,7 +861,7 @@ window.removeNull = function(param) {
  }
 }
-window.convertBase64ToBlob = function(base64) {
+window.convertBase64ToBlob = function (base64) {
  var base64Arr = base64.split(',')
  var imgtype = ''
  var base64String = ''
@@ -881,20 +889,20 @@ window.convertBase64ToBlob = function(base64) {
  return new Blob([bytesCode], { type: imgtype })
 }
-window.formatMsgCreateTime = function(createTime) {
+window.formatMsgCreateTime = function (createTime) {
  const newTime =
    moment().year() > moment(parseInt(createTime)).year()
      ? formatDate('YYYY-MM-DD H:i', parseInt(createTime))
      : moment().dayOfYear() - 1 > moment(parseInt(createTime)).dayOfYear()
-      ? formatDate('MM-DD H:i', parseInt(createTime))
+        ? formatDate('MM-DD H:i', parseInt(createTime))
-      : moment().dayOfYear() - 1 == moment(parseInt(createTime)).dayOfYear()
+        : moment().dayOfYear() - 1 == moment(parseInt(createTime)).dayOfYear()
-      ? '昨天 ' + formatDate('H:i', parseInt(createTime))
+          ? '昨天 ' + formatDate('H:i', parseInt(createTime))
-      : Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) > 60
+          : Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) > 60
-      ? '今天' + formatDate('H:i', parseInt(createTime))
+            ? '今天' + formatDate('H:i', parseInt(createTime))
-      : Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) > 1
+            : Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) > 1
-      ? Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) +
+              ? Math.floor((moment().valueOf() - parseInt(createTime)) / 1000 / 60) +
-        '分钟前'
+              '分钟前'
-      : '刚刚'
+              : '刚刚'
  return newTime
 }
@@ -1070,7 +1078,7 @@ window.getMoneyFormatYuan = (price) => {
 // 处理定价标准 仅订单详情，打印收据预览可用
 window.formatPriceStandard = (info) => {
-  let { quantityUnit, specName, commoditySpecs, purchaseItemType, unitPriceAfterDiscount,specCurrentPrice } = info
+  let { quantityUnit, specName, commoditySpecs, purchaseItemType, unitPriceAfterDiscount, specCurrentPrice } = info
  let newCommoditySpecs = JSON.parse(commoditySpecs || '[]') || {}
  let { containQuantity, unitPrice, measurementUnits } = newCommoditySpecs
  let content = ''
@@ -1121,7 +1129,7 @@ window.renderCourseName = (list) => {
        }
      </div>
    )
    return length > 1 ?
      <span>{majorCourse.name}
        <Popover placement="bottomLeft" content={content} arrowPointAtCenter>
@@ -1130,7 +1138,7 @@ window.renderCourseName = (list) => {
      </span> :
      <span>{majorCourse.name}</span>
  }
  return ''
 }
@@ -1145,13 +1153,13 @@ window.convertBase64UrlToBlob = (urlData) => {
 }
 // 小麦秀 new 标签显示
-window.XMShowClassName = (date,itemName) => { 
+window.XMShowClassName = (date, itemName) => {
  // 超过时间不显示
-  if (new Date().getTime() > date ) { 
+  if (new Date().getTime() > date) {
    return '';
  }
  // 用户点击相应区域后不显示
-  if (localStorage.getItem(itemName) === 'true') { 
+  if (localStorage.getItem(itemName) === 'true') {
    return '';
  }
  return 'new-icon'

--- a/src/modules/teach-tool/examination-manager/AddExam.tsx
+++ b/src/modules/teach-tool/examination-manager/AddExam.tsx
@@ -82,7 +82,7 @@ function AddExam(props: any) {
            setPassRate(result.passRate * 100)
            setNeedPhone(result.needPhone)
            setExamDesc(result.examDesc)
-            setExamDuration(result.examDuration)
+            setExamDuration(result.examDuration / 60 / 1000 as any)
            setAnswerAnalysis(result.answerAnalysis)
            setNeedOptionDisorder(result.needOptionDisorder)
            setPassScore(result.passScore)
@@ -113,7 +113,7 @@ function AddExam(props: any) {
            resultContent,
            answerAnalysis,
            resultShow,
-            examDuration,
+            examDuration: (examDuration || 0) * 60 * 1000,
            passScore,
            tenantId: User.getStoreId(),
            userId: User.getStoreUserId(),

--- a/src/modules/teach-tool/examination-manager/ExamData.tsx
+++ b/src/modules/teach-tool/examination-manager/ExamData.tsx
@@ -36,7 +36,7 @@ function ExamData(props: any) {
    };
    const userTypeEnum = {
-        WE_COM: '企业微信',
+        WORK_WE_CHAT: '企业微信',
        WE_CHAT: '微信'
    }
@@ -176,7 +176,8 @@ function ExamData(props: any) {
        console.log(filters.questionType)
        if (filters.questionType) {
            console.log(233232)
-            _query.questionType = filters.questionType
+            _query.questionType = filters.questionType;
+            _query.currrent =1;
        } else {
            delete _query.questionType
        }

--- a/src/modules/teach-tool/examination-manager/Index.tsx
+++ b/src/modules/teach-tool/examination-manager/Index.tsx
@@ -87,7 +87,7 @@ function ExaminationManager(props: any) {
        {
            title: "考试时长",
            dataIndex: "examDuration",
-            render: (text: any) => <span>{text || 0}分钟</span>,
+            render: (text: any) => <span>{(text || 0)/60/1000}分钟</span>,
        },
        {
            title: "及格分/总分",

--- a/src/modules/teach-tool/examination-manager/UserData.tsx
+++ b/src/modules/teach-tool/examination-manager/UserData.tsx
@@ -2,12 +2,12 @@ import React, { useState, useRef, useEffect } from 'react'
 import Service from "@/common/js/service";
 import { PageControl } from "@/components";
 import { Input, Select, Tooltip, Table, Button } from 'antd';
-import dealTimeDuration from "../utils/dealTimeDuration";
 import User from "@/common/js/user";
 import moment from 'moment';
 import './userData.less'
 const { Search } = Input;
 const { Option } = Select;
+declare var window: any;
 interface sortType {
    type: "ascend" | "descend" | null | undefined
@@ -30,7 +30,7 @@ function DataAnalysic(props: any) {
    const [order, setOrder] = useState(sortStatus.type);
    const userTypeEnum = {
-        WE_COM: '企业微信',
+        WORK_WE_CHAT: '企业微信',
        WE_CHAT: '微信'
    }
@@ -64,8 +64,8 @@ function DataAnalysic(props: any) {
            descend: 'ACCURACY_DESC'
        },
        userDuration: {
-            ascend: 'PASS_CNT_ASC',
+            ascend: 'USER_DURATION_ASC',
-            descend: 'CREATED_DESC'
+            descend: 'USER_DURATION_DESC'
        },
    }
@@ -117,7 +117,7 @@ function DataAnalysic(props: any) {
        {
            title: "用户",
            dataIndex: "userName",
-            render: (text: any, record: any) => <span>{text}<span style={{ color: record.userSource === 'WE_COM' ? 'rgba(255, 157, 20, 1)' : 'rgba(29, 204, 101, 1)' }} >@{(userTypeEnum as any)[record.userSource]}</span></span>,
+            render: (text: any, record: any) => <span>{text}<span style={{ color: record.userSource === 'WORK_WE_CHAT' ? 'rgba(255, 157, 20, 1)' : 'rgba(29, 204, 101, 1)' }} >@{(userTypeEnum as any)[record.userSource]}</span></span>,
        },
        {
            title: "手机号",
@@ -148,7 +148,7 @@ function DataAnalysic(props: any) {
            dataIndex: "userDuration",
            sorter: true,
            sortOrder: field === "userDuration" ? order : sortStatus.type,
-            render: (text: any) => <span>{dealTimeDuration(Number(text))}</span>,
+            render: (text: any) => <span>{window.formatHourTime(text)}  </span>,
        },
@@ -211,7 +211,7 @@ function DataAnalysic(props: any) {
                <div className="subTitle">平均分</div>
            </div>
            <div className="item">
-                <div className="num">{dealTimeDuration(useData.averageDuration || 0)}</div>
+                <div className="num">  {window.formatHourTime(useData.averageDuration || 0)} </div>
                <div className="percent"></div>
                <div className="subTitle">平均用时</div>
            </div>

--- a/src/modules/teach-tool/utils/dealTimeDuration.js
+++ b/src/modules/teach-tool/utils/dealTimeDuration.js
-/*
- * @Author: 吴文洁
- * @Date: 2020-08-20 14:51:18
- * @LastEditors: yuananting
- * @LastEditTime: 2021-04-10 15:29:16
- * @Description: 
- * @Copyright: 杭州杰竞科技有限公司 版权所有
- */
-const dealTimeDuration = (msTime) => {
-    let time = msTime / 1000;
-    let hour =
-      Math.floor(time / 60 / 60) % 24 > 9
-        ? Math.floor(time / 60 / 60) % 24
-        : "0" + (Math.floor(time / 60 / 60) % 24);
-    let minute =
-      Math.floor(time / 60) % 60 > 9
-        ? Math.floor(time / 60) % 60
-        : "0" + (Math.floor(time / 60) % 60);
-    let second =
-      time % 60 > 9 ? Math.round(time % 60) : "0" + Math.round(time % 60);
-    return `${hour}:${minute}:${second}`;
-  }
-export default dealTimeDuration;
\ No newline at end of file