diff --git a/nginx配置文件.txt b/nginx配置文件.txt new file mode 100644 index 0000000..358f5e0 --- /dev/null +++ b/nginx配置文件.txt @@ -0,0 +1,88 @@ +server +{ + listen 80; + server_name www.workload.hrbnu.club; + merge_slashes on; # 合并连续斜杠（默认开启，但显式声明更稳妥） + index index.php index.html index.htm default.php default.htm default.html; + root /www/wwwroot/EFC/dist/build; + + #CERT-APPLY-CHECK--START + # 用于SSL证书申请时的文件验证相关配置 -- 请勿删除 + include /www/server/panel/vhost/nginx/well-known/www.workload.hrbnu.club.conf; + #CERT-APPLY-CHECK--END + + #SSL-START SSL相关配置，请勿删除或修改下一行带注释的404规则 + #error_page 404/404.html; + #SSL-END + + #ERROR-PAGE-START 错误页配置，可以注释、删除或修改 + error_page 404 /404.html; + #error_page 502 /502.html; + #ERROR-PAGE-END + + #PHP-INFO-START PHP引用配置，可以注释或修改 + include enable-php-80.conf; + #PHP-INFO-END + + #REWRITE-START URL重写规则引用,修改后将导致面板设置的伪静态规则失效 + include /www/server/panel/vhost/rewrite/www.workload.hrbnu.club.conf; + #REWRITE-END + + #禁止访问的文件或目录 + location ~ ^/(\.user.ini|\.htaccess|\.git|\.env|\.svn|\.project|LICENSE|README.md) + { + return 404; + } + + # 处理 history 模式路由：所有请求 fallback 到 index.html + + location / { + try_files $uri /index.html; + index index.html; + } + #一键申请SSL证书验证目录相关设置 + location ~ \.well-known{ + allow all; + } + + #禁止在证书验证目录放入敏感文件 + if ( $uri ~ "^/\.well-known/.*\.(php|jsp|py|js|css|lua|ts|go|zip|tar\.gz|rar|7z|sql|bak)$" ) { + return 403; + } + + location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$ + { + expires 30d; + error_log /dev/null; + access_log /dev/null; + } + + location ~ .*\.(js|css)?$ + { + expires 12h; + error_log /dev/null; + access_log /dev/null; + } + # 代理后端API请求 + # 所有以/api/开头的请求都会被代理到后端服务 + location /api/ { + # 后端服务地址 + proxy_pass http://43.138.83.20:10001; + + # 代理相关设置 + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # 超时设置 + proxy_connect_timeout 300s; + proxy_send_timeout 300s; + proxy_read_timeout 300s; + + # 允许客户端请求体大小 + client_max_body_size 10M; + } + access_log /www/wwwlogs/www.workload.hrbnu.club.log; + error_log /www/wwwlogs/www.workload.hrbnu.club.error.log; +} \ No newline at end of file diff --git a/src/menu/DashboardMenuItems.js b/src/menu/DashboardMenuItems.js index 7ca3ff0..b4ff3fb 100644 --- a/src/menu/DashboardMenuItems.js +++ b/src/menu/DashboardMenuItems.js @@ -54,7 +54,7 @@ const DashboardMenuItems = [ { key: `/generate-certificate`, icon: , - label: 证书生成 + label: 证明生成 }, { key: `settings`, diff --git a/src/page/Dashboard/DataCheck/DataCheckTable/CheckTableColumn.js b/src/page/Dashboard/DataCheck/DataCheckTable/CheckTableColumn.js index 4247d15..476648b 100644 --- a/src/page/Dashboard/DataCheck/DataCheckTable/CheckTableColumn.js +++ b/src/page/Dashboard/DataCheck/DataCheckTable/CheckTableColumn.js @@ -2,10 +2,17 @@ import {Space} from "antd"; import CourseTypeTag from "../../../../component/Workload/CourseTypeTag"; const CheckTableColumn = [ + //{ + // title: 'ID', + // dataIndex: 'id', + // key: 'id', + // responsive: ['lg'], + // render: (text) => {text} + //}, { - title: 'ID', - dataIndex: 'id', - key: 'id', + title: '学期', + dataIndex: 'semesterInfo', + key: 'semesterInfo', responsive: ['lg'], render: (text) => {text} }, @@ -36,6 +43,20 @@ const CheckTableColumn = [ responsive: ['lg'], render: (text) => {text} }, + { + title: '学生数', + dataIndex: 'actualClassSize', + key: 'actualClassSize', + responsive: ['lg'], + render: (text) => {text} + }, + { + title: '授课对象', + dataIndex: 'teachingGrade', + key: 'teachingGrade', + responsive: ['lg'], + render: (text) => {text} + }, { title: '总学时', dataIndex: 'totalClassHours', diff --git a/src/page/Dashboard/DataManager/ImportDataDrawer.jsx b/src/page/Dashboard/DataManager/ImportDataDrawer.jsx index 9189249..2f89d4a 100644 --- a/src/page/Dashboard/DataManager/ImportDataDrawer.jsx +++ b/src/page/Dashboard/DataManager/ImportDataDrawer.jsx @@ -121,6 +121,7 @@ const ImportDataDrawer = props => { +
[ + //{ + // title: 'ID', + // dataIndex: 'id', + // key: 'id', + // responsive: ['lg'], + // render: (text) => {text} + //}, { - title: 'ID', - dataIndex: 'id', - key: 'id', + title: '学期', + dataIndex: 'semesterInfo', + key: 'semesterInfo', responsive: ['lg'], render: (text) => {text} }, @@ -36,6 +43,20 @@ const ManageTableColumn = (commonAxios, messageApi, fetchWorkload) => [ responsive: ['lg'], render: (text) => {text} }, + { + title: '学生数', + dataIndex: 'actualClassSize', + key: 'actualClassSize', + responsive: ['lg'], + render: (text) => {text} + }, + { + title: '授课对象', + dataIndex: 'teachingGrade', + key: 'teachingGrade', + responsive: ['lg'], + render: (text) => {text} + }, { title: '工作量', dataIndex: 'totalClassHours', diff --git a/src/page/Dashboard/DataPrint/RecordCard/PrintRecordCard.jsx b/src/page/Dashboard/DataPrint/RecordCard/PrintRecordCard.jsx index bb5d77e..f67e68c 100644 --- a/src/page/Dashboard/DataPrint/RecordCard/PrintRecordCard.jsx +++ b/src/page/Dashboard/DataPrint/RecordCard/PrintRecordCard.jsx @@ -56,6 +56,12 @@ function PrintRecordCard(props) {
教师工号: {record.stuffNumber}
+
+ 教师姓名: {record.teacherName} +
+
+ 学院: {record.college} +
请求时间: {DateFormater(record.requestTime)}
生成时间: {record.status === '02' ? DateFormater(record.madeTime) : 'N/A'} diff --git a/src/page/Dashboard/GenerateCertificate/ParameterConfig.jsx b/src/page/Dashboard/GenerateCertificate/ParameterConfig.jsx index b2f6f61..ddf3d96 100644 --- a/src/page/Dashboard/GenerateCertificate/ParameterConfig.jsx +++ b/src/page/Dashboard/GenerateCertificate/ParameterConfig.jsx @@ -97,8 +97,8 @@ const ParameterConfig = props => { } }} options={[ - {label: '本科课堂工时证明', value: '01'}, - {label: '任现职后工作情况证明', value: '02'} + {label: '哈尔滨师范大学本科课堂教学课时证明', value: '01'}, + {label: '任现职、近五年完成教育教学工作情况(本科)', value: '02'} ]} />