Commit 04f979a1 authored by superman's avatar superman

1.3.6-2

parent 7aaa047b
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// - https://github.com/dora-js/dora-plugin-proxy#规则定义 // - https://github.com/dora-js/dora-plugin-proxy#规则定义
module.exports = { module.exports = {
// '/api/*': 'http://react.yanky.cn/', '/api/*': 'http://react.yanky.cn/',
'/api/*': 'http://192.168.1.126:8080/', // '/api/*': 'http://192.168.1.126:8080/',
// '/api/*': 'http://localhost:8080/' // '/api/*': 'http://localhost:8080/'
}; };
...@@ -73,7 +73,7 @@ export default class HeaderOperation extends Component { ...@@ -73,7 +73,7 @@ export default class HeaderOperation extends Component {
} }
}; };
const operations = buttons.length ? ( const operations = (buttons && buttons.length) ? (
<Button.Group> <Button.Group>
{ {
buttons.map(button=> { buttons.map(button=> {
......
...@@ -116,14 +116,27 @@ export default class ShouyiYongjingForm extends Component { ...@@ -116,14 +116,27 @@ export default class ShouyiYongjingForm extends Component {
Object.keys(formData).forEach(key=> { Object.keys(formData).forEach(key=> {
if (/^[\d]+$/g.test(key)) { if (/^[\d]+$/g.test(key)) {
const d = formData[key]; const d = formData[key];
commissionAlg.push({ const dr = {
min: d.min, min: String(d.min).trim(),
max: d.max, max: String(d.max).trim(),
result: { result: {
yj: d.yj, yj: String(d.yj).trim(),
sy: d.sy sy: String(d.sy).trim()
} }
}); };
if(!dr.min){
delete dr.min;
}
if(!dr.max){
delete dr.max;
}
if(!dr.result.yj){
delete dr.result.yj;
}
if(!dr.result.sy){
delete dr.result.sy;
}
commissionAlg.push(dr);
} else { } else {
data[key] = formData[key]; data[key] = formData[key];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment