cq_anquan
/
safety-eval-service-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev

dev_1.2
tangjie 2026-07-24 17:05:45 +08:00
parent 4944e5cba1 4a7d7ce2bd
commit 6d991e7675
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/enumerate/constant/index.js
View File

@ -128,14 +128,12 @@ export const QUAL_MONITOR_STATUS_OPTIONS = [
/** 证书类型选项 */ /** 证书类型选项 */
export const CERT_TYPE_OPTIONS = [ export const CERT_TYPE_OPTIONS = [
{ value: "registered_safety_engineer", label: "注册安全工程师" }, { value: "registered_safety_engineer", label: "注册安全工程师" },
{ value: "senior_engineer", label: "高工" },
{ value: "evaluator", label: "评价师" }, { value: "evaluator", label: "评价师" },
]; ];
/** 证书类型 value → label 映射 */ /** 证书类型 value → label 映射 */
export const CERT_TYPE_MAP = { export const CERT_TYPE_MAP = {
registered_safety_engineer: "注册安全工程师", registered_safety_engineer: "注册安全工程师",
senior_engineer: "高工",
evaluator: "评价师", evaluator: "评价师",
}; };

13
src/pages/Container/SafetyEvalBusiness/Progress/index.js
View File

@ -18,7 +18,7 @@ import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm";
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
import { PROGRESS_STATUS_MAP } from "~/enumerate/constant"; import { PROGRESS_STATUS_MAP, NODE_LABELS } from "~/enumerate/constant";
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { tools } from "@cqsjjb/jjb-common-lib"; import { tools } from "@cqsjjb/jjb-common-lib";
import "./index.less"; import "./index.less";
@ -89,18 +89,15 @@ const ProjectProgress = (props) => {
const renderProgressDots = (nodes) => { const renderProgressDots = (nodes) => {
if (!nodes || nodes.length === 0) return <span className="pp-progress-empty">暂无进度</span>; if (!nodes || nodes.length === 0) return <span className="pp-progress-empty">暂无进度</span>;
const total = nodes.length; const total = nodes.length;
const done = nodes.filter((n) => n.statusCode === 3).length; const done = nodes.filter((n) => n.state === 1).length;
return ( return (
<div> <div>
<div className="pp-progress-dots"> <div className="pp-progress-dots">
{nodes.map((node, idx) => { {nodes.map((node, idx) => {
const dotClass = const dotClass = node.state === 1 ? "pp-progress-dot-done" : "pp-progress-dot-wait";
node.statusCode === 3 ? "pp-progress-dot-done" : const name = NODE_LABELS[node.type] || node.type;
node.statusCode === 2 ? "pp-progress-dot-doing" :
node.statusCode === 4 ? "pp-progress-dot-error" :
"pp-progress-dot-wait";
return ( return (
<Tooltip key={node.nodeCode || idx} title={`${node.nodeName}: ${node.statusName}`}> <Tooltip key={node.type || idx} title={`${name}: ${node.state === 1 ? "已完成" : "未完成"}`}>
<span className={`pp-progress-dot ${dotClass}`} /> <span className={`pp-progress-dot ${dotClass}`} />
</Tooltip> </Tooltip>
); );