Skip to content

A
amos-convertor-view
Commit cc0215ff authored by KeYong's avatar KeYong
Browse files
Options

修改弹框提示

parent 35fbfc0c
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 95 deletions
src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js
View file @ cc0215ff
......@@ -3,14 +3,14 @@ import _amosTool from 'amos-tool';
import SysConsts from 'amos-processor/lib/config/consts';
import formatUrl from 'amos-processor/lib/utils/urlFormat';
import * as endConf from 'amos-processor/lib/config/endconf';
import { FasSerUrl } from '../../../../consts/urlConsts';
import { FasSerUrl, baseURI, FscSerUrl } from '../../../../consts/urlConsts';
import { Form, Upload, Input, Select, Radio, Modal, AmosAlert, Icon, Toast } from 'amos-framework';
import { TreeSelect } from 'amos-antd';
import PropTypes from 'amos-react-router/lib/PropTypes';
import { getEquipmentDataAction, getFireStationDataAction, getPrePlanPictureAction } from '../../../../services/ledgerService';
import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction , queryLoadPackagesAction ,buildingTreeAction } from '../../../../services/preControlService';
import { queryDeptByOrgCodeAction, getUsersByDepartmentIdAction, queryRegionTreeAction, queryLoadPackagesAction, buildingTreeAction } from '../../../../services/preControlService';
import { convertImgUrlToFile, getBase64 } from './../../../../utils/FileUtils';
import { baseURI, FscSerUrl } from '../../../../consts/urlConsts';
import { recursive } from './../../../../utils/request';
const AmosConfig = endConf.AmosConfig;
......@@ -21,7 +21,7 @@ const url = FscSerUrl.loadPackagesUrl;
const FormItem = Form.Item;
const Option = Select.Option;
const RadioGroup = Radio.Group;
const RadioGroup = Radio.Group;
const TextArea = Input.TextArea;
const param = AmosConfig.rule.packageName;
const floorData = [{ id: '1', name: '1层' }, { id: '2', name: '2层' }, { id: '3', name: '3层' }, { id: '4', name: '4层' }, { id: '5', name: '5层' }, { id: '6', name: '6层' }];
......@@ -75,7 +75,7 @@ class EquipmentModel extends Component {
componentWillMount = () => {
const { equipmentId, toolbarFlag } = this.props || {};
if (toolbarFlag === 1) {
//编辑
// 编辑
this.getEquipmentData(equipmentId);
}
this.getCommonInfo();
......@@ -84,11 +84,11 @@ class EquipmentModel extends Component {
};
getRiskSourceSecondLevel = () =>{
buildingTreeAction().then(res => {
getRiskSourceSecondLevel = () => {
buildingTreeAction().then((res) => {
let buildingList = res;
this.setState({
riskSourceData: recursive(buildingList).map(e => {
riskSourceData: recursive(buildingList).map((e) => {
if (e.groupType === 'allBuilding') {
return {
...e,
......@@ -114,14 +114,15 @@ class EquipmentModel extends Component {
let reg = /[\u4E00-\u9FA5]/g;
if (key === 'code') {
if (reg.test(value)) {
Toast.open({
content: '编码不能输入汉字',
placement: 'topMiddle'
});
// Toast.open({
// content: '编码不能输入汉字',
// placement: 'topMiddle'
// });
AmosAlert.warning('编码不能输入汉字 !');
return;
}
}
if ( typeof value !== 'boolean' ) {
if (typeof value !== 'boolean') {
form[key] = value.trim();
} else {
form[key] = value;
......@@ -132,8 +133,8 @@ class EquipmentModel extends Component {
onPeservePlanChange = (key, item) => {
const { form, prefix } = this.state;
//let value = item.project ? item.project.substring(0) + '/' + item.packageId : '' ;
let value = prefix ? `${prefix}/${item.id}` : '' ;
// let value = item.project ? item.project.substring(0) + '/' + item.packageId : '' ;
let value = prefix ? `${prefix}/${item.id}` : '';
form[key] = value;
this.setState({ form });
};
......@@ -143,7 +144,7 @@ class EquipmentModel extends Component {
form[key] = value;
if (key === 'chargeDeptId') {
let deptId = value;
getUsersByDepartmentIdAction(deptId).then(data => {
getUsersByDepartmentIdAction(deptId).then((data) => {
this.setState({ chargeUserData: data, form });
});
}
......@@ -151,8 +152,8 @@ class EquipmentModel extends Component {
}
getCommonInfo() {
//1.获取部门
queryDeptByOrgCodeAction().then(data => {
// 1.获取部门
queryDeptByOrgCodeAction().then((data) => {
this.setState({ chargeDeptData: data });
});
// //2.获取消防小室
......@@ -163,12 +164,12 @@ class EquipmentModel extends Component {
// });
}
getEquipmentData = equipmentId => {
getEquipmentData = (equipmentId) => {
const { form } = this.state;
getEquipmentDataAction(equipmentId).then(data => {
getEquipmentDataAction(equipmentId).then((data) => {
let deptId = data.chargeDeptId;
deptId &&
getUsersByDepartmentIdAction(deptId).then(data => {
getUsersByDepartmentIdAction(deptId).then((data) => {
this.setState({ chargeUserData: data });
});
this.setState({ form: { ...form, ...data } });
......@@ -176,11 +177,11 @@ class EquipmentModel extends Component {
this.getPrePlanPictureData(equipmentId);
};
getPrePlanPictureData = equipmentId => {
getPrePlanPictureAction(equipmentId, '').then(data => {
getPrePlanPictureData = (equipmentId) => {
getPrePlanPictureAction(equipmentId, '').then((data) => {
let pMap = new Map();
console.log(data);
data.forEach(ele => {
data.forEach((ele) => {
let type = ele.type;
if (type >= 1) {
pMap.set(type, ele.picture);
......@@ -191,24 +192,24 @@ class EquipmentModel extends Component {
});
};
setHavingFileToState = pictureMap => {
setHavingFileToState = (pictureMap) => {
pictureMap.forEach((value, key) => {
let pictureUrl = value;
let pictureType = key;
let fileName = value.substring(value.lastIndexOf('\\') + 1);
convertImgUrlToFile(baseURI + pictureUrl, fileName, (file) => this.callBack(file, pictureType));
convertImgUrlToFile(baseURI + pictureUrl, fileName, file => this.callBack(file, pictureType));
});
};
validPositon3d = (rule, value, callback) => {
if (value != undefined){
if (value != undefined) {
let tempArry = value.split(',') || [];
if ( tempArry && tempArry.length === 3 ){
if (tempArry && tempArry.length === 3) {
const patt = /(^([-]?)[1-9]([0-9]+)?(\.[0-9]+)?$)|(^([-]?)(0){1}$)|(^([-]?)[0-9]\.[0-9]+?$)/;
let i = 0;
for (let key of tempArry){
if (!patt.test(key)){
i = i + 1;
for (let key of tempArry) {
if (!patt.test(key)) {
i += 1;
callback('非法格式');
break;
}
......@@ -220,7 +221,6 @@ class EquipmentModel extends Component {
callback('非法格式');
}
}
}
callBack = (file, key) => {
......@@ -250,22 +250,22 @@ class EquipmentModel extends Component {
beforeUpload = (file, type) => {
let _file = file;
//1.格式校验
// 1.格式校验
const pattern = /image\/(gif|jpeg|png|jpg|bmp)$/;
const isImg = pattern.test(_file.type);
if (!isImg) {
AmosAlert.warning('请选择符合格式的图片！（gif|jpeg|png|jpg|bmp）');
return false;
}
//2.url转文件对象
// 2.url转文件对象
this.changeData(_file);
return false;
};
changeData = async file => {
changeData = async(file) => {
file.url = await getBase64(file);
let _form = this.state.form;
let { imageUrl1 = [], imageUrl2 = [], imageUrl3 = [], imageUrl4 = [],equipmentPic = [] } = this.state.form;
let { imageUrl1 = [], imageUrl2 = [], imageUrl3 = [], imageUrl4 = [], equipmentPic = [] } = this.state.form;
switch (file.mylist) {
case 'imageUrl1':
_form.imageUrl1 = [...imageUrl1, file];
......@@ -289,17 +289,16 @@ class EquipmentModel extends Component {
break;
}
// this.setState({ form: _form });
};
handlePreview = file => {
handlePreview = (file) => {
this.setState({
previewImage: file.url,
previewVisible: true
});
};
fileRemove = file => {
fileRemove = (file) => {
let { form } = this.state;
switch (file.mylist) {
case 'imageUrl1': {
......@@ -345,9 +344,9 @@ class EquipmentModel extends Component {
}
};
queryLoadPackages =(project)=> {
queryLoadPackagesAction(project).then(data => {
if (data){
queryLoadPackages =(project) => {
queryLoadPackagesAction(project).then((data) => {
if (data) {
let prefix = data[0].project.replace('/', '');
this.setState({ prefix, project: data });
}
......@@ -373,7 +372,7 @@ class EquipmentModel extends Component {
// AmosAlert.error('错误', e);
// });
}
handleUpload = () =>{
handleUpload = () => {
}
......@@ -394,19 +393,19 @@ class EquipmentModel extends Component {
const uploadButton = (
<div>
<Icon type="plus" />
<div className="amos-upload-text">选择图片</div>
<Icon type='plus' />
<div className='amos-upload-text'>选择图片</div>
</div>
);
return (
<div>
<Form model={form} rules={rules} ref={component => this.form = component}>
<div className="important-equipment-edit-left">
<FormItem label={<span>设备编号</span>} field="code" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
<div className='important-equipment-edit-left'>
<FormItem label={<span>设备编号</span>} field='code' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.code} onChange={e => this.onInputChange('code', e.target.value)} />
</FormItem>
<FormItem label={<span>所属区域</span>} field="riskSourceId" {...formItemLayout}>
<FormItem label={<span>所属区域</span>} field='riskSourceId' {...formItemLayout}>
<TreeSelect
treeData={riskSourceData}
value={form.riskSourceId === 0 ? undefined : `${form.riskSourceId}`}
......@@ -415,14 +414,14 @@ class EquipmentModel extends Component {
onChange={e => this.onSelectChange('riskSourceId', e)}
treeDefaultExpandAll
showSearch
placeholder="请选择"
treeNodeFilterProp="title"
placeholder='请选择'
treeNodeFilterProp='title'
filterTreeNode={(inputValue, treeNode) => treeNode.props.title.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase())}
/>
</FormItem>
<FormItem label={<span>建筑物</span>} field="building" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.building} onChange={e => this.onInputChange('building', e.target.value)} />
<FormItem label={<span>建筑物</span>} field='building' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.building} onChange={e => this.onInputChange('building', e.target.value)} />
</FormItem>
{/* <FormItem label={<span>消防小室</span>} field="fireStationId" {...formItemLayout}>
<Select
......@@ -433,18 +432,18 @@ class EquipmentModel extends Component {
onChange={e => this.onSelectChange('fireStationId', e)}
/>
</FormItem> */}
<FormItem label={<span>责任部门</span>} field="chargeDeptId" {...formItemLayout}>
<FormItem label={<span>责任部门</span>} field='chargeDeptId' {...formItemLayout}>
<Select
className="risk_factor_select"
className='risk_factor_select'
data={chargeDeptData}
renderOption={item => <Option value={item.sequenceNbr}>{item.departmentName}</Option>}
value={form.chargeDeptId}
onChange={e => this.onSelectChange('chargeDeptId', e)}
/>
</FormItem>
<FormItem label={<span>责任人</span>} field="chargeUserId" {...formItemLayout}>
<FormItem label={<span>责任人</span>} field='chargeUserId' {...formItemLayout}>
<Select
className="risk_factor_select"
className='risk_factor_select'
data={chargeUserData}
renderOption={item => <Option value={item.userId}>{item.realName}</Option>}
value={form.chargeUserId === undefined ? null : form.chargeUserId}
......@@ -456,15 +455,15 @@ class EquipmentModel extends Component {
<div>
<Upload
customRequest={this.handleUpload}
className="upload-img"
className='upload-img'
fileList={form.imageUrl1}
listType="picture-card"
beforeUpload={file => {
listType='picture-card'
beforeUpload={(file) => {
file.mylist = 'imageUrl1';
this.beforeUpload(file, 1);
}}
onPreview={this.handlePreview}
onRemove={file => {
onRemove={(file) => {
file.mylist = 'imageUrl1';
this.fileRemove(file);
}}
......@@ -474,19 +473,19 @@ class EquipmentModel extends Component {
</div>
</FormItem>
<FormItem label={<span>电缆沟封堵图</span>} field="picture2" {...formItemLayout}>
<FormItem label={<span>电缆沟封堵图</span>} field='picture2' {...formItemLayout}>
<div>
<Upload
customRequest={this.handleUpload}
className="upload-img"
className='upload-img'
fileList={form.imageUrl2}
listType="picture-card"
beforeUpload={file => {
listType='picture-card'
beforeUpload={(file) => {
file.mylist = 'imageUrl2';
this.beforeUpload(file);
}}
onPreview={this.handlePreview}
onRemove={file => {
onRemove={(file) => {
file.mylist = 'imageUrl2';
this.fileRemove(file);
}}
......@@ -496,19 +495,19 @@ class EquipmentModel extends Component {
</div>
</FormItem>
<FormItem label={<span>消防车进站行车路线图</span>} field="picture3" {...formItemLayout}>
<FormItem label={<span>消防车进站行车路线图</span>} field='picture3' {...formItemLayout}>
<div>
<Upload
customRequest={this.handleUpload}
className="upload-img"
className='upload-img'
fileList={form.imageUrl3}
listType="picture-card"
beforeUpload={file => {
listType='picture-card'
beforeUpload={(file) => {
file.mylist = 'imageUrl3';
this.beforeUpload(file);
}}
onPreview={this.handlePreview}
onRemove={file => {
onRemove={(file) => {
file.mylist = 'imageUrl3';
this.fileRemove(file);
}}
......@@ -518,73 +517,73 @@ class EquipmentModel extends Component {
</div>
</FormItem>
<FormItem label={<span>消防取水图</span>} field="picture4" {...formItemLayout}>
<FormItem label={<span>消防取水图</span>} field='picture4' {...formItemLayout}>
<div>
<Upload
customRequest={this.handleUpload}
className="upload-img"
className='upload-img'
fileList={form.imageUrl4}
listType="picture-card"
beforeUpload={file => {
listType='picture-card'
beforeUpload={(file) => {
file.mylist = 'imageUrl4';
this.beforeUpload(file);
}}
onPreview={this.handlePreview}
onRemove={file => {
onRemove={(file) => {
file.mylist = 'imageUrl4';
this.fileRemove(file);
}}
>
{form.imageUrl4 ? form.imageUrl4.length >= 1 ? null : uploadButton : uploadButton}
</Upload>
<Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
<Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px', overflowY: 'scroll' }}><img src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
</div>
</FormItem>
</div>
<div className="important-equipment-edit-right">
<FormItem label={<span>设备名称</span>} field="name" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.name} onChange={e => this.onInputChange('name', e.target.value)} />
<div className='important-equipment-edit-right'>
<FormItem label={<span>设备名称</span>} field='name' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.name} onChange={e => this.onInputChange('name', e.target.value)} />
</FormItem>
<FormItem label={<span>位置</span>} field="address" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.address} onChange={e => this.onInputChange('address', e.target.value)} />
<FormItem label={<span>位置</span>} field='address' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.address} onChange={e => this.onInputChange('address', e.target.value)} />
</FormItem>
<FormItem label={<span>房间号</span>} field="room" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.room} onChange={e => this.onInputChange('room', e.target.value)} />
<FormItem label={<span>房间号</span>} field='room' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.room} onChange={e => this.onInputChange('room', e.target.value)} />
</FormItem>
<FormItem label={<span>3维坐标</span>} field="position3d" {...formItemLayout}>
<Input className="risk_factor_input" required value={form.position3d} onChange={e => this.onInputChange('position3d', e.target.value)} />
<FormItem label={<span>3维坐标</span>} field='position3d' {...formItemLayout}>
<Input className='risk_factor_input' required value={form.position3d} onChange={e => this.onInputChange('position3d', e.target.value)} />
</FormItem>
<FormItem label={<span>3维楼层</span>} field="floor3d" {...formItemLayout}>
<FormItem label={<span>3维楼层</span>} field='floor3d' {...formItemLayout}>
<Select
className="fire-equip-select"
className='fire-equip-select'
data={floorData}
value={form.floor3d}
renderOption={item => <Option value={item.id}>{item.name}</Option>}
onChange={e => this.onInputChange('floor3d', e)}
/>
</FormItem>
<FormItem label={<span>是否室内</span>} field="isIndoor" {...formItemLayout}>
<FormItem label={<span>是否室内</span>} field='isIndoor' {...formItemLayout}>
<RadioGroup defaultValue={form.isIndoor} value={form.isIndoor} onChange={e => this.onInputChange('isIndoor', e)}>
<Radio value={false}>否</Radio>
<Radio value>是</Radio>
</RadioGroup>
</FormItem>
<FormItem label={<span>备注</span>} field="remark" {...formItemLayout}>
<TextArea rows={4} className="risk_factor_input" required value={form.remark} onChange={e => this.onInputChange('remark', e.target.value)} />
<FormItem label={<span>备注</span>} field='remark' {...formItemLayout}>
<TextArea rows={4} className='risk_factor_input' required value={form.remark} onChange={e => this.onInputChange('remark', e.target.value)} />
</FormItem>
<FormItem label={<span>重点设备照片</span>} field='equipmentPic' {...formItemLayout}>
<div>
<Upload
customRequest={this.handleUpload}
className="upload-img"
className='upload-img'
fileList={form.equipmentPic}
listType="picture-card"
beforeUpload={file => {
listType='picture-card'
beforeUpload={(file) => {
file.mylist = 'equipmentPic';
this.beforeUpload(file);
}}
onPreview={this.handlePreview}
onRemove={file => {
onRemove={(file) => {
file.mylist = 'equipmentPic';
this.fileRemove(file);
}}
......
src/view/bizview/equipmentLedger/index.scss
View file @ cc0215ff
.equipment-fire-equipment {
.equipment-fire-equipment-search {
.ant-select-selection--single {
......@@ -6,3 +7,7 @@
}
}
}
.amos-toast .amos-toast-topMiddle .amos-toast-inner {
background-color: red;
}
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