diff --git a/src/pages/Container/MonitorManage/RiskCenter/index.less b/src/pages/Container/MonitorManage/RiskCenter/index.less
index 00ae4e2..d26e28e 100644
--- a/src/pages/Container/MonitorManage/RiskCenter/index.less
+++ b/src/pages/Container/MonitorManage/RiskCenter/index.less
@@ -1,65 +1,4 @@
.risk-center {
- // 统计卡片网格
- .stat-grid.cols-4 {
- display: grid;
- grid-template-columns: repeat(4, 1fr);
- gap: 16px;
- margin-bottom: 10px;
- }
-
- // 统计卡片
- .stat-card {
- background: #fff;
- border: 1px solid #e2e8f0;
- border-radius: 8px;
- padding: 12px;
- display: flex;
- justify-content: space-between;
-
- .stat-info {
- .stat-label {
- font-size: 16px;
- color: #64748b;
- }
-
- .stat-value {
- font-size: 20px;
- font-weight: 700;
- line-height: 1.15;
- margin-top: 6px;
- }
-
- .stat-value--high {
- color: #dc2626;
- }
-
- .stat-value--mid {
- color: #d97706;
- }
-
- .stat-value--ok {
- color: #059669;
- }
-
- .stat-hint {
- font-size: 16px;
- color: #64748b;
- margin-top: 4px;
- }
- }
-
- .stat-icon {
- width: 38px;
- height: 38px;
- border-radius: 10px;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 18px;
- flex-shrink: 0;
- }
- }
-
// 来源说明/规则提示
.source-note {
background: #f8fafc;
diff --git a/src/pages/Container/MonitorManage/SurveyMonitor/index.js b/src/pages/Container/MonitorManage/SurveyMonitor/index.js
index 3d787aa..a813c4d 100644
--- a/src/pages/Container/MonitorManage/SurveyMonitor/index.js
+++ b/src/pages/Container/MonitorManage/SurveyMonitor/index.js
@@ -1,9 +1,5 @@
import React, { useState, useEffect } from "react";
import {
- Row,
- Col,
- Card,
- Statistic,
Table,
Tag,
Button,
@@ -21,6 +17,7 @@ import { DownloadOutlined } from "@ant-design/icons";
import * as XLSX from "xlsx";
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
import SearchForm from "~/components/SearchForm";
+import StatCardGroup from "~/components/StatCardGroup";
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
@@ -150,10 +147,30 @@ const roleText = (v) => {
};
const STAT_ITEMS = [
- { key: "notificationArchivedCount", title: "告知书已归档", color: "#1677ff" },
- { key: "clockInNormalCount", title: "人员打卡正常", color: "#52c41a" },
- { key: "notificationAbnormalCount", title: "告知异常", color: "#faad14" },
- { key: "clockInAbnormalCount", title: "打卡异常", color: "#ff4d4f" },
+ {
+ key: "notificationArchivedCount",
+ title: "告知书已归档",
+ valueColor: "#1677ff",
+
+ },
+ {
+ key: "clockInNormalCount",
+ title: "人员打卡正常",
+ valueColor: "#52c41a",
+
+ },
+ {
+ key: "notificationAbnormalCount",
+ title: "告知异常",
+ valueColor: "#faad14",
+
+ },
+ {
+ key: "clockInAbnormalCount",
+ title: "打卡异常",
+ valueColor: "#ff4d4f",
+
+ },
];
/** 解析文件 JSON */
@@ -457,19 +474,9 @@ const SurveyMonitor = (props) => {
return (
-
- {STAT_ITEMS.map((item) => (
-
-
-
-
-
- ))}
-
+ ({ ...item, value: statData[item.key] }))}
+ />
{
open={detailModalVisible}
onCancel={() => setDetailModalVisible(false)}
footer={null}
- width={680}
+ width={800}
destroyOnHide={true}
>
{currentRecord && (
-
+
{currentRecord.id}
{currentRecord.supervisorContact || "-"}
{currentRecord.contactPhone || "-"}
diff --git a/src/pages/Container/QualificationReview/FilingTabs/index.js b/src/pages/Container/QualificationReview/FilingTabs/index.js
index a00b520..bbb6e20 100644
--- a/src/pages/Container/QualificationReview/FilingTabs/index.js
+++ b/src/pages/Container/QualificationReview/FilingTabs/index.js
@@ -444,7 +444,7 @@ const FilingTabs = ({
{ title: "序号", width: 60, render: (_, __, i) => i + 1 },
{ title: "装备名称", dataIndex: "deviceName", ellipsis: true },
{ title: "规格型号", dataIndex: "deviceModel", ellipsis: true },
- { title: "生产厂家", dataIndex: "manufacturer" },
+ { title: "生产厂家", dataIndex: "manufacturer",ellipsis: true },
{
title: "计量检定情况",
width: 120,
diff --git a/src/pages/Container/QualificationReview/SiteReviewNotice/index.js b/src/pages/Container/QualificationReview/SiteReviewNotice/index.js
index 55e2566..469857b 100644
--- a/src/pages/Container/QualificationReview/SiteReviewNotice/index.js
+++ b/src/pages/Container/QualificationReview/SiteReviewNotice/index.js
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
import dayjs from "dayjs";
-import { Form, Table, Button, Modal, Input, Select, DatePicker, Card, Row, Col, Statistic, message, Tag } from "antd";
+import { Form, Table, Button, Modal, Input, Select, DatePicker, Row, Col, message, Tag } from "antd";
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
import SearchForm from "~/components/SearchForm";
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
@@ -11,6 +11,7 @@ import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { ON_SITE_REVIEW_STATUS_MAP } from "~/enumerate/constant";
import AttachmentUpload from "~/components/AttachmentUpload";
+import StatCardGroup from "~/components/StatCardGroup";
const { router } = tools;
@@ -42,7 +43,6 @@ const SiteReviewNotice = (props) => {
qualOnSiteReviewStats = {},
orgSelectList = [],
siteReviewNoticeLoading,
- siteReviewStatisticsLoading,
siteReviewSaveLoading,
siteReviewResultLoading,
} = qualReview || {};
@@ -227,26 +227,40 @@ const SiteReviewNotice = (props) => {
>
-
-
-
-
- {qualOnSiteReviewStats.annualCumulativeCount ?? 0} 条本年度累计
-
-
-
-
-
- 未来30日内
-
-
-
-
-
- 审查结果已归档
-
-
-
+
{
return (
-
-
-
- 按行业周期和属地要求维护}
- />
-
-
-
-
- 到期前6个月启动商务对接}
- />
-
-
-
-
- 到期前3个月正式委托启动}
- />
-
-
-
-
- 到期前1个月加快编制评审}
- />
-
-
-
+
提醒时间规则：
diff --git a/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.less b/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.less
index b7a94bc..872e8d2 100644
--- a/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.less
+++ b/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.less
@@ -5,15 +5,6 @@
margin-bottom: 16px;
}
- &-stat-row {
- margin-bottom: 16px;
- }
-
- &-stat-suffix {
- font-size: 14px;
- color: #999;
- }
-
&-note {
padding: 8px 12px;
background: #f6f8fa;
diff --git a/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js b/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js
index dd0a272..ec6675c 100644
--- a/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js
+++ b/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js
@@ -891,7 +891,7 @@ const EvalReportLibrary = (props) => {
okText="确认上传"
cancelText="取消"
width={820}
- destroyOnClose
+ destroyOnHidden
className="erl-upload-modal"
>