diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js index f57f86e..db488f4 100644 --- a/src/enumerate/constant/index.js +++ b/src/enumerate/constant/index.js @@ -128,14 +128,12 @@ export const QUAL_MONITOR_STATUS_OPTIONS = [ /** 证书类型选项 */ export const CERT_TYPE_OPTIONS = [ { value: "registered_safety_engineer", label: "注册安全工程师" }, - { value: "senior_engineer", label: "高工" }, { value: "evaluator", label: "评价师" }, ]; /** 证书类型 value → label 映射 */ export const CERT_TYPE_MAP = { registered_safety_engineer: "注册安全工程师", - senior_engineer: "高工", evaluator: "评价师", }; diff --git a/src/pages/Container/SafetyEvalBusiness/Progress/index.js b/src/pages/Container/SafetyEvalBusiness/Progress/index.js index 2ecfb3a..c20adaf 100644 --- a/src/pages/Container/SafetyEvalBusiness/Progress/index.js +++ b/src/pages/Container/SafetyEvalBusiness/Progress/index.js @@ -18,7 +18,7 @@ import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; 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 { tools } from "@cqsjjb/jjb-common-lib"; import "./index.less"; @@ -89,18 +89,15 @@ const ProjectProgress = (props) => { const renderProgressDots = (nodes) => { if (!nodes || nodes.length === 0) return 暂无进度; const total = nodes.length; - const done = nodes.filter((n) => n.statusCode === 3).length; + const done = nodes.filter((n) => n.state === 1).length; return (
{nodes.map((node, idx) => { - const dotClass = - node.statusCode === 3 ? "pp-progress-dot-done" : - node.statusCode === 2 ? "pp-progress-dot-doing" : - node.statusCode === 4 ? "pp-progress-dot-error" : - "pp-progress-dot-wait"; + const dotClass = node.state === 1 ? "pp-progress-dot-done" : "pp-progress-dot-wait"; + const name = NODE_LABELS[node.type] || node.type; return ( - + );