Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-convertor-view
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
amos-convertor-view
Commits
754e81a6
Commit
754e81a6
authored
May 25, 2020
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加前端提醒信息判断
parent
5445a432
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
payload.js
src/utils/payload.js
+4
-5
FireTruckDetailInfo.js
...mentLedger/FireResources/FireTruck/FireTruckDetailInfo.js
+5
-1
FireStationMatches.js
...Ledger/FireResources/matchEquipment/FireStationMatches.js
+9
-5
No files found.
src/utils/payload.js
View file @
754e81a6
...
...
@@ -3,15 +3,14 @@ export default function(data, delRequest){
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
data
)
{
if
(
data
.
dataList
||
data
.
dataList
===
null
){
if
(
data
.
result
===
'SUCCESS'
){
if
(
data
.
result
===
'SUCCESS'
){
resolve
(
data
.
dataList
);
}
else
{
resolve
(
data
.
result
);
}
else
{
resolve
(
data
);
}
}
else
if
(
data
.
result
||
data
.
result
===
null
){
resolve
(
data
.
result
);
}
else
{
}
else
{
resolve
(
data
);
}
}
else
{
...
...
src/view/bizview/equipmentLedger/FireResources/FireTruck/FireTruckDetailInfo.js
View file @
754e81a6
...
...
@@ -205,7 +205,11 @@ class FireTruckDetailInfo extends Component {
body: formData
})
.then(e => {
AmosAlert.success('
提示
', '
保存成功
');
if (e.status === 200){
AmosAlert.success('
提示
', '
保存成功
');
} else {
AmosAlert.error('
错误
', '
保存失败
');
}
this.goBack();
})
.catch(e => {
...
...
src/view/bizview/equipmentLedger/FireResources/matchEquipment/FireStationMatches.js
View file @
754e81a6
...
...
@@ -181,7 +181,7 @@ class FireStationMatches extends Component {
});
});
}
};
getPanelHeight
=
()
=>
{
...
...
@@ -269,7 +269,7 @@ class FireStationMatches extends Component {
}
);
}
}
}
});
...
...
@@ -302,7 +302,7 @@ class FireStationMatches extends Component {
let
bindObj
=
[];
for
(
let
i
=
0
;
i
<
selectedRowKeys
.
length
;
i
++
)
{
let
obj
=
{};
type
===
'fireStation'
?
obj
.
fireStationId
=
fireStationId
:
obj
.
waterResourceId
=
fireStationId
;
obj
.
fireEquipmentId
=
selectedRowKeys
[
i
];
obj
.
number
=
numberInStation
[
obj
.
fireEquipmentId
]
?
numberInStation
[
obj
.
fireEquipmentId
]
:
1
;
...
...
@@ -313,7 +313,11 @@ class FireStationMatches extends Component {
if
(
type
===
'fireStation'
){
bindFireStationMatchesAction
(
bindObj
).
then
(
data
=>
{
AmosAlert
.
success
(
'提示'
,
'添加装备成功'
);
if
(
data
.
result
===
'SUCCESS'
){
AmosAlert
.
success
(
'提示'
,
'添加装备成功'
);
}
else
if
(
data
.
result
===
'FAILURE'
){
AmosAlert
.
error
(
'错误'
,
data
.
message
);
}
this
.
state
.
reload
();
},
err
=>
{
...
...
@@ -331,7 +335,7 @@ class FireStationMatches extends Component {
}
);
}
}
this
.
setState
({
enableAddOp
:
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment