From 82d8a2c7f6391cf93430ddb4cc63be9092ebcb23 Mon Sep 17 00:00:00 2001
From: tangjie <122778500@qq.com>
Date: Wed, 29 Jul 2026 18:23:45 +0800
Subject: [PATCH] feat
---
jjb.config.js | 4 ++--
.../EvalProjectMonitor/Detail/index.js | 18 ++++++++++++++++--
.../MonitorManage/SurveyMonitor/index.js | 18 ++++++++++++++++--
.../ProjectFlow/SurveyContent.js | 18 +++++++++++++++---
4 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/jjb.config.js b/jjb.config.js
index 986ebec..054f850 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -10,9 +10,9 @@ module.exports = {
javaGitBranch: "dev",
// 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095）
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
- //API_HOST: "https://gbs-gateway.qhdsafety.com",
+ API_HOST: "https://gbs-gateway.qhdsafety.com",
- API_HOST: "http://192.168.0.152",
+ //API_HOST: "http://192.168.0.152",
//API_HOST: "http://192.168.0.150", //太浅
// API_HOST: "http://192.168.0.152",
//API_HOST: "http://192.168.0.103", //huwei
diff --git a/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js b/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js
index ecd8a5b..e2647d9 100644
--- a/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js
+++ b/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js
@@ -9,6 +9,8 @@ import {
Empty,
Typography,
Image,
+ Popover,
+ Button,
} from "antd";
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd";
@@ -266,8 +268,20 @@ const SurveyPanel = ({ personnel, attachments, loading, detailData }) => {
dataIndex: "sceneUrl",
width: 80,
render: (v) => {
- const count = v ? v.split(",").filter(Boolean).length : 0;
- return count > 0 ? `${count}张` : "-";
+ const urls = v ? v.split(",").filter(Boolean) : [];
+ if (urls.length === 0) return "-";
+ const content = (
+
+ {urls.map((url, i) => (
+
+ ))}
+
+ );
+ return (
+
+
+
+ );
},
},
{
diff --git a/src/pages/Container/MonitorManage/SurveyMonitor/index.js b/src/pages/Container/MonitorManage/SurveyMonitor/index.js
index 5998548..11adbe2 100644
--- a/src/pages/Container/MonitorManage/SurveyMonitor/index.js
+++ b/src/pages/Container/MonitorManage/SurveyMonitor/index.js
@@ -12,6 +12,8 @@ import {
Modal,
Space,
Typography,
+ Popover,
+ Image,
} from "antd";
import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd";
import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
@@ -185,8 +187,20 @@ const SurveyMonitor = (props) => {
dataIndex: "sceneUrl",
width: 80,
render: (v) => {
- const count = v ? v.split(",").filter(Boolean).length : 0;
- return count > 0 ? `${count}张` : "-";
+ const urls = v ? v.split(",").filter(Boolean) : [];
+ if (urls.length === 0) return "-";
+ const content = (
+
+ {urls.map((url, i) => (
+
+ ))}
+
+ );
+ return (
+
+
+
+ );
},
},
{
diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
index fba7bd4..9cbf1a4 100644
--- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
+++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/SurveyContent.js
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
-import { Form, Button, Flex, Typography, Steps, Tag, Card, Table, message } from "antd";
+import { Form, Button, Flex, Typography, Steps, Tag, Card, Table, message, Popover, Image } from "antd";
import { CheckCircleFilled, DownloadOutlined } from "@ant-design/icons";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
@@ -103,8 +103,20 @@ const InspectionPanel = ({ dataSource = [], evalProjectDetailData = {} }) => {
{ title: "签退时间", dataIndex: "signOutTime" },
{ title: "在场时长", render: (_, r) => calcDuration(r.singInTime, r.signOutTime) },
{ title: "现场照片", dataIndex: "sceneUrl", render: (v) => {
- const count = v ? v.split(',').filter(Boolean).length : 0;
- return ;
+ const urls = v ? v.split(',').filter(Boolean) : [];
+ if (urls.length === 0) return ;
+ const content = (
+
+ {urls.map((url, i) => (
+
+ ))}
+
+ );
+ return (
+
+
+
+ );
}},
{ title: "本人签字", dataIndex: "signatureUrl", render: (v) => {v ? "已签字" : "未签字"} },
]}