diff --git a/src/api/biStatistics/index.js b/src/api/biStatistics/index.js
index a642052..1bac333 100644
--- a/src/api/biStatistics/index.js
+++ b/src/api/biStatistics/index.js
@@ -116,9 +116,9 @@ export const getSensorDeviceFireSituation = declareRequest(
"getSensorDeviceFireSituationLoading",
"Post > @/iotalarm/sensorDevice/fireSituation",
);
-export const getFireBrigadeMemberScreenList = declareRequest(
- "getFireBrigadeMemberScreenListLoading",
- "Post > @/fireAlarm/fireBrigade/member/screen/list",
+export const getRescueTeamScreenList = declareRequest(
+ "getRescueTeamScreenListLoading",
+ "Post > @/fireResource/rescueTeam/screenList",
);
export const getPrimeportMkmjStatistics = declareRequest(
"getPrimeportMkmjStatisticsLoading",
diff --git a/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/DepartmentResponsibilityPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/DepartmentResponsibilityPanel/index.js
index 1777676..8b67ea1 100644
--- a/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/DepartmentResponsibilityPanel/index.js
+++ b/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/DepartmentResponsibilityPanel/index.js
@@ -22,6 +22,7 @@ function DepartmentResponsibilityPanel(props) {
color: ["#7d4449", "#009944", "#167ce4", "#00ffff"],
tooltip: {
trigger: "axis",
+ valueFormatter: value => `${value}%`,
},
legend: {
textStyle: {
diff --git a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.js
index 7ad5945..68970c5 100644
--- a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.js
+++ b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.js
@@ -35,7 +35,6 @@ function FireAlarmRecordPanel(props) {
报警设备
报警时间
报警区域
- 状态
处置状态
@@ -53,7 +52,6 @@ function FireAlarmRecordPanel(props) {
{item.sensorName}
{item.alarmTime}
{item.fireRegionName}
-
{item.sensorStatusName}
{disposalStatus[item.status]}
))}
diff --git a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.module.less b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.module.less
index 278d990..ba5ae3b 100644
--- a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.module.less
+++ b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/FireAlarmRecordPanel/index.module.less
@@ -17,7 +17,7 @@
.branchOfficeFireAlarmRecord__row {
display: grid;
- grid-template-columns: 1.5fr 2fr 1fr 1fr 1fr;
+ grid-template-columns: 1.5fr 2fr 1fr 1fr;
margin-top: 5px;
background-color: rgba(17, 51, 112, 0.8);
}
diff --git a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/VolunteerFireTeamPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/VolunteerFireTeamPanel/index.js
index c59bb49..106507f 100644
--- a/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/VolunteerFireTeamPanel/index.js
+++ b/src/pages/Container/Map/components/Content/branchOffice/XiaoFang/VolunteerFireTeamPanel/index.js
@@ -14,12 +14,14 @@ function VolunteerFireTeamPanel(props) {
useEffect(() => {
const loadData = async () => {
- const { data } = await props.getFireBrigadeMemberScreenList({
+ const { data } = await props.getRescueTeamScreenList({
portArea,
corpinfoId: currentBranchOffice,
pageIndex: 1,
pageSize: 99,
+ teamType: "volunteer_rescue",
});
+ console.log(data);
setData(data || []);
};
loadData();
@@ -34,22 +36,22 @@ function VolunteerFireTeamPanel(props) {
消防队名称
-
姓名
-
年龄
-
手机号
+
类型
+
队长
+
所属区域或范围
-
+
{data.map((item, index) => (
-
{item.brigadeName}
-
{item.userName}
-
{item.age}
-
{item.phone}
+
{item.teamName}
+
{item.teamTypeName}
+
{item.captainName}
+
{item.regionScopeName}
))}