diff --git a/src/glcc/img/freeBanner.png b/src/glcc/img/freeBanner.png
new file mode 100644
index 000000000..5c6aeca6d
Binary files /dev/null and b/src/glcc/img/freeBanner.png differ
diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx
index 183f79fb1..e490cd6ce 100644
--- a/src/glcc/index.jsx
+++ b/src/glcc/index.jsx
@@ -52,6 +52,11 @@ const FreeProject = Loadable({
loader: () => import("./freeProject"),
loading: Loading,
});
+// 无奖金课题-结果公示
+const FreeResult = Loadable({
+ loader: () => import("./interimReview/freeResult"),
+ loading: Loading,
+});
// 课题详情页面
const TaskDetail = Loadable({
loader: () => import("./project/taskDetail"),
@@ -302,11 +307,18 @@ const Glcc = (propsF) => {
)}
>
-
(
)}
+ > */}
+ {/* 无奖金课题结果公示 */}
+
(
+
+ )}
>
{/* openmmlab列表 */}
diff --git a/src/glcc/interimReview/freeResult.jsx b/src/glcc/interimReview/freeResult.jsx
new file mode 100644
index 000000000..a17bd5b52
--- /dev/null
+++ b/src/glcc/interimReview/freeResult.jsx
@@ -0,0 +1,232 @@
+import React, { useEffect, useState } from "react";
+import { Input, Table, Tooltip, Checkbox } from "antd";
+import { getExamineInfoListFor0In } from "../api";
+import ProjectDetail from "../project/component/projectDetail";
+import freeBanner from "../img/freeBanner.png";
+import bgPng from "../img/bgPng.png";
+import "./index.scss";
+import "../checkResult/index.scss";
+import "../project/taskList/index.scss";
+import "../project/index.scss";
+const { Search } = Input;
+
+// 课题列表
+function FreeResult({ round, id, period }) {
+ // 输入搜索框
+ const [keyword, setKeyword] = useState(undefined);
+ const [data, setData] = useState([]);
+ // table
+ const [current, setCurrent] = useState(1);
+ const [total, setTotal] = useState(0);
+ const [pageSize, setPageSize] = useState(20);
+ const [loading, setLoading] = useState(false);
+ const [expandedRowKeys, setExpandedRowKeys] = useState([]);
+
+ useEffect(() => {
+ setLoading(true);
+ setExpandedRowKeys([]);
+ const params = {
+ curPage: current,
+ keyword,
+ pageSize,
+ term: period === "mediumExamine3" ? 1 : 2,
+ round,
+ };
+ getExamineInfoListFor0In(params).then((response) => {
+ if (response && response.message === "success") {
+ response.data.rows.map((item, index)=>{
+ item.id = (current-1)*pageSize+index + 1;
+ })
+ setData(response.data.rows);
+ setTotal(response.data.total);
+ }
+ setLoading(false);
+ });
+ }, [keyword, current, pageSize]);
+
+ const columns = [
+ {
+ title: "序号",
+ dataIndex: "index",
+ align: "center",
+ className: "columnsResult",
+ width: "8%",
+ render: (text, item, index) => (
+
{(current - 1) * pageSize + index + 1}
+ ),
+ },
+ {
+ title: "入选学生",
+ dataIndex: "studentName",
+ className: "columnsResult taskName",
+ width: "12%",
+ ellipsis: true,
+ },
+ {
+ title: "课题导师",
+ dataIndex: "tutorName",
+ className: "columnsResult",
+ width: "12%",
+ ellipsis: true,
+ },
+ {
+ title: "课题名称",
+ dataIndex: "taskName",
+ className: "columnsResult",
+ width: "22%",
+ ellipsis: true,
+ render: (text, item) => (
+
+ {
+ window.open(`/glcc/${id}/subjects/detail/${item.taskId}`);
+ }}
+ >
+ {text}
+
+
+ ),
+ },
+ {
+ title: "项目名称",
+ dataIndex: "projectName",
+ className: "columnsResult",
+ ellipsis: true,
+ width: "16%",
+ render: (text) => (
+
+ {text}
+
+ ),
+ },
+ {
+ title: "项目简介",
+ dataIndex: "introduce",
+ className: "columnsResult",
+ width: "16%",
+ ellipsis: true,
+ },
+ {
+ title: "考核结果",
+ dataIndex: "totalityEvaluation",
+ align: "center",
+ className: "columnsResult actionBox",
+ },
+ ];
+
+ const customExpandIcon = (props) => {
+ if (props.expanded) {
+ return (
+
{
+ props.onExpand(props.record, e);
+ }}
+ >
+ 项目简介
+
+
+ );
+ } else {
+ return (
+
{
+ props.onExpand(props.record, e);
+ }}
+ >
+ 项目简介
+
+
+ );
+ }
+ };
+
+ const expandRow = (record) => {
+ return (
+
+ );
+ };
+
+ // 展开收起行回调
+ function onExpand(expanded, record) {
+ const keys = new Set(expandedRowKeys);
+ if (expanded) {
+ keys.add(record.id);
+ } else {
+ keys.delete(record.id);
+ }
+ setExpandedRowKeys(Array.from(keys));
+ }
+
+ // 改变pagesize
+ function onShowSizeChange(current, pageSize) {
+ window.scrollTo(0, 0);
+ setCurrent(1);
+ setPageSize(pageSize);
+ }
+
+ // 切换页数
+ function changePage(page, pageSize) {
+ window.scrollTo(0, 0);
+ setCurrent(page);
+ }
+
+ return (
+
+
+
+
+
+
+
{
+ setCurrent(1);
+ setKeyword(value);
+ }}
+ />
+
+
+
+
+
+
+
+
+ );
+}
+export default FreeResult;