laosd

config/routes.ts

@@ -109,11 +109,18 @@ export default [
             path: "/work/dobustrain/:id",
             component: "./dobustrain",
           },
+          {
+            name: "成绩管理",
+            path: "/work/rebustrain/:id",
+            component: "./rebustrain",
+          },
           {
             name: "我的实训",
             path: "/work/mybustrain",
             component: "./mybustrain",
           },
+
+
         ],
       },
       {

package.json

@@ -65,6 +65,7 @@
     "@mui/material": "^5.11.16",
     "@mui/styled-engine-sc": "^5.11.11",
     "@reduxjs/toolkit": "^1.9.3",
+    "@sentry/react": "^7.52.1",
     "@umijs/route-utils": "^2.1.3",
     "ahooks": "^3.7.6",
     "antd": "^5.4.2",
@@ -124,7 +125,7 @@
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
     "prettier": "^2.7.1",
-    "react-error-overlay": "^6.0.11",
+    "react-error-overlay": "^6.0.9",
     "swagger-ui-dist": "^4.14.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4",

src/components/AutoTable/index.jsx

@@ -102,14 +102,14 @@ const AutoTable = (props) => {
                 fieldProps: {
                   ...it?.fieldProps,
                   options: [...it.options],
-                  dropdownMatchSelectWidth: 200,
+                  popupMatchSelectWidth: 200,
                 },
               };
             } else if (it.options) {
               options = {
                 fieldProps: {
                   ...it?.fieldProps,
-                  dropdownMatchSelectWidth: 200,
+                  popupMatchSelectWidth: 200,
                   showSearch: true,
                 },
                 params: paramconfig[curkey],

src/components/DraggableDialog/index.jsx

@@ -74,6 +74,7 @@ export default function DraggableDialog({
               loading={loading}
               loadingPosition="start"
               startIcon={<SendOutlined />}
+              disabled={dialogprops?.disabled}
               onClick={() => {
                 formRef?.current?.submit();
               }}

src/components/InitForm/EditTable/index.jsx

@@ -117,7 +117,7 @@ const EditTable = (props) => {
       recordCreatorProps={false}
       size={size}
       onSubmit={(params) => {
-        console.log(params, 'onSubmit');
+       // console.log(params, 'onSubmit');
       }}
       onSizeChange={(size) => {
         localStorage.setItem('size', size); //设置全局表格规格缓存

src/components/InitForm/FormItems.jsx

@@ -456,7 +456,7 @@ function NolinkSelect({ item, colProps }) {
   return (
     <>
       <ProFormSelect
-        fieldProps={{ ...item.fieldProps, dropdownMatchSelectWidth: 200 }}
+        fieldProps={{ ...item.fieldProps, popupMatchSelectWidth: 200 }}
         formItemProps={item.formItemProps}
         name={item.key ?? item.dataIndex}
         colProps={item.colProps ?? colProps}
@@ -1333,12 +1333,9 @@ function TableSelect({ item, value, onChange, params = {} }) {
   const [activetab, setactivetab] = useState(1);
   const actionRef = useRef();
 
-  const menu = (selectedRows) => (
-    <Menu
-      style={{ width: 160 }}
-      items={
-        selectedRows.length > 0
-          ? selectedRows.map((it) => ({
+  const items =
+    value?.length > 0
+      ? value?.map?.((it) => ({
           key: it[rowKey],
           label: (
             <div
@@ -1361,16 +1358,16 @@ function TableSelect({ item, value, onChange, params = {} }) {
             >
               <span
                 style={{
-                      color: chooses.includes(it[rowKey])
-                        ? "#1890ff"
-                        : "#333333",
+                  color: chooses.includes(it[rowKey]) ? "#1890ff" : "#333333",
                   transition: "all 0.4s",
                   userSelect: "none",
+                  paddingRight:12
                 }}
               >
-                    {it[item.rowName]}
+                {it[item.rowName??"name"]}
               </span>
               <CloseOutlined
+                style={{color:"red"}}
                 onClick={(e) => {
                   e.stopPropagation();
                   let newvalue = value.filter(
@@ -1394,10 +1391,7 @@ function TableSelect({ item, value, onChange, params = {} }) {
             key: -1,
             label: "请先选择",
           },
-            ]
-      }
-    />
-  );
+        ];
 
   useDidUpdateEffect(() => {
     onChange(null);
@@ -1508,7 +1502,11 @@ function TableSelect({ item, value, onChange, params = {} }) {
       <Tabs
         tabBarExtraContent={
           <div className="center">
-            <Dropdown menu={menu(value ?? [])}>
+            <Dropdown
+              menu={{
+                items,
+              }}
+            >
               <a>
                 已选择{value?.length ?? 0}项 <DownOutlined />
               </a>

src/components/InitForm/index.jsx

@@ -86,7 +86,7 @@ let FormRender = memo(({ fields = [], colProps, proformRef }) => {
 function InitForm({
   formRef,
   onFinish = (vals, extra) => {
-    console.log(vals, extra);
+    //console.log(vals, extra);
   },
   formKey,
   params = {},
@@ -97,8 +97,9 @@ function InitForm({
   fields,
   colProps = { xs: 24, sm: 24, md: 12, lg: 12, xl: 12, xxl: 12 },
   onValuesChange = (changedValues, allValues) => {
-    console.log(changedValues, allValues);
+    //console.log(changedValues, allValues);
   },
+  disabled
 }) {
   let proformRef = useRef();
   proformRef = formRef ?? proformRef;
@@ -115,11 +116,11 @@ function InitForm({
           ? submitter
           : {
               render: (props, doms) => {
-                console.log("submitterProps", props);
                 return [
                   <Button
                     type="reset"
                     key="rest"
+                    disabled={disabled}
                     onClick={() => props.form?.resetFields()}
                   >
                     重置
@@ -128,6 +129,7 @@ function InitForm({
                     type="submit"
                     key="submit"
                     variant="contained"
+                    disabled={disabled}
                     onClick={(e) => {
                       e.preventDefault();
                       return props.form?.submit?.();

src/components/ProductCard/sxcard.jsx

@@ -49,7 +49,7 @@ export default function ShopProductCard({
   copy,
   publish,
   authorized,
-  tauthorized
+  tauthorized,
 }) {
   const {
     trainName,
@@ -174,9 +174,7 @@ export default function ShopProductCard({
             <Tooltip placement="bottom-start" title={"协作教师"}>
               <IconButton
                 onClick={() => {
-                  if (ifs) {
-                    tauthorized(product);
-                  }
+                  tauthorized(product, ifs);
                 }}
               >
                 <GroupIcon
@@ -191,7 +189,7 @@ export default function ShopProductCard({
             <Tooltip placement="bottom-start" title={"成绩管理"}>
               <IconButton
                 onClick={() => {
-                  publish(product, { type: 3 });
+                  history.push("/work/rebustrain/" + product.id);
                 }}
               >
                 <IconFont
@@ -318,9 +316,7 @@ export default function ShopProductCard({
                 alignItems={"center"}
                 sx={{ cursor: "pointer" }}
                 onClick={() => {
-                  if (ifs) {
-                    authorized(product);
-                  }
+                  authorized(product, ifs);
                 }}
               >
                 <IconFont

src/components/TreeRender/sxtree.jsx

@@ -51,6 +51,7 @@ function TreeRender({
   maxWidth,
   style,
   submitKey,
+  disabled,
 }) {
   const [search, setsearch] = useState("");
   const [savetitle, setsavetitle] = useState(null);
@@ -178,9 +179,11 @@ function TreeRender({
           <span style={{ marginRight: 6 }}>{title}</span>
           <div className="center" style={{ gap: 8 }}>
             {item.key && item.key != "00000000" && (
-              <Tooltip
-                title="编辑"
+              <Tooltip title="编辑">
+                <div
+                  className="bgs"
                   onClick={(e) => {
+                    if (disabled) return;
                     e.stopPropagation();
                     setsavetitle(null);
                     if (true) {
@@ -196,17 +199,21 @@ function TreeRender({
                     }
                   }}
                 >
-                <div className="bgs">
-                  <BorderColorIcon style={{ color: "#1890ff", fontSize: 14 }} />
+                  <BorderColorIcon
+                    style={{
+                      color: disabled ? "grey" : "#1890ff",
+                      fontSize: 14,
+                    }}
+                  />
                 </div>
               </Tooltip>
             )}
             {item.key && item.key != "00000000" && item.children && (
               <Tooltip title="新增">
-                <div className="bgs">
-                  <AddIcon
-                    disabled={false}
+                <div
+                  className="bgs"
                   onClick={(e) => {
+                    if (disabled) return;
                     e.stopPropagation();
                     setsavetitle(null);
                     if (true) {
@@ -221,8 +228,11 @@ function TreeRender({
                       });
                     }
                   }}
+                >
+                  <AddIcon
+                    disabled={false}
                     style={{
-                      color: `${true ? "green" : ""}`,
+                      color: disabled ? "grey" : "green",
                       fontSize: 20,
                     }}
                   />
@@ -236,7 +246,8 @@ function TreeRender({
                 title="是否删除该节点？"
                 okText="删除"
                 cancelText="取消"
-                onConfirm={() => {
+                disabled={disabled}
+                onConfirm={(e) => {
                   doFetch({ url: deleteurl, params: { id: item.key } }).then(
                     (res) => {
                       if (res.code == "0000") {
@@ -250,7 +261,7 @@ function TreeRender({
                 <Tooltip title="删除" placement="bottom">
                   <div className="bgs">
                     <HorizontalRuleIcon
-                      style={{ color: "red", fontSize: 16 }}
+                      style={{ color: disabled ? "grey" : "red", fontSize: 16 }}
                     />
                   </div>
                 </Tooltip>
@@ -334,11 +345,17 @@ function TreeRender({
       >
         <Typography variant="h6">课程目录</Typography>
         <IconButton
+          disabled={disabled}
           onClick={() => {
             setDrawer({ open: true });
           }}
         >
-          <AddIcon style={{ fontSize: 20, color: colors.blue[600] }}></AddIcon>
+          <AddIcon
+            style={{
+              fontSize: 20,
+              color: disabled ? colors.grey[600] : colors.blue[600],
+            }}
+          ></AddIcon>
         </IconButton>
 
         <Modal
@@ -502,7 +519,6 @@ function TreeRender({
           showIcon
           showLine
           onSelect={(selectedKeys, e) => {
-            // //console.log(selectedKeys);
             onselected?.(selectedKeys, e, alldata);
           }}
           autoExpandParent={autoExpandParent}

src/global.less

@@ -631,3 +631,21 @@ h4 {
     }
   }
 }
+.lightblue {
+  > td:first-child {
+    position: relative;
+
+    &::before {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      width: 3px;
+      height: 48%;
+      margin: auto;
+      background-color: #ff4800;
+      border-radius: 0 3px 3px 0;
+      content: '';
+    }
+  }
+}

src/layouts/dashboard/header/AccountPopover.jsx

@@ -119,7 +119,6 @@ export default function AccountPopover() {
     setOpen(null);
     if (path === "/user/login") {
       doFetch({ url: "/system/logout", params: {} }).then((res) => {
-        console.log(res);
         if (res?.code === "0000") {
           path && navigate(path);
         }

src/layouts/dashboard/header/Searchbar.jsx

@@ -91,6 +91,7 @@ export default function Searchbar() {
 
   let { data, loading } = useRequest(
     async () => {
+      if(!open) return;
       let res = await doFetch({
         url: "/system/searchAll",
         params: { ...search },

src/layouts/dashboard/header/UserPage.jsx

@@ -13,9 +13,6 @@ export default function UserPage() {
     setValue(newValue);
   };
   const location = useLocation();
-  console.log("====================================");
-  console.log(location.pathname);
-  console.log("====================================");
 
   const data = React.useMemo(() => {
     const currouteconfig = navConfig?.filter((it, i) => {

src/layouts/index.jsx

@@ -3,7 +3,8 @@ import MuiAlert from "@mui/material/Alert";
 import CssBaseline from "@mui/material/CssBaseline";
 import Slide from "@mui/material/Slide";
 import Snackbar from "@mui/material/Snackbar";
-import { Outlet,useModel } from "@umijs/max";
+import * as Sentry from "@sentry/react";
+import { Outlet, useModel } from "@umijs/max";
 import React from "react";
 import ThemeProvider from "./theme";
 
@@ -33,6 +34,24 @@ import ThemeProvider from "./theme";
 </div>  */
 }
 
+Sentry.init({
+  dsn: "http://38a2decfe9214e639164d2ca6ef92a67@iot-dev.nangaoyun.com:9000/9",
+  integrations: [new Sentry.BrowserTracing(), new Sentry.Replay()],
+  enabled: process.env.NODE_ENV !== "development",
+  // Set tracesSampleRate to 1.0 to capture 100%
+  // of transactions for performance monitoring.
+  // We recommend adjusting this value in production
+  tracesSampleRate: 1.0,
+  // Capture Replay for 10% of all sessions,
+  // plus for 100% of sessions with an error
+  replaysSessionSampleRate: 0.1,
+  replaysOnErrorSampleRate: 1.0,
+});
+
+Sentry.configureScope(function (scope) {
+  scope.setLevel("error");
+});
+
 const Alert = React.forwardRef(function Alert(props, ref) {
   return <MuiAlert elevation={6} ref={ref} variant="filled" {...props} />;
 });
@@ -66,7 +85,7 @@ function App() {
           severity={message?.type}
           onClose={handleClose}
           {...message.alert}
-          sx={{color:"#f9f9f9"}}
+          sx={{ color: "#f9f9f9" }}
         >
           {message?.title ? <AlertTitle>{message?.title}</AlertTitle> : null}
           {message?.content}

src/pages/bustrain/index.jsx

@@ -62,7 +62,7 @@ function Lessons() {
     });
   };
 
-  const authorized = (row) => {
+  const authorized = (row, ifs) => {
     doFetch({
       url: "/trainStudent/queryRelationStudent",
       params: { trainId: row?.id },
@@ -74,12 +74,13 @@ function Lessons() {
           defaultFormValue: { ...row },
           studentIdList: res?.data?.dataList,
           title: "授权",
+          disabled: !ifs,
         });
       }
     });
   };
 
-  const tauthorized = (row) => {
+  const tauthorized = (row, ifs) => {
     doFetch({
       url: "/busTrainTeacher/queryRelationTeacher",
       params: { trainId: row?.id },
@@ -91,6 +92,7 @@ function Lessons() {
           defaultFormValue: { ...row },
           teacherIdList: res?.data?.dataList,
           title: "协作教师",
+          disabled: !ifs,
         });
       }
     });
@@ -163,7 +165,6 @@ function Lessons() {
             fields={columns}
             defaultFormValue={dialogprops?.defaultFormValue}
             onValuesChange={async (changedValues, allValues, formRef) => {
-              console.log(changedValues);
               if (Object.keys(changedValues)[0] === "courseId") {
                 let id = Object.values(changedValues)?.[0] ?? null;
                 let res = await doFetch({
@@ -171,15 +172,8 @@ function Lessons() {
                   params: { id },
                 });
                 let pic = res?.data?.data?.pic ?? [];
-                console.log(pic);
                 formRef?.current?.setFieldsValue({
-                  pic: [
-                    {
-                      uid: "1655501390426017792",
-                      url: "https://ng-website.oss-cn-hangzhou.aliyuncs.com/2023/05/08/1655501389482299392Bl6w2X.jpg",
-                      name: "a1.jpg",
-                    },
-                  ],
+                  pic,
                 });
               }
             }}
@@ -210,7 +204,7 @@ function Lessons() {
             fields={[
               {
                 rowKey: "id",
-                rowName: "id",
+                rowName: "name",
                 valueType: "FormSelectList",
                 dataIndex: "teacherIdList",
                 colProps: {
@@ -269,7 +263,7 @@ function Lessons() {
             fields={[
               {
                 rowKey: "id",
-                rowName: "id",
+                rowName: "name",
                 valueType: "FormSelectList",
                 dataIndex: "studentIdList",
                 colProps: {
@@ -372,7 +366,6 @@ function Lessons() {
                 } else {
                   news = [...news, val];
                 }
-                console.log(news);
                 return {
                   ...s,
                   typeList: news,

src/pages/dobustrain/index.jsx

@@ -50,6 +50,11 @@ function Dolessons() {
     );
   }, []);
 
+  const ifs = useMemo(() => {
+    let { type } = lessonDetail ?? {};
+    return !(type === 1 || type === 3);
+  }, [lessonDetail]);
+
   const checkCourse = (val) => {
     if (val.length) {
       doFetch({
@@ -70,6 +75,7 @@ function Dolessons() {
       <PremButton
         btn={{
           size: "small",
+          disabled: ifs,
           variant: "text",
           onClick: () => {
             setDrawer((v) => ({
@@ -89,6 +95,7 @@ function Dolessons() {
     return (
       <PremButton
         pop={{
+          disabled: ifs,
           title: "是否删除该实验?",
           okText: "确认",
           cancelText: "取消",
@@ -100,6 +107,7 @@ function Dolessons() {
           },
         }}
         btn={{
+          disabled: ifs,
           size: "small",
           color: "error",
         }}
@@ -112,6 +120,7 @@ function Dolessons() {
     return (
       <PremButton
         pop={{
+          disabled: ifs,
           title: "是否删除该实验?",
           okText: "确认",
           cancelText: "取消",
@@ -125,6 +134,7 @@ function Dolessons() {
         btn={{
           size: "small",
           color: "error",
+          disabled: ifs,
         }}
       >
         删除
@@ -233,6 +243,7 @@ function Dolessons() {
                 saveurl="/busTrainCatalogue/saveOrUpdateCatalogue"
                 deleteurl="/busTrainCatalogue/deleteCatalogue"
                 submitKey="catalogue"
+                disabled={ifs}
                 params={{
                   trainId: params?.id,
                 }}
@@ -270,6 +281,7 @@ function Dolessons() {
                     }
                   });
                 }}
+                disabled={ifs}
               />
             </Box>
           </Grid>
@@ -534,6 +546,7 @@ function Dolessons() {
           </PremButton>
           <PremButton
             btn={{
+              disabled:ifs,
               variant: "contained",
               onClick: addHandel,
             }}

src/pages/lessons/index.jsx

@@ -178,7 +178,7 @@ function Lessons() {
             fields={[
               {
                 rowKey: "id",
-                rowName: "id",
+                rowName: "name",
                 valueType: "FormSelectList",
                 dataIndex: "teacherIdList",
                 colProps: {

src/pages/mybustrain/index.jsx

@@ -196,7 +196,7 @@ function Lessons() {
             fields={[
               {
                 rowKey: "id",
-                rowName: "id",
+                rowName: "name",
                 valueType: "FormSelectList",
                 dataIndex: "studentIdList",
                 colProps: {

src/pages/rebustrain/index.less

+.white {
+  .ant-pro-card {
+    background-color: #f6f6f6 !important;
+  }
+  .ant-table-tbody,td {
+    background-color: #f9f9f9 !important;
+  }
+}