@@ -377,12 +418,16 @@ const EvalProjectMonitorDetail = (props) => {
评价机构
- {contractData?.orgName || evalProjectDetailData?.orgName || "-"}
+ {contractData?.orgName || "-"}
项目负责人
- {evalProjectDetailData?.leaderName || "-"}
+ {evalProjectDetailData?.projectLeaderName || "-"}
+
+
+ 总体状态
+ {projectNode.filter((item) => item.state === 1).length}/{projectNode.length}
);
@@ -395,20 +440,20 @@ const EvalProjectMonitorDetail = (props) => {
onChange={setActiveKey}
items={[
{
- key: "contract",
- label: "项目合同",
+ key: "BUSINESS_CONTRACT",
+ label: renderTabLabel("项目合同", "BUSINESS_CONTRACT"),
children: (
),
},
{
- key: "team",
- label: "项目组人员",
- children:
,
+ key: "PROJECT_GROUP",
+ label: renderTabLabel("项目组人员", "PROJECT_GROUP"),
+ children:
,
},
{
- key: "survey",
- label: "踏勘情况",
+ key: "SITE_SURVEY",
+ label: renderTabLabel("踏勘情况", "SITE_SURVEY"),
children: (
{
+ if (!raw) return [];
+ try {
+ const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+ return Array.isArray(parsed) ? parsed : [];
+ } catch {
+ return [];
+ }
+};
+
+/** 根据打卡数据计算状态 */
+const getClockInStatus = (record) => {
+ if (record.actualCount < record.expectedCount) {
+ return { color: "error", text: "人员未到齐" };
+ }
+ if (
+ record.signInCount < record.actualCount ||
+ record.signOutCount < record.actualCount
+ ) {
+ return { color: "warning", text: "异常" };
+ }
+ return { color: "success", text: "正常" };
+};
+
+const SurveyMonitor = (props) => {
+ const [searchForm] = Form.useForm();
+ const [dataSource, setDataSource] = useState([]);
+ const [total, setTotal] = useState(0);
+ const [clockInModal, setClockInModal] = useState(false);
+ const [clockInData, setClockInData] = useState([]);
+ const [clockInProjectName, setClockInProjectName] = useState("");
+
+ const { safetyEvalBusiness, evalSurveyMonitorStat, evalSurveyMonitorPage,
+ evalSurveyClockIn } = props;
+ const { evalSurveyMonitorStatLoading, evalSurveyMonitorPageLoading,
+ evalSurveyClockInLoading } = safetyEvalBusiness || {};
+ const statData = safetyEvalBusiness?.evalSurveyMonitorStat || {};
+
+ const getStat = () => {
+ evalSurveyMonitorStat();
+ };
+
+ const getData = async () => {
+ const params = {
+ ...router.query,
+ current: router.query.current || 1,
+ size: router.query.size || 10,
+ };
+ const res = await evalSurveyMonitorPage(params);
+ if (res?.success !== false) {
+ setDataSource(res?.data || []);
+ setTotal(res?.total || 0);
+ }
+ };
+
+ useEffect(() => {
+ searchForm.setFieldsValue({
+ ...router.query,
+ dateRange:
+ router.query.startTime && router.query.endTime
+ ? [router.query.startTime, router.query.endTime]
+ : undefined,
+ });
+ getStat();
+ getData();
+ }, []);
+
+ const handleSearch = (values) => {
+ const { dateRange, ...rest } = values;
+ router.query = {
+ ...rest,
+ startTime: dateRange?.[0]?.format?.("YYYY-MM-DD") || undefined,
+ endTime: dateRange?.[1]?.format?.("YYYY-MM-DD") || undefined,
+ current: 1,
+ size: 10,
+ };
+ getData();
+ };
+
+ const handleReset = (values) => {
+ searchForm.resetFields();
+ router.query = { ...values, current: 1, size: 10 };
+ getData();
+ };
+
+ const handlePageChange = (pagination) => {
+ router.query = {
+ ...router.query,
+ current: pagination.current,
+ size: pagination.pageSize,
+ };
+ getData();
+ };
+
+ const handleViewClockIn = async (record) => {
+ setClockInProjectName(record.projectName);
+ setClockInModal(true);
+ const res = await evalSurveyClockIn({ projectId: record.id });
+ if (res?.success !== false) {
+ setClockInData(res?.data || []);
+ }
+ };
+
+ const handleViewNotice = (record) => {
+ const files = parseFileList(record.notificationFileUrl);
+ if (files.length > 0 && files[0].url) {
+ window.open(files[0].url, "_blank");
+ }
+ };
+
+ const clockInColumns = [
+ { title: "人员", dataIndex: "userName", width: 100 },
+ {
+ title: "项目角色",
+ dataIndex: "role",
+ width: 160,
+ ellipsis: true,
+ render: (v) =>
+ Array.isArray(v)
+ ? v.map((r) => ROLE_DEFINITIONS_MAP[r] || r).join("、")
+ : v || "-",
+ },
+ {
+ title: "人脸识别",
+ dataIndex: "faceState",
+ width: 90,
+ render: (v) => (
+
+ {v === 1 ? "通过" : "未通过"}
+
+ ),
+ },
+ {
+ title: "GPS定位",
+ dataIndex: "gpsState",
+ width: 90,
+ render: (v) => (
+
+ {v === 1 ? "正常" : "异常"}
+
+ ),
+ },
+ { title: "签到时间", dataIndex: "singInTime", width: 160 },
+ { title: "签退时间", dataIndex: "signOutTime", width: 160 },
+ {
+ title: "现场照片",
+ dataIndex: "sceneUrl",
+ width: 80,
+ render: (v) => {
+ const count = v ? v.split(",").filter(Boolean).length : 0;
+ return count > 0 ? `${count}张` : "-";
+ },
+ },
+ {
+ title: "本人签字",
+ dataIndex: "signatureUrl",
+ width: 90,
+ render: (v) => (
+
+ {v ? "已签字" : "未签字"}
+
+ ),
+ },
+ ];
+
+ const columns = [
+ { title: "项目编号", dataIndex: "projectNo", width: 140 },
+ { title: "项目名称", dataIndex: "projectName", ellipsis: true, width: 220 },
+ { title: "评价机构", dataIndex: "orgName", ellipsis: true, width: 200 },
+ {
+ title: "告知书状态",
+ dataIndex: "notificationFileUrl",
+ width: 120,
+ render: (v) => {
+ const files = parseFileList(v);
+ return files.length > 0 ? (
+ 已归档
+ ) : (
+ 待上传
+ );
+ },
+ },
+ {
+ title: "应到/实到",
+ width: 100,
+ render: (_, r) => `${r.expectedCount} / ${r.actualCount}`,
+ },
+ {
+ title: "签到/签退",
+ width: 100,
+ render: (_, r) => `${r.signInCount} / ${r.signOutCount}`,
+ },
+ {
+ title: "现场照片",
+ dataIndex: "scenePhotoCount",
+ width: 90,
+ render: (v) => (v ? `${v}张` : "-"),
+ },
+ {
+ title: "打卡状态",
+ width: 100,
+ render: (_, r) => {
+ const status = getClockInStatus(r);
+ return {status.text};
+ },
+ },
+ {
+ title: "操作",
+ width: 160,
+ fixed: "right",
+ render: (_, record) => (
+
+
+
+
+ ),
+ },
+ ];
+
+ return (
+
+
+ {STAT_ITEMS.map((item) => (
+
+
+
+
+
+ ))}
+
+
+
+
+ ,
+
+
+ ,
+
+
+ ,
+ ]}
+ onFinish={handleSearch}
+ onReset={handleReset}
+ />
+
+ `共 ${t} 条`,
+ }}
+ onChange={handlePageChange}
+ />
+
+ setClockInModal(false)}
+ footer={null}
+ width={1000}
+ >
+
+
+
+ );
+};
+
+export default Connect(
+ [NS_SAFETY_EVAL_BUSINESS],
+ true,
+)(AntdTableFuncControl(SurveyMonitor));
diff --git a/src/pages/Container/MonitorManage/SurveyMonitor/index.less b/src/pages/Container/MonitorManage/SurveyMonitor/index.less
new file mode 100644
index 0000000..3d37fc5
--- /dev/null
+++ b/src/pages/Container/MonitorManage/SurveyMonitor/index.less
@@ -0,0 +1,3 @@
+.sm-stat-row {
+ margin-bottom: 16px;
+}
diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ContractContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ContractContent.js
index 23b295c..a59e6c1 100644
--- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ContractContent.js
+++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ContractContent.js
@@ -15,6 +15,7 @@ import {
Spin,
} from "antd";
import dayjs from "dayjs";
+import {PROJECT_TYPE_OPTIONS ,EVAL_TYPE_OPTIONS} from '~/enumerate/constant';
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
import { district } from "~/enumerate/constant";
@@ -25,17 +26,9 @@ import AttachmentUpload from "~/components/AttachmentUpload";
const { router } = tools;
const { TextArea } = Input;
-const PROJECT_TYPE_OPTIONS = [
- { label: "新建项目", value: "NEW" },
- { label: "续评项目", value: "RENEW" },
- { label: "变更项目", value: "CHANGE" },
-];
-const EVAL_TYPE_OPTIONS = [
- { label: "安全预评价", value: "PRE" },
- { label: "安全验收评价", value: "ACCEPT" },
- { label: "安全现状评价", value: "STATUS" },
-];
+
+
const YES_NO_OPTIONS = [
{ label: "是", value: 1 },
diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
index 86c680e..7ddfe48 100644
--- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
+++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
@@ -12,21 +12,13 @@ import dayjs from "dayjs";
const { router } = tools;
const STAGES = [
- { key: "notice", index: "01", label: "从业告知" },
- { key: "inspection", index: "02", label: "现场勘查" },
- { key: "rectification", index: "03", label: "整改通知" },
- { key: "enterprise", index: "04", label: "企业整改" },
- { key: "review", index: "05", label: "整改复查" },
+ { key: "PRACTICE_NOTIFICATION", index: "01", label: "从业告知" },
+ { key: "SITE_INSPECTION_FORM", index: "02", label: "现场勘查" },
+ { key: "RECTIFICATION_NOTICE", index: "03", label: "整改通知" },
+ { key: "ENTERPRISE_RECTIFICATION", index: "04", label: "企业整改" },
+ { key: "RECTIFICATION_REVIEW", index: "05", label: "整改复查" },
];
-const ATTACH_TYPE = {
- notice: "PRACTICE_NOTIFICATION",
- inspection: "SITE_INSPECTION_FORM",
- rectification: "RECTIFICATION_NOTICE",
- enterprise: "ENTERPRISE_RECTIFICATION",
- review: "RECTIFICATION_REVIEW",
-};
-
const downloadTemplate = async () => {
try {
const res = await fetch("https://test-dragon-yf-pub.oss-cn-hangzhou.aliyuncs.com/jjb/6a608cb30dc53ed98d0b13ae.pdf");
@@ -137,7 +129,7 @@ const SimpleUploadPanel = ({ index, title, desc }) => (
const SurveyContent = (props) => {
const [form] = Form.useForm();
- const [activeStage, setActiveStage] = useState("notice");
+ const [activeStage, setActiveStage] = useState("PRACTICE_NOTIFICATION");
const [attachMap, setAttachMap] = useState({});
const [surveyPersonnel, setSurveyPersonnel] = useState([]);
const { evalSurveyListLoading, evalSurveySaveAttachLoading, evalProjectDetailData } = props.safetyEvalBusiness;
@@ -163,8 +155,8 @@ const SurveyContent = (props) => {
setAttachMap(map);
// 回填所有步骤的附件到表单
const values = {};
- Object.entries(ATTACH_TYPE).forEach(([, typeCode]) => {
- values[typeCode] = map[typeCode] || [];
+ STAGES.forEach((s) => {
+ values[s.key] = map[s.key] || [];
});
form.setFieldsValue(values);
}
@@ -195,17 +187,17 @@ const SurveyContent = (props) => {
const handleSave = async () => {
const values = form.getFieldsValue();
const payload = [];
- for (const [key, typeCode] of Object.entries(ATTACH_TYPE)) {
- const fileList = values[typeCode] || [];
+ for (const s of STAGES) {
+ const fileList = values[s.key] || [];
const validFiles = fileList.filter((f) => f.status === "done" && f.url);
if (validFiles.length === 0) {
- setActiveStage(key);
- message.warning(`请先在"${STAGES.find((s) => s.key === key).label}"步骤上传附件`);
+ setActiveStage(s.key);
+ message.warning(`请先在"${s.label}"步骤上传附件`);
return;
}
payload.push({
projectId,
- attachTypeCode: typeCode,
+ attachTypeCode: s.key,
fileUrl: JSON.stringify(fileList),
});
}
@@ -225,21 +217,21 @@ const SurveyContent = (props) => {
items={STAGES.map((s) => ({ title: s.label }))}
/>
- {activeStage === "notice" && }
- {activeStage === "inspection" && }
- {activeStage === "rectification" && (
+ {activeStage === "PRACTICE_NOTIFICATION" && }
+ {activeStage === "SITE_INSPECTION_FORM" && }
+ {activeStage === "RECTIFICATION_NOTICE" && (
)}
- {activeStage === "enterprise" && (
+ {activeStage === "ENTERPRISE_RECTIFICATION" && (
)}
- {activeStage === "review" && (
+ {activeStage === "RECTIFICATION_REVIEW" && (
{
)}