Commit b8a303e3 authored by wuhao's avatar wuhao 🎯

build passed

parent 9ae4cd62
Pipeline #3378 passed with stages
in 2 minutes and 59 seconds
......@@ -108,4 +108,5 @@ export default defineConfig({
requestRecord: {},
define: env[REACT_APP_ENV as keyof typeof env],
title: '精密测量虚拟仿真实训平台',
esbuildMinifyIIFE: true
});
......@@ -4,7 +4,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
import font from './font/iconfont'
const IconFont = createFromIconfontCN({
scriptUrl: '//at.alicdn.com/t/c/font_4010447_t59htoi0vc8.js',
scriptUrl: '//at.alicdn.com/t/c/font_4010447_d0ualj4tmq6.js',
});
export default IconFont;
......@@ -16,11 +16,9 @@ import IconFont from "@/components/IconFont";
import Label from "@/components/label";
import difftime from "@/utils/difftime";
import AccessTimeFilledIcon from "@mui/icons-material/AccessTimeFilled";
import CheckIcon from "@mui/icons-material/Check";
import { history } from "@umijs/max";
import dayjs from "dayjs";
import { useState } from "react";
import { history } from "@umijs/max";
// ----------------------------------------------------------------------
......@@ -151,7 +149,7 @@ export default function ShopProductCard({
paddingLeft: 1,
}}
>
日期: {startTime ?? "-"}{deadline}
{startTime ?? "-"}~{deadline}
</Typography>
</Stack>
</Stack>
......@@ -188,36 +186,42 @@ export default function ShopProductCard({
</Stack>
</Stack>
<Stack direction={"row"} spacing={0}>
<Tooltip placement="bottom-start" title={"发布"}>
<Stack
direction={"row"}
spacing={0}
flex={1}
justifyContent={"flex-end"}
>
<Tooltip placement="bottom-start" title={"开始学习"}>
<IconButton
onClick={() => {
history.push("/work/domybustrain/" + product.id);
}}
>
<IconFont
type="icon-fabu"
style={{ fontSize: 20, color: colors.blue[600] }}
type="icon-w_xuexi"
style={{ fontSize: 26, color: colors.blue[600] }}
></IconFont>
</IconButton>
</Tooltip>
<Tooltip
placement="bottom-start"
title={"成绩"}
>
<Tooltip placement="bottom-start" title={"成绩"}>
<IconButton
disabled={shut === "1"}
sx={{ flexShrink: 0 }}
onClick={() => {
history.push("/work/myrebustrain/" + product.id);
}}
>
<CheckIcon
style={{
fontSize: 20,
color: shut === "1" ? colors.grey[500] : colors.green[500],
}}
></CheckIcon>
<div style={{ width: 26, height: 26 }} className="center">
<IconFont
type="icon-chengjidan-copy"
style={{
fontSize: 20,
color: "#000",
}}
></IconFont>
</div>
</IconButton>
</Tooltip>
</Stack>
......
......@@ -270,7 +270,7 @@ export default function ShopProductCard({
paddingLeft: 1,
}}
>
日期: {startTime ?? "-"}{deadline}
{startTime ?? "-"}~{deadline}
</Typography>
</Stack>
</Stack>
......
import AutoTable from "@/components/AutoTable";
import { useParams } from "@umijs/max";
import PremButton from "@/components/PremButton";
import { Box, Container, Stack, Typography } from "@mui/material";
import { useParams } from "@umijs/max";
import { useMemo, useRef } from "react";
import "./index.less";
......@@ -47,8 +48,24 @@ function Record() {
return (
<Container maxWidth={false}>
<Stack direction={"row"} mb={2}>
<Stack
direction={"row"}
justifyContent={"space-between"}
alignItems={"center"}
mb={2}
>
<Typography variant="h5">成绩单</Typography>
<PremButton
btn={{
variant: "outlined",
onClick: (e) => {
e.stopPropagation();
history.back();
},
}}
>
返回
</PremButton>
</Stack>
<Box boxShadow={"0 0 18px #f0f0f0"} borderRadius={2}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment