Commit 2aba834e authored by tangwei's avatar tangwei

修改bug

parent 1eb9e130
...@@ -65,7 +65,7 @@ const fireEquipmentTableColumns = self => { ...@@ -65,7 +65,7 @@ const fireEquipmentTableColumns = self => {
width: '3%' width: '3%'
}, },
{ {
title: '建/构筑物', title: '6',
dataIndex: 'riskSourceName', dataIndex: 'riskSourceName',
key: 'riskSourceName', key: 'riskSourceName',
width: '8%' width: '8%'
......
...@@ -368,6 +368,13 @@ ...@@ -368,6 +368,13 @@
.amos-form-item { .amos-form-item {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
.amos-modal-container .amos-modal-content {
padding: 5px;
}
.point-model .point-model-left .point-model-table .ant-table-pagination {
margin: 8px 0;
float: left;
}
.amos-radio-disabled { .amos-radio-disabled {
.amos-radio-status { .amos-radio-status {
......
...@@ -184,6 +184,7 @@ class AmosGridTable extends Component { ...@@ -184,6 +184,7 @@ class AmosGridTable extends Component {
if (operateCol){ if (operateCol){
columns[columns.length - 1].render = (text,record) => this.addOperateCol(text,record); columns[columns.length - 1].render = (text,record) => this.addOperateCol(text,record);
} }
debugger
let tepmPage = Object.assign({ let tepmPage = Object.assign({
size: 'small', size: 'small',
total: totals, total: totals,
...@@ -192,8 +193,8 @@ class AmosGridTable extends Component { ...@@ -192,8 +193,8 @@ class AmosGridTable extends Component {
onShowSizeChange: this.onSizeChange, onShowSizeChange: this.onSizeChange,
onChange: this.onPaginationChange, onChange: this.onPaginationChange,
maxSeries:4, maxSeries:4,
showSizeChanger: true, showSizeChanger: true
showTotal: this.showTotal // showTotal: this.showTotal
}, pagination); }, pagination);
let _tempPagination = isPageable === false ? false : tepmPage; let _tempPagination = isPageable === false ? false : tepmPage;
let bordered = true; let bordered = true;
......
...@@ -3,10 +3,9 @@ import formatUrl from 'amos-processor/lib/utils/urlFormat'; ...@@ -3,10 +3,9 @@ import formatUrl from 'amos-processor/lib/utils/urlFormat';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Store } from 'amos-tool'; import { Store } from 'amos-tool';
import SysConsts from 'amos-processor/lib/config/consts'; import SysConsts from 'amos-processor/lib/config/consts';
import { Select, Button, Input, Upload, message } from 'amos-framework'; import { Select, Button, Input, Upload,Icon, message } from 'amos-framework';
import BizIcon from './../../../../common/icon/BizIcon'; import BizIcon from './../../../../common/icon/BizIcon';
import { FasSerUrl } from './../../../../../consts/urlConsts'; import { FasSerUrl } from './../../../../../consts/urlConsts';
const Option = Select.Option; const Option = Select.Option;
const lsTool = Store.lsTool; const lsTool = Store.lsTool;
...@@ -113,6 +112,8 @@ class FireEquipmentToolBar extends Component { ...@@ -113,6 +112,8 @@ class FireEquipmentToolBar extends Component {
enableEdit && enableEdit &&
( (
<div className="fire-truck-buttons"> <div className="fire-truck-buttons">
<Button title="导出模板" icon={<Icon icon="ccgl-chukucaozuo-13" prefix="amosicon" color="rgb(52, 95, 166)" />} transparent onClick={() => this.props.downloadTemp('model')} />
<Upload {...uploadProps}> <Upload {...uploadProps}>
<Button icon={<BizIcon icon="daoru" />} transparent /> <Button icon={<BizIcon icon="daoru" />} transparent />
</Upload> </Upload>
......
...@@ -8,8 +8,10 @@ import { deleteFireEquipmentAction, addFireEquipmentAction } from './../../../.. ...@@ -8,8 +8,10 @@ import { deleteFireEquipmentAction, addFireEquipmentAction } from './../../../..
import FireEquipmentModel from './FireEquipmentModel'; import FireEquipmentModel from './FireEquipmentModel';
import FireEquipmentToolBar from './FireEquipmentToolBar'; import FireEquipmentToolBar from './FireEquipmentToolBar';
import BizIcon from './../../../../common/icon/BizIcon'; import BizIcon from './../../../../common/icon/BizIcon';
import { downLoadFilePost } from './../../../../../utils/FileUtils';
const EquipClassifyEnum = { 0: '设备类', 1: '耗材类', 2: '视频监控', 3: '灭火器材' }; const EquipClassifyEnum = { 0: '设备类', 1: '耗材类', 2: '视频监控', 3: '灭火器材' };
import { FasSerUrl } from './../../../../../consts/urlConsts';
import formatUrl from 'amos-processor/lib/utils/urlFormat';
const fireEquipmentTableColumns = self => { const fireEquipmentTableColumns = self => {
return [ return [
{ {
...@@ -331,6 +333,16 @@ class FireEquipmentView extends Component { ...@@ -331,6 +333,16 @@ class FireEquipmentView extends Component {
import = () => { import = () => {
} }
downLoadExeclFile = (exportType) => {
const { searchParam } = this.state;
let modelName = 'equipment';
let url = formatUrl(FasSerUrl.exportExcelFireEquipmentPointUrl, { exportType, modelName });
let queryParamMap = {};
Object.assign(queryParamMap, searchParam);
queryParamMap.pageSize = -1;
downLoadFilePost(url, queryParamMap);
}
getToolButton = () => { getToolButton = () => {
let buttonArr = new Array(); let buttonArr = new Array();
...@@ -433,6 +445,7 @@ class FireEquipmentView extends Component { ...@@ -433,6 +445,7 @@ class FireEquipmentView extends Component {
getTableListData={getTableListData} getTableListData={getTableListData}
pageConfig={this.pageConfig} pageConfig={this.pageConfig}
enableEdit={_true_} enableEdit={_true_}
downloadTemp={this.downLoadExeclFile}
/> />
<AmosGridTable <AmosGridTable
rowKey="id" rowKey="id"
......
...@@ -95,6 +95,10 @@ class AccidentType extends Component { ...@@ -95,6 +95,10 @@ class AccidentType extends Component {
AmosAlert.warning('提示', '请先点击选择编辑的行'); AmosAlert.warning('提示', '请先点击选择编辑的行');
return; return;
} else { } else {
if(selectedRows.length >1){
AmosAlert.warning('提示', '请选择一行');
return;
}
this.setState({ modal: true, toolBarFlag }); this.setState({ modal: true, toolBarFlag });
} }
} else if (toolBarFlag == '3') { } else if (toolBarFlag == '3') {
......
...@@ -82,13 +82,17 @@ const getDColumns = () => { ...@@ -82,13 +82,17 @@ const getDColumns = () => {
class EvaModel extends Component { class EvaModel extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
selectedRows: [], selectedRows: [],
selectedRowKeys: [] selectedRowKeys: [],
pagination: true,
}; };
} }
componentWillMount(){ componentWillMount(){
}; };
...@@ -113,18 +117,46 @@ class EvaModel extends Component { ...@@ -113,18 +117,46 @@ class EvaModel extends Component {
render() { render() {
let { totalCount } = this.state; debugger
let { totalCount,pagination } = this.state;
let { dataList } = this.props; let { dataList } = this.props;
let s=0;
let o=0;
let d=0;
if(dataList.S){
s=dataList.S.length
}
if(dataList.D){
d= dataList.D.length
}
if(dataList.O){
o= dataList.O.length
}
let defaultPageConfigs = {
current: 1,
pageSize: s
};
let defaultPageConfig0 = {
current: 1,
pageSize: o
};
let defaultPageConfigd = {
current: 1,
pageSize: d
};
return ( return (
<div className='eva-model' > <div className='eva-model' >
<div className='eva-model-S' > <div className='eva-model-S' >
<CardPane title="危险程度(S)评分标准" style={{ width: '100%' }}> <CardPane title="危险程度(S)评分标准" style={{ width: '100%' }}>
<AmosGridTable <AmosGridTable
columns={getSColumns()} columns={getSColumns()}
isPageable={pagination}
callBack={this.reload} callBack={this.reload}
dataList={dataList.S || []} dataList={dataList.S || []}
isChecked={false} isChecked={false}
totals={totalCount} totals={s}
defaultPageConfig={defaultPageConfigs}
getTableDataAction={()=>{}} getTableDataAction={()=>{}}
onRowDoubleClick={this.onRowDoubleClick} onRowDoubleClick={this.onRowDoubleClick}
/> />
...@@ -133,10 +165,12 @@ class EvaModel extends Component { ...@@ -133,10 +165,12 @@ class EvaModel extends Component {
<div className='eva-model-O' > <div className='eva-model-O' >
<CardPane title="故障频数(O)评分标准" style={{ width: '100%' }}> <CardPane title="故障频数(O)评分标准" style={{ width: '100%' }}>
<AmosGridTable <AmosGridTable
defaultPageConfig={defaultPageConfig0}
columns={getOColumns()} columns={getOColumns()}
isPageable={pagination}
callBack={this.reload} callBack={this.reload}
dataList={dataList.O || []} dataList={dataList.O || []}
totals={totalCount} totals={o}
isChecked={false} isChecked={false}
getTableDataAction={()=>{}} getTableDataAction={()=>{}}
onRowDoubleClick={this.onRowDoubleClick} onRowDoubleClick={this.onRowDoubleClick}
...@@ -146,11 +180,13 @@ class EvaModel extends Component { ...@@ -146,11 +180,13 @@ class EvaModel extends Component {
<div className='eva-model-D' > <div className='eva-model-D' >
<CardPane title="管控度(D)评分标准" style={{ width: '100%' }}> <CardPane title="管控度(D)评分标准" style={{ width: '100%' }}>
<AmosGridTable <AmosGridTable
defaultPageConfig={defaultPageConfigd}
columns={getDColumns()} columns={getDColumns()}
isPageable={pagination}
callBack={this.reload} callBack={this.reload}
dataList={dataList.D || []} dataList={dataList.D || []}
isChecked={false} isChecked={false}
totals={totalCount} totals={d}
getTableDataAction={()=>{}} getTableDataAction={()=>{}}
onRowDoubleClick={this.onRowDoubleClick} onRowDoubleClick={this.onRowDoubleClick}
/> />
......
...@@ -90,6 +90,10 @@ class RiskFactor extends Component { ...@@ -90,6 +90,10 @@ class RiskFactor extends Component {
AmosAlert.warning('提示', '请先点击选择编辑的行'); AmosAlert.warning('提示', '请先点击选择编辑的行');
return; return;
} else { } else {
if(selectedRows.length >1){
AmosAlert.warning('提示', '请选择一行');
return;
}
this.setState({ modal: true, toolBarFlag }); this.setState({ modal: true, toolBarFlag });
} }
} else if (toolBarFlag === '3') { } else if (toolBarFlag === '3') {
......
...@@ -74,7 +74,17 @@ class RiskLevelModel extends Component { ...@@ -74,7 +74,17 @@ class RiskLevelModel extends Component {
this.form.validate((valid, dataValues) => { this.form.validate((valid, dataValues) => {
if (valid) { if (valid) {
let { form } = this.state; let { form } = this.state;
this.riskLevelEdit(form);
if(form.topLimit<form.downLimit){
AmosAlert.error('提示', '上线不能低于下限!');
return false;
}else{
this.riskLevelEdit(form);
}
} else { } else {
return false; return false;
} }
......
...@@ -123,6 +123,10 @@ class RiskLevel extends Component { ...@@ -123,6 +123,10 @@ class RiskLevel extends Component {
AmosAlert.warning('提示', '请先点击选择编辑的行'); AmosAlert.warning('提示', '请先点击选择编辑的行');
return; return;
} else { } else {
if(selectedRows.length >1){
AmosAlert.warning('提示', '请选择一行');
return;
}
this.setState({ modal: true, toolBarFlag }); this.setState({ modal: true, toolBarFlag });
} }
} else if (toolBarFlag == '3') { } else if (toolBarFlag == '3') {
......
...@@ -236,8 +236,10 @@ class RiskModel extends Component { ...@@ -236,8 +236,10 @@ class RiskModel extends Component {
this.setState({ this.setState({
code: data.code, code: data.code,
level: data.level, level: data.level,
rpni: data.rpni rpni: data.rpni,
node:data
}); });
}); });
} }
...@@ -342,6 +344,7 @@ class RiskModel extends Component { ...@@ -342,6 +344,7 @@ class RiskModel extends Component {
}; };
onOk = (modelFlag, toolBarFlag) =>{ onOk = (modelFlag, toolBarFlag) =>{
debugger
const { form, selectData } = this.model.state; const { form, selectData } = this.model.state;
const { riskSourceId, fmeaId } = this.state; const { riskSourceId, fmeaId } = this.state;
if (modelFlag === 'risk') { if (modelFlag === 'risk') {
...@@ -505,11 +508,11 @@ class RiskModel extends Component { ...@@ -505,11 +508,11 @@ class RiskModel extends Component {
} }
getDeteleConfirmByLength =(length)=>{ getDeteleConfirmByLength =(length)=>{
if (length > 0){ // if (length > 0){
return '是否同步删除下层级所有节点'; // return '是否同步删除下层级所有节点';
} else { // } else {
return '确定要删除么'; return '确定要删除么';
} // }
} }
riskSourceDelete =(id, length)=>{ riskSourceDelete =(id, length)=>{
...@@ -920,7 +923,7 @@ class RiskModel extends Component { ...@@ -920,7 +923,7 @@ class RiskModel extends Component {
visible={modal} visible={modal}
className="risk-model-model" className="risk-model-model"
destroyContent destroyContent
width={modelFlag === 'equip' ? '70%' : '50%'} width={modelFlag === 'equip' ? '70%' : '60%'}
content={this.getContext(modelFlag, toolBarFlag)} content={this.getContext(modelFlag, toolBarFlag)}
onCancel={() => this.cancel()} onCancel={() => this.cancel()}
onOk={() => this.onOk(modelFlag, toolBarFlag)} onOk={() => this.onOk(modelFlag, toolBarFlag)}
......
...@@ -232,7 +232,7 @@ class PointModel extends Component { ...@@ -232,7 +232,7 @@ class PointModel extends Component {
<div className="point-model"> <div className="point-model">
<div className="point-model-left"> <div className="point-model-left">
<div className="point-model-title"> <div className="point-model-title">
<span>责任部门:</span> <span>责任部门555</span>
<Select <Select
className="point-model_select" className="point-model_select"
data={deptData} data={deptData}
......
...@@ -24,7 +24,7 @@ class RiskFactorModel extends Component { ...@@ -24,7 +24,7 @@ class RiskFactorModel extends Component {
riskFactorData: [], riskFactorData: [],
userData: [], userData: [],
rules: { rules: {
riskFactorIds: [{ required: true, message: '危险因素不能为空' }] riskFactorsId: [{ required: true, message: '危险因素不能为空' }]
} }
}; };
} }
...@@ -119,7 +119,8 @@ class RiskFactorModel extends Component { ...@@ -119,7 +119,8 @@ class RiskFactorModel extends Component {
<span className="fmea-item-span">危险有害因素:</span> <span className="fmea-item-span">危险有害因素:</span>
<Divider /> <Divider />
<FormItem label={<span>危险因素</span>} className="fmea-item-risk-factor" field="riskFactorsId" {...formItemLayout}> <FormItem label={<span>危险因素</span>} className="fmea-item-risk-factor" field="riskFactorsId" {...formItemLayout}>
<div className="risk-factor-select" style={{ height: '200px' }} > {/* <div className="risk-factor-select" style={{ height: '200px' }} > */}
<div className="risk-factor-select" >
<MultiSelect <MultiSelect
className="fmea-model-select" className="fmea-model-select"
data={riskFactorData} data={riskFactorData}
......
...@@ -40,6 +40,7 @@ class RiskSourceModel extends Component { ...@@ -40,6 +40,7 @@ class RiskSourceModel extends Component {
} }
componentWillMount = () => { componentWillMount = () => {
debugger
let { form } = this.state; let { form } = this.state;
let { selectedRow } = this.props; let { selectedRow } = this.props;
if (selectedRow) { if (selectedRow) {
...@@ -66,9 +67,10 @@ class RiskSourceModel extends Component { ...@@ -66,9 +67,10 @@ class RiskSourceModel extends Component {
}; };
componentWillReceiveProps = (nextProps) => { componentWillReceiveProps = (nextProps) => {
debugger
let { form } = this.state; let { form } = this.state;
let { selectedRow } = nextProps; let { selectedRow } = nextProps;
if (selectedRow && form.id !== selectedRow.id) { // if (selectedRow && form.id !== selectedRow.id) {
form.id = selectedRow.id; form.id = selectedRow.id;
form.name = selectedRow.name; form.name = selectedRow.name;
form.code = selectedRow.code; form.code = selectedRow.code;
...@@ -80,7 +82,7 @@ class RiskSourceModel extends Component { ...@@ -80,7 +82,7 @@ class RiskSourceModel extends Component {
form.floor3d = selectedRow.floor3d; form.floor3d = selectedRow.floor3d;
form.isIndoor = selectedRow.isIndoor; form.isIndoor = selectedRow.isIndoor;
this.setState({ form, isEdit: true }); this.setState({ form, isEdit: true });
} // }
} }
onSelectChange = (key, value) => { onSelectChange = (key, value) => {
......
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