jkasd

src/components/ProductCard/index.jsx

@@ -85,7 +85,7 @@ export default function ShopProductCard({
           <Box className="masker"></Box>
           {type == 1 && (
             <Box className="edit">
-              <Tooltip title="编辑">
+              <Tooltip placement="bottom-start" title="编辑">
                 <IconButton
                   onClick={() => {
                     edit(product);
@@ -97,7 +97,7 @@ export default function ShopProductCard({
                 </IconButton>
               </Tooltip>
 
-              <Tooltip title={confirm ? "确认删除" : "删除"}>
+              <Tooltip placement="bottom-start" title={confirm ? "确认删除" : "删除"}>
                 {confirm ? (
                   <IconButton
                     disabled={confirm === "1"}
@@ -150,7 +150,7 @@ export default function ShopProductCard({
             <div></div>
 
             {type !== 3 && (
-              <Tooltip title={shut ? "确认关闭" : "关闭"}>
+              <Tooltip placement="bottom-start" title={shut ? "确认关闭" : "关闭"}>
                 {shut ? (
                   <IconButton
                     disabled={shut === "1"}
@@ -200,14 +200,14 @@ export default function ShopProductCard({
           overflow={"hidden"}
           alignItems={"center"}
         >
-          <Tooltip title={courseName}>
+          <Tooltip placement="bottom-start" title={courseName}>
             <Typography variant="subtitle2" noWrap>
               {courseName}
             </Typography>
           </Tooltip>
 
           <Box width={60} textAlign={"right"} flexShrink={0}>
-            <Tooltip title={createTime}>
+            <Tooltip placement="bottom-start" title={createTime}>
               <Typography
                 component="span"
                 variant="body2"
@@ -229,7 +229,7 @@ export default function ShopProductCard({
             {type == 3 ? (
               <div></div>
             ) : (
-              <Tooltip title={type == 1 ? "发布" : type == 2 ? "取消发布" : ""}>
+              <Tooltip placement="bottom-start" title={type == 1 ? "发布" : type == 2 ? "取消发布" : ""}>
                 <IconButton
                   onClick={() => {
                     publish(product);
@@ -250,7 +250,7 @@ export default function ShopProductCard({
               </Tooltip>
             )}
             {type === 1 ? (
-              <Tooltip title="授权">
+              <Tooltip placement="bottom-start" title="授权">
                 <IconButton
                   onClick={() => {
                     authorized(product);
@@ -269,7 +269,7 @@ export default function ShopProductCard({
 
           <Stack direction={"row"} spacing={1}>
             {type === 1 && (
-              <Tooltip title="备课">
+              <Tooltip placement="bottom-start" title="备课">
                 <IconButton
                   onClick={() => {
                     history.push("/work/dolessons/" + product.id);
@@ -283,7 +283,7 @@ export default function ShopProductCard({
               </Tooltip>
             )}
 
-            <Tooltip title="复制创建">
+            <Tooltip placement="bottom-start" title="复制创建">
               <IconButton
                 onClick={() => {
                   copy(product);

src/components/ProductCard/sxcard.jsx

@@ -17,9 +17,11 @@ 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 CloseIcon from "@mui/icons-material/Close";
 import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
 import GroupIcon from "@mui/icons-material/Group";
+import PauseIcon from "@mui/icons-material/Pause";
 import { history } from "@umijs/max";
 import { Progress } from "antd";
 import dayjs from "dayjs";
@@ -47,6 +49,7 @@ export default function ShopProductCard({
   copy,
   publish,
   authorized,
+  tauthorized
 }) {
   const {
     trainName,
@@ -62,6 +65,9 @@ export default function ShopProductCard({
     totalExperimentNum,
   } = product;
   const [confirm, setconfirm] = useState(false);
+  const [shut, setshut] = useState(false);
+
+  const ifs = type === 1 || type === 3;
 
   return (
     <Card sx={{ borderRadius: 3 }} className="hovered" id="jikl">
@@ -70,7 +76,10 @@ export default function ShopProductCard({
           <Label
             variant="filled"
             color={
-              (type === 1 && "warning") || (type === 2 && "info") || (type === 3 && "default") || (type === 4 && "error") || "danger"
+              (type === 1 && "warning") ||
+              (type === 2 && "info") ||
+              (type === 3 && "default") ||
+              "error"
             }
             sx={{
               zIndex: 9,
@@ -95,9 +104,9 @@ export default function ShopProductCard({
           sx={{ borderRadius: 2, overflow: "hidden" }}
         >
           <Box className="masker"></Box>
-          {type == 1 && (
+          {ifs && (
             <Box className="edit">
-              <Tooltip title="编辑">
+              <Tooltip placement="bottom-start" title="编辑">
                 <IconButton
                   onClick={() => {
                     edit(product);
@@ -109,7 +118,10 @@ export default function ShopProductCard({
                 </IconButton>
               </Tooltip>
 
-              <Tooltip title={confirm ? "确认删除" : "删除"}>
+              <Tooltip
+                placement="bottom-start"
+                title={confirm ? "确认删除" : "删除"}
+              >
                 {confirm ? (
                   <IconButton
                     disabled={confirm === "1"}
@@ -159,10 +171,12 @@ export default function ShopProductCard({
             className="stackani"
             padding={"0px 12px"}
           >
-            <Tooltip title={"协作教师"}>
+            <Tooltip placement="bottom-start" title={"协作教师"}>
               <IconButton
                 onClick={() => {
-                  publish(product, { type: 3 });
+                  if (ifs) {
+                    tauthorized(product);
+                  }
                 }}
               >
                 <GroupIcon
@@ -174,7 +188,7 @@ export default function ShopProductCard({
               </IconButton>
             </Tooltip>
 
-            <Tooltip title={"成绩管理"}>
+            <Tooltip placement="bottom-start" title={"成绩管理"}>
               <IconButton
                 onClick={() => {
                   publish(product, { type: 3 });
@@ -211,7 +225,7 @@ export default function ShopProductCard({
                 "100%": "#005bea",
               }}
             />
-            <Tooltip title={trainName}>
+            <Tooltip placement="bottom-start" title={trainName}>
               <Typography
                 variant="subtitle2"
                 noWrap
@@ -225,7 +239,7 @@ export default function ShopProductCard({
           </div>
 
           <Box width={60} textAlign={"right"} flexShrink={0}>
-            <Tooltip title={createTime}>
+            <Tooltip placement="bottom-start" title={createTime}>
               <Typography
                 component="span"
                 variant="body2"
@@ -269,8 +283,7 @@ export default function ShopProductCard({
           padding={"0 2px"}
         >
           <Stack direction={"row"} spacing={2} alignItems={"center"}>
-            {type === 1 && (
-              <Tooltip title="备课">
+            <Tooltip placement="bottom-start" title="备课">
               <Stack
                 direction={"row"}
                 alignItems={"center"}
@@ -298,16 +311,16 @@ export default function ShopProductCard({
                 </Typography>
               </Stack>
             </Tooltip>
-            )}
 
-            {type === 1 ? (
-              <Tooltip title="授权">
+            <Tooltip placement="bottom-start" title="授权">
               <Stack
                 direction={"row"}
                 alignItems={"center"}
                 sx={{ cursor: "pointer" }}
                 onClick={() => {
+                  if (ifs) {
                     authorized(product);
+                  }
                 }}
               >
                 <IconFont
@@ -328,34 +341,78 @@ export default function ShopProductCard({
                 </Typography>
               </Stack>
             </Tooltip>
-            ) : (
-              <div></div>
-            )}
           </Stack>
 
-          <Stack direction={"row"} spacing={1}>
-            {type == 3 ? (
-              <div></div>
-            ) : (
-              <Tooltip title={type == 1 ? "发布" : type == 2 ? "取消发布" : ""}>
+          <Stack direction={"row"} spacing={0}>
+            <Tooltip placement="bottom-start" title={ifs ? "发布" : "暂停发布"}>
               <IconButton
+                style={{
+                  opacity: type !== 5 && type !== 4 ? 1 : 0,
+                  pointerEvents: type === 5 || type === 4 ? "none" : "auto",
+                }}
                 onClick={() => {
-                    publish(product);
+                  if (type === 5 || type === 4) return;
+                  if (ifs) {
+                    publish(product, { type: 2 });
+                  } else {
+                    publish(product, { type: 3 });
+                  }
                 }}
               >
-                  {type == 1 ? (
+                {ifs ? (
                   <IconFont
                     type="icon-fabu"
                     style={{ fontSize: 20, color: colors.blue[600] }}
                   ></IconFont>
                 ) : (
-                    <IconFont
-                      type="icon-undo"
-                      style={{ fontSize: 20, color: colors.red[600] }}
-                    ></IconFont>
+                  <PauseIcon
+                    style={{ fontSize: 20, color: colors.grey[900] }}
+                  ></PauseIcon>
                 )}
               </IconButton>
             </Tooltip>
+
+            {type === 3 && (
+              <Tooltip
+                placement="bottom-start"
+                title={shut ? "确认关闭" : "关闭"}
+              >
+                {shut ? (
+                  <IconButton
+                    disabled={shut === "1"}
+                    onClick={() => {
+                      publish(product, { type: 3 });
+                    }}
+                  >
+                    <CheckIcon
+                      style={{
+                        fontSize: 20,
+                        color:
+                          shut === "1" ? colors.grey[500] : colors.green[500],
+                      }}
+                    ></CheckIcon>
+                  </IconButton>
+                ) : (
+                  <IconButton
+                    onClick={() => {
+                      setshut("1");
+
+                      setTimeout(() => {
+                        setshut(true);
+                      }, 200);
+
+                      setTimeout(() => {
+                        setshut(false);
+                      }, 3000);
+                    }}
+                  >
+                    <CloseIcon
+                      type="icon-guanbi"
+                      style={{ fontSize: 20, color: "#ff4800" }}
+                    ></CloseIcon>
+                  </IconButton>
+                )}
+              </Tooltip>
             )}
           </Stack>
         </Stack>

src/components/TreeRender/index.jsx

@@ -64,10 +64,9 @@ function TreeRender({
     });
   const [expandall, setexpandall] = useState(false);
   const [expandedKeys, onExpand] = useState();
-  const { data, refresh } = useRequest(() => {
+  const { data, refresh, loading } = useRequest(() => {
     return doFetch({ url, params: params ?? {} });
   });
-  console.log(data);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
 
   const allkeys = useMemo(() => {
@@ -367,6 +366,9 @@ function TreeRender({
               open: false,
             }));
           }}
+          okButtonProps={{
+            loading,
+          }}
           onOk={() => {
             return new Promise((resolve, reject) => {
               if (drawer?.item) {
@@ -419,6 +421,9 @@ function TreeRender({
               visible: false,
             }));
           }}
+          okButtonProps={{
+            loading,
+          }}
           onOk={() => {
             if (modal.okText == "修改") {
               return new Promise((resolve, reject) => {

src/components/TreeRender/sxtree.jsx

@@ -63,10 +63,9 @@ function TreeRender({
     });
   const [expandall, setexpandall] = useState(false);
   const [expandedKeys, onExpand] = useState();
-  const { data, refresh } = useRequest(() => {
+  const { data, refresh, loading } = useRequest(() => {
     return doFetch({ url, params: params ?? {} });
   });
-  console.log(data);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
 
   const allkeys = useMemo(() => {
@@ -341,6 +340,7 @@ function TreeRender({
         >
           <AddIcon style={{ fontSize: 20, color: colors.blue[600] }}></AddIcon>
         </IconButton>
+
         <Modal
           {...drawer}
           closable={false}
@@ -354,6 +354,9 @@ function TreeRender({
               open: false,
             }));
           }}
+          okButtonProps={{
+            loading,
+          }}
           onOk={() => {
             return new Promise((resolve, reject) => {
               if (drawer?.item) {
@@ -406,6 +409,9 @@ function TreeRender({
               visible: false,
             }));
           }}
+          okButtonProps={{
+            loading,
+          }}
           onOk={() => {
             if (modal.okText == "修改") {
               return new Promise((resolve, reject) => {

src/pages/bustrain/index.jsx

@@ -15,7 +15,6 @@ import { Empty, Input, message } from "antd";
 import { useMemo, useState } from "react";
 import "./index.less";
 
-
 function Lessons() {
   const [dialogprops, setdialogprops] = useState({
     open: false,
@@ -46,7 +45,6 @@ function Lessons() {
 
   const datalist = useRequest(
     async () => {
-      
       let res = await doFetch({ url: "/busTrain/list", params });
       return res?.data?.dataList;
     },
@@ -57,7 +55,6 @@ function Lessons() {
   );
 
   const edit = (row) => {
-    
     setdialogprops({
       open: true,
       defaultFormValue: { ...row },
@@ -82,6 +79,23 @@ function Lessons() {
     });
   };
 
+  const tauthorized = (row) => {
+    doFetch({
+      url: "/busTrainTeacher/queryRelationTeacher",
+      params: { trainId: row?.id },
+    }).then((res) => {
+      if (res.code === "0000") {
+        setdialogprops({
+          open: true,
+          maxWidth: "xl",
+          defaultFormValue: { ...row },
+          teacherIdList: res?.data?.dataList,
+          title: "协作教师",
+        });
+      }
+    });
+  };
+
   const remove = (row) => {
     runAsync({
       url: "/busTrain/delete",
@@ -93,7 +107,7 @@ function Lessons() {
     const type = row?.type === 1 ? 2 : row?.type === 2 ? 1 : null;
     const extra = params ?? { type };
     runAsync({
-      url: "/busTrain/pubOrNotPub",
+      url: "/busTrain/updateType",
       params: { id: row.id, ...extra },
     });
   };
@@ -188,6 +202,65 @@ function Lessons() {
               });
             }}
           ></InitForm>
+        ) : dialogprops?.title === "协作教师" ? (
+          <InitForm
+            defaultFormValue={{
+              teacherIdList: dialogprops?.teacherIdList,
+            }}
+            fields={[
+              {
+                rowKey: "id",
+                rowName: "id",
+                valueType: "FormSelectList",
+                dataIndex: "teacherIdList",
+                colProps: {
+                  span: 24,
+                },
+                columns: [
+                  {
+                    title: "账号",
+                    key: "userAccount",
+                    dataIndex: "userAccount",
+                    editable: false,
+                  },
+                  {
+                    title: "教师姓名",
+                    key: "name",
+                    dataIndex: "name",
+                    editable: false,
+                  },
+                  {
+                    title: "学校名称",
+                    key: "schoolId",
+                    dataIndex: "schoolName",
+                    valueType: "select",
+                    search: false,
+                    editable: false,
+                  },
+                  {
+                    title: "院系名称",
+                    key: "departmentName",
+                    dataIndex: "departmentName",
+                    editable: false,
+                  },
+                ],
+                path: "/user/getAllTeacherByCurrentTeacherSchool",
+                params: {
+                  type: "",
+                },
+              },
+            ]}
+            onFinish={(val) => {
+              const teacherIdList = val?.teacherIdList?.map((it) => it?.id);
+              runAsync({
+                url: "/busTrainTeacher/relationTrainTeacher",
+                params: {
+                  teacherIdList,
+                  trainId: dialogprops?.defaultFormValue?.id,
+                },
+              });
+            }}
+          />
         ) : (
           <InitForm
             defaultFormValue={{
@@ -420,6 +493,7 @@ function Lessons() {
                   remove={remove}
                   publish={publish}
                   authorized={authorized}
+                  tauthorized={tauthorized}
                 />
               </Grid>
             ))

src/pages/dobustrain/index.jsx

@@ -117,7 +117,7 @@ function Dolessons() {
           cancelText: "取消",
           onConfirm: async () => {
             await runAsync({
-              url: "/courseQuestion/delete",
+              url: "/busTrainQuestion/delete",
               params: { id: row?.id },
             });
           },
@@ -328,7 +328,7 @@ function Dolessons() {
                 ],
               },
             ]}
-            path="/courseQuestion/page"
+            path="/busTrainQuestion/page"
             extraparams={{
               trainId: params?.id,
             }}
@@ -502,7 +502,7 @@ function Dolessons() {
                   break;
               }
               runAsync({
-                url: "/courseQuestion/saveOrUpdate",
+                url: "/busTrainQuestion/saveOrUpdate",
                 params: postdata,
               });
             }}

src/pages/mybustrain/index.jsx

@@ -299,7 +299,6 @@ function Lessons() {
                 } else {
                   news = [...news, val];
                 }
-                console.log(news);
                 return {
                   ...s,
                   typeList: news,