bug:19948、19947、19942、19946

master
LiuJiaNan 2026-08-06 10:21:50 +08:00
parent c53843128c
commit 6cb130a75d
5 changed files with 16 additions and 15 deletions

View File

@ -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",

View File

@ -22,6 +22,7 @@ function DepartmentResponsibilityPanel(props) {
color: ["#7d4449", "#009944", "#167ce4", "#00ffff"],
tooltip: {
trigger: "axis",
valueFormatter: value => `${value}%`,
},
legend: {
textStyle: {

View File

@ -35,7 +35,6 @@ function FireAlarmRecordPanel(props) {
<div>报警设备</div>
<div>报警时间</div>
<div>报警区域</div>
<div>状态</div>
<div>处置状态</div>
</div>
<div className={styles.branchOfficeFireAlarmRecord__body}>
@ -53,7 +52,6 @@ function FireAlarmRecordPanel(props) {
<div>{item.sensorName}</div>
<div>{item.alarmTime}</div>
<div>{item.fireRegionName}</div>
<div>{item.sensorStatusName}</div>
<div>{disposalStatus[item.status]}</div>
</div>
))}

View File

@ -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);
}

View File

@ -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) {
<div className={styles.branchOfficeVolunteerFireTeam__table}>
<div className={styles.branchOfficeVolunteerFireTeam__row}>
<div>消防队名称</div>
<div>姓名</div>
<div>年龄</div>
<div>手机号</div>
<div>类型</div>
<div>队长</div>
<div>所属区域或范围</div>
</div>
<div className={styles.branchOfficeVolunteerFireTeam__body}>
<Spin spinning={props.biStatistics.getFireBrigadeMemberScreenListLoading}>
<Spin spinning={props.biStatistics.getRescueTeamScreenListLoading}>
<SeamlessScroll list={data} step={0.5}>
{data.map((item, index) => (
<div
className={styles.branchOfficeVolunteerFireTeam__row}
key={index}
>
<div>{item.brigadeName}</div>
<div>{item.userName}</div>
<div>{item.age}</div>
<div>{item.phone}</div>
<div>{item.teamName}</div>
<div>{item.teamTypeName}</div>
<div>{item.captainName}</div>
<div>{item.regionScopeName}</div>
</div>
))}
</SeamlessScroll>