Commit b91a4321 authored by cellee's avatar cellee

Signed-off-by: cellee <893264950@qq.com>

parent 93a133a8
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
Button, Button,
TimePicker, TimePicker,
Checkbox, Checkbox,
Upload,
message, message,
Spin, Spin,
Modal, Modal,
...@@ -22,9 +23,8 @@ import { village } from '@/utils/tip'; ...@@ -22,9 +23,8 @@ import { village } from '@/utils/tip';
import moment from 'moment'; import moment from 'moment';
import { getNumber } from '@/utils/string'; // 正则 import { getNumber } from '@/utils/string'; // 正则
import PictureOptionsRow from '@/components/PictureOptions/PictureOptionsRow'; // banner 上传 import FileViewer from 'react-file-viewer';
import Facilities from '@/components/Form/ZipCode'; // 小区邮编地址名称 import PDF from 'react-pdf-js';
import PdfUpload from '@/components/Form/PdfUpload'; // 多图上传
const { RangePicker } = TimePicker; const { RangePicker } = TimePicker;
...@@ -37,22 +37,23 @@ const Adds = (props: any) => { ...@@ -37,22 +37,23 @@ const Adds = (props: any) => {
const [PropertyFee, setPropertyFee] = useState(['1']); // 表单物业费提交值 const [PropertyFee, setPropertyFee] = useState(['1']); // 表单物业费提交值
// 监听用户填写小区名 以及后续禁止输入 提示信息 const [loubaUpload, setLouba] = useState([] as any); // 楼巴上传列表
const [codename, setCodeName] = useState(null); const [guideUpload, setGuide] = useState([] as any); // 物业办事指南列表
const [periodUpload, setPeriod] = useState([] as any); // 保质期服务列表
const [tips, setTips] = useState([false, false, false]); // 三个自定义上传的提示
// const [codeStrat, setcodeStrat] = useState(false); // 监听用户填写小区名 以及后续禁止输入 提示信息
// const [tipMain, setTipMain] = useState(''); const [codename, setCodeName] = useState('');
const [codeStrat, setcodeStrat] = useState(false);
const [tipMain, setTipMain] = useState('');
// const [previewVisible, setpreviewVisible] = useState(false); // 预览弹窗显示隐藏 const [previewVisible, setpreviewVisible] = useState(false); // 预览弹窗显示隐藏
// const [previewImage, setpreviewImage] = useState({} as any); // 预览图片信息 const [previewImage, setpreviewImage] = useState({} as any); // 预览图片信息
// //pdf 页码内容 //pdf 页码内容
// const [numPages, setNumPages] = useState(1 as any); // 总页码数 const [numPages, setNumPages] = useState(1 as any); // 总页码数
// const [pageNumber, setPageNumber] = useState(1); // 当前页码数 const [pageNumber, setPageNumber] = useState(1); // 当前页码数
// const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态 const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态
// 赋值 // 赋值
useEffect(() => { useEffect(() => {
...@@ -89,13 +90,13 @@ const Adds = (props: any) => { ...@@ -89,13 +90,13 @@ const Adds = (props: any) => {
}, },
}); });
// 上传 // 上传
// setLouba(Data.balouscheduleUrl ? [backUpload(Data.balouscheduleUrl, Data.id)] : []); setLouba(Data.balouscheduleUrl ? [backUpload(Data.balouscheduleUrl, Data.id)] : []);
// setGuide(Data.serviceGuideUrl ? [backUpload(Data.serviceGuideUrl, Data.id)] : []); setGuide(Data.serviceGuideUrl ? [backUpload(Data.serviceGuideUrl, Data.id)] : []);
// setPeriod(Data.lifeServiceUrl ? [backUpload(Data.lifeServiceUrl, Data.id)] : []); // setPeriod(Data.lifeServiceUrl ? [backUpload(Data.lifeServiceUrl, Data.id)] : []);
// 小区名 -- 上传需要 // 小区名 -- 上传需要
setCodeName(Data.residentialName); setCodeName(Data.residentialName);
// setcodeStrat(true); setcodeStrat(true);
// setTipMain('Binding Content Already Exists, Cannot Be Modified!'); setTipMain('Binding Content Already Exists, Cannot Be Modified!');
} else { } else {
// console.log('新建'); // console.log('新建');
} }
...@@ -130,6 +131,104 @@ const Adds = (props: any) => { ...@@ -130,6 +131,104 @@ const Adds = (props: any) => {
} }
}, [imgUrl]); }, [imgUrl]);
// 编辑 返回上传格式 和 地址
function backUpload(str: any, index: number, url?: any) {
let a = {
uid: str + index,
name: str,
status: 'done',
type: str.match(/\.([^\.]+)$/)[1].toLowerCase(),
url: 'Transfer', // 需要调取接口
};
return a;
}
// 上传设置
const uploads = {
name: 'file',
accept: '.jpg,.png,.pdf',
action: '/tos/image/upload',
data: { imageType: 'tosCreateCommunity', extends: codename },
};
// 文件上传判断
function beforeUpload(file: any) {
// 文件大小判断
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.error('File must be less than or equal to 2MB!');
}
return isLt2M;
}
// 上传返回格式
function BackFormat(name: any, url: any) {
let imgs = [
{
uid: '-1',
name: name,
status: 'done',
type: name.match(/\.([^\.]+)$/)[1].toLowerCase(),
url: url,
},
];
return imgs;
}
// 楼巴上传
const upload1 = {
onChange({ file }: any) {
file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
if (file.status === 'done') {
let data = file.response.data;
setLouba(BackFormat(data.imageName, data.url));
setcodeStrat(true);
setTipMain('Binding Content Already Exists, Cannot Be Modified!');
}
// 结果
uploadMsg(file);
},
};
// 指南上传
const upload2 = {
onChange({ file, fileList }: any) {
file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
if (file.status === 'done') {
let data = file.response.data;
setGuide(BackFormat(data.imageName, data.url));
setcodeStrat(true);
setTipMain('Binding Content Already Exists, Cannot Be Modified!');
}
// 结果
uploadMsg(file);
},
};
// 保质期上传
// const upload3 = {
// onChange({ file }: any) {
// file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
// if (file.status === 'done') {
// let data = file.response.data;
// setPeriod(BackFormat(data.imageName, data.url));
// setcodeStrat(true);
// setTipMain('Binding Content Already Exists, Cannot Be Modified!');
// }
// // 结果
// uploadMsg(file);
// },
// };
// 上传提示
function uploadMsg(file: any) {
if (file.status === 'done') {
// message.success(`${file.name} File Uploaded Successfully`);
} else if (file.status === 'error') {
message.error(`${file.name} File Upload Failed.`);
}
}
// 多选选择改变值 // 多选选择改变值
function onChange(checkedValues: any) { function onChange(checkedValues: any) {
// 修改选择值 // 修改选择值
...@@ -145,98 +244,78 @@ const Adds = (props: any) => { ...@@ -145,98 +244,78 @@ const Adds = (props: any) => {
} }
} }
// 提取pdf地址文件名出来 // 表单验证
const pickUp = (list: any) => { const onFinish = (values: any) => {
let newArr = []; let { residentialZipCode } = values.des;
// 如果存在 let tel = values.info.tel;
if (list) { if (values.residentialManagerUserName.length < 2) {
//循环一次 message.error('Please Enter 2-digit Administrator Name!');
for (let i in list) { } else if (residentialZipCode.length < 6) {
// 判断有没有错误 message.error('Please Enter The Correct Name!');
if (list[i].name == '' || list[i].fileList.length == 0) { } else if (tel.length != 8 && tel.length != 11) {
return '错误'; message.error('Incorrect Contact Information!');
} else {
let name = list[i].name;
let page = list[i].fileList;
//再循环拼接
for (let v in page) {
name += '&' + page[v].name;
}
newArr.push(name);
}
}
return newArr;
} else { } else {
return null; onUpDate(values);
} }
}; };
// 表单提交 // 表单提交
function onFinish(values: any) { function onUpDate(values: any) {
let mainPdfList = pickUp(values.mainPdfList); // 额外判断
let essentialPdfList = pickUp(values.essentialPdfList); let obj: any = new Object();
if (mainPdfList == '错误') { obj.propertyFee = PropertyFee;
let a = tips;
a[0] = true;
setTips([...a]);
return false;
} else if (essentialPdfList == '错误') {
let b = tips;
b[1] = true;
setTips([...b]);
return false;
}
// 小区信息; // 小区信息;
let { residentialZipCode, residentialAddress, residentialName } = values.des; let { residentialZipCode, residentialAddress, residentialName } = values.des;
values.residentialZipCode = `SINGAPORE ${residentialZipCode}`;
values.residentialAddress = residentialAddress;
values.residentialName = residentialName;
// 支付方式 obj.residentialZipCode = `SINGAPORE ${residentialZipCode}`;
values.propertyFee = PropertyFee.join(''); obj.residentialAddress = residentialAddress;
obj.residentialName = residentialName;
// 小区时间与管理员 // 小区时间与管理员
values.residentialManagerUserName = undeFi(values.residentialManagerUserName); obj.residentialManagerUserName = undeFi(values.residentialManagerUserName);
values.residentialStartWorking = values.workingHours[0].format('HH:mm'); obj.residentialStartWorking = values.workingHours[0].format('HH:mm');
values.residentialEndWorking = values.workingHours[1].format('HH:mm'); obj.residentialEndWorking = values.workingHours[1].format('HH:mm');
obj.residentialPhone = values.info.tel;
obj.residentialEmail = values.info.email;
// 上传内容 // 上传内容
values.bannerUrl = values.bannerUrl ? values.bannerUrl.join('') : null;
values.mainPdfList = pickUp(values.mainPdfList); obj.balouscheduleUrl = undeFi(loubaUpload.map((item: any) => item.name)[0]);
values.essentialPdfList = pickUp(values.essentialPdfList); obj.serviceGuideUrl = undeFi(guideUpload.map((item: any) => item.name)[0]);
// values.formsPdfList = pickUp(values.formsPdfList); // obj.lifeServiceUrl = undeFi(periodUpload.map((item: any) => item.name)[0]);
// 小区热线 // 小区热线
let { residentialHotline, residentialHotlineName, time } = values.help; // 表单结构存在数据不存在情况, 所以要多判断一次
if (values.help) {
// 没选的话就上面小区联系人和方式 obj.residentialHotlineName = values.help.residentialHotlineName
values.residentialHotline = residentialHotline ? undeFi(values.help.residentialHotlineName)
? undeFi(residentialHotline) : 'Community Hotline';
: values.residentialPhone; obj.residentialHotline = values.help.residentialHotline
values.residentialHotlineName = residentialHotlineName ? undeFi(values.help.residentialHotline)
? undeFi(residentialHotlineName) : values.info.tel;
: values.residentialManagerUserName; // 编辑的时候 为空 判断
if (values.help.time) {
// 没选的话就上面小区时间 obj.residentialHotlineServieStartTime = undeFi(values.help.time[0]).format('HH:mm');
if (time) { obj.residentialHotlineServieEndTime = undeFi(values.help.time[1]).format('HH:mm');
values.residentialHotlineServieStartTime = undeFi(time[0].format('HH:mm')); } else {
values.residentialHotlineServieEndTime = undeFi(time[1].format('HH:mm')); obj.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm');
obj.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm');
}
} else { } else {
values.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm'); obj.residentialHotlineName = values.info.tel;
values.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm'); obj.residentialHotline = values.info.tel;
obj.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm');
obj.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm');
} }
delete values.des;
delete values.help;
delete values.workingHours;
if (Data) { if (Data) {
values.id = Data.id; obj.id = Data.id;
} }
console.log(values); console.log(values);
console.log(obj);
// 上传 // 上传
RA(63, values, 'CellList', dispatch); RA(29, obj, 'CellList', dispatch);
} }
// 返回 // 返回
...@@ -244,11 +323,10 @@ const Adds = (props: any) => { ...@@ -244,11 +323,10 @@ const Adds = (props: any) => {
history.go(-1); history.go(-1);
}; };
// 小区名输入监听赋值 // 小区名输入监听ant
function insdInp(value: any) { function insdInp(value: string) {
if (value.trim() != '') { setCodeName(value);
setCodeName(value); return value;
}
} }
// 正则手机号 // 正则手机号
...@@ -261,28 +339,55 @@ const Adds = (props: any) => { ...@@ -261,28 +339,55 @@ const Adds = (props: any) => {
e.target.value = keyup_tool(e.target.value); e.target.value = keyup_tool(e.target.value);
}; };
// 邮编小区名字验证 // 上传按钮
const checkPrice = (_: any, value: any) => { const uploadButton = (
if (!value) { <div>
return Promise.reject('Please fill in the basic information !'); {imgLoad ? <LoadingOutlined /> : <PlusOutlined />}
} <div style={{ marginTop: 8 }}>Upload</div>
if (!value.residentialZipCode || value.residentialZipCode.trim() == '') { </div>
return Promise.reject('Please enter the postcode !'); );
} else if (value.residentialZipCode.length < 6 || !/^\d+$/.test(value.residentialZipCode)) {
return Promise.reject('Wrong zip code !'); // 文件预览
} else if ( const handlePreview = async (file: any) => {
!value.residentialAddress || if (file.url == 'Transfer') {
value.residentialAddress.trim() == '' || // 这是编辑的预览, 需要发送一个请求
value.residentialAddress.length < 2 let msg = {
) { // userToken: '',
return Promise.reject('Please enter the address of the community !'); // type: ans.substr(ans.lastIndexOf('.') + 1),
} else if (!value.residentialName || value.residentialName.trim() == '') { type: 'tosCommunityFileService',
return Promise.reject('Please enter the community name !'); fileName: file.name,
extends: Data.residentialName,
};
RA(47, msg, module, dispatch);
} else { } else {
return Promise.resolve(); setpreviewImage(file);
setpreviewVisible(true);
} }
}; };
// 点击移除图片
const handRemove = (key: any) => {
key == 1 ? setLouba([]) : key == 2 ? setGuide([]) : setPeriod([]);
};
// 点击遮罩回调
const handleCancel = () => {
setpreviewVisible(false);
// 每次关闭预览都要清掉弹窗图片信息 -- 防止编辑打开页面直接弹出窗口
setpreviewImage({});
dispatch({ type: module + '/urlRemove' });
};
// pdf 总页数
const onDocumentLoadSuccess = (pages: any) => {
setNumPages(pages);
};
// 切换pdf 总数
const onChangePage = (page: any) => {
setPageNumber(page);
};
return ( return (
<> <>
<Spin spinning={loading} tip="loading..." size="large"> <Spin spinning={loading} tip="loading..." size="large">
...@@ -306,21 +411,49 @@ const Adds = (props: any) => { ...@@ -306,21 +411,49 @@ const Adds = (props: any) => {
labelAlign="left" labelAlign="left"
scrollToFirstError={true} scrollToFirstError={true}
> >
{/* 小区邮编、地址和名称 */}
<Form.Item <Form.Item
name="des"
label="Community Name" label="Community Name"
rules={[{ validator: checkPrice }]} name="des"
style={{ marginBottom: 15 }} rules={[{ required: false }]}
className="must" className="must"
> >
<Facilities <Input.Group compact>
insdInps={(value: any) => { <Form.Item name={['des', 'residentialZipCode']} noStyle rules={village[0] as any}>
insdInp(value); <Input
}} style={{ marginRight: '10px', width: 120 }}
/> placeholder="6 Postcode"
maxLength={6}
onKeyUp={keyup_communityManagerFee}
/>
</Form.Item>
<Form.Item name={['des', 'residentialAddress']} noStyle rules={village[1] as any}>
<Input
style={{ width: '360px' }}
placeholder="Please enter community adds"
disabled={codeStrat}
/>
</Form.Item>
<div className="li">
<Form.Item
name={['des', 'residentialName']}
normalize={insdInp}
noStyle
rules={village[2] as any}
>
<Input
style={{ marginRight: '10px', width: '260px' }}
placeholder="Please enter community name"
disabled={codeStrat}
/>
</Form.Item>
{/* 不可修改提示 */}
<span className="redFs">{tipMain}</span>
</div>
</Input.Group>
</Form.Item> </Form.Item>
{/* 小区时间 */}
<Form.Item label="Working Hours" name="workingHours" rules={village[3] as any}> <Form.Item label="Working Hours" name="workingHours" rules={village[3] as any}>
<RangePicker <RangePicker
minuteStep={60} minuteStep={60}
...@@ -328,32 +461,40 @@ const Adds = (props: any) => { ...@@ -328,32 +461,40 @@ const Adds = (props: any) => {
placeholder={['Start Time', 'End Time']} placeholder={['Start Time', 'End Time']}
/> />
</Form.Item> </Form.Item>
{/* 小区联系方式 */}
<Form.Item <Form.Item
name="residentialPhone"
label="Community Telephone" label="Community Telephone"
rules={village[4] as any} name="info"
rules={[{ required: false }]}
className="must"
> >
<Input <Input.Group compact>
style={{ marginRight: '10px', width: '240px' }} <Form.Item name={['info', 'tel']} noStyle rules={village[4] as any}>
placeholder="Please enter phone" <Input
maxLength={11} style={{ marginRight: '10px', width: '160px' }}
onKeyUp={keyup_communityManagerFee} placeholder="Please enter phone"
/> maxLength={11}
</Form.Item> onKeyUp={keyup_communityManagerFee}
{/* 小区邮箱 */} />
<Form.Item name="residentialEmail" label="Community Mailbox" rules={village[5] as any}> </Form.Item>
<Input style={{ width: '240px' }} placeholder="Please enter email" /> <Button type="text">-</Button>
<Form.Item name={['info', 'email']} noStyle rules={village[5] as any}>
<Input
style={{ marginLeft: '10px', width: '180px' }}
placeholder="Please enter email"
/>
</Form.Item>
</Input.Group>
</Form.Item> </Form.Item>
{/* 小区管理员 */}
<Form.Item <Form.Item
label="Administrator" label="Administrator"
name="residentialManagerUserName" name="residentialManagerUserName"
rules={village[6] as any} rules={village[6] as any}
> >
<Input style={{ width: '240px' }} placeholder="Please enter name" maxLength={30} /> <Input style={{ width: '160px' }} placeholder="Name" maxLength={30} />
</Form.Item> </Form.Item>
{/* 小区缴费方式 */}
<Form.Item label="Property Fee" name="propertyFee" style={{ marginBottom: '0' }}> <Form.Item label="Property Fee" name="propertyFee" style={{ marginBottom: '0' }}>
<Checkbox onChange={onChange} disabled> <Checkbox onChange={onChange} disabled>
Online Payment Online Payment
...@@ -362,75 +503,80 @@ const Adds = (props: any) => { ...@@ -362,75 +503,80 @@ const Adds = (props: any) => {
Offline Payment Offline Payment
</Checkbox> </Checkbox>
</Form.Item> </Form.Item>
<hr /> <hr />
{/* banner上传部分 */} {/* 上传部分 */}
<Form.Item <Form.Item
name={'bannerUrl'} label="Shuttle Bus Timetable"
label="Banner:" name="balouscheduleFile"
colon={false} style={{ marginBottom: '0', minHeight: 159 }}
style={{
marginBottom: 8,
}}
> >
<PictureOptionsRow <Upload
action="/tos/image/upload" {...uploads}
data={{ {...upload1}
imageType: 'communityBannerImage', fileList={loubaUpload}
// extends: codename, beforeUpload={beforeUpload}
}} listType="picture-card"
limitNums={1} disabled={codename == '' ? true : false}
// imgs={ImageSrc} onPreview={() => handlePreview(loubaUpload[0])} // 预览
/> onRemove={() => handRemove(1)} //移除
>
{loubaUpload.length >= 1 ? null : uploadButton}
</Upload>
<div className="tip">
<span>Support Files:.jpg, .png, .pdf</span>
</div>
</Form.Item> </Form.Item>
{/* 第一个上传 */}
{/* 上传部分 */}
<Form.Item <Form.Item
name={'mainPdfList'} label="Property Guide"
label="Maintenance Schedule:" name="serviceGuideFile"
colon={false} style={{ marginBottom: '0', minHeight: 159 }}
style={{
marginBottom: tips[0] ? 4 : 14,
}}
> >
<PdfUpload <Upload
action="/tos/community/pdf/upload" {...uploads}
data={{ {...upload2}
type: 'tosCommunityPdf', fileList={guideUpload}
extends: codename, beforeUpload={beforeUpload}
}} listType="picture-card"
></PdfUpload> disabled={codename == '' ? true : false}
onPreview={() => handlePreview(guideUpload[0])} // 预览
onRemove={() => handRemove(2)} //移除
>
{guideUpload.length >= 1 ? null : uploadButton}
</Upload>
<div className="tip">
<span>Support Files:.jpg, .png, .pdf</span>
</div>
</Form.Item> </Form.Item>
{tips[0] ? (
<p style={{ margin: '6px 0 10px 160px', color: '#f00' }}> {/* 上传部分 */}
Please complete or delete the incomplete part ! {/* <Form.Item
</p> label="Warranty Period Service"
) : ( name="lifeServiceFile"
'' style={{ marginBottom: '0', minHeight: 159 }}
)}
{/* 第二个上传 */}
<Form.Item
name={'essentialPdfList'}
label=" Essential Information:"
colon={false}
style={{
marginBottom: tips[1] ? 4 : 14,
}}
> >
<PdfUpload <Upload
action="/tos/community/pdf/upload" {...uploads}
data={{ {...upload3}
type: 'tosCommunityPdf', fileList={periodUpload}
extends: codename, beforeUpload={beforeUpload}
}} listType="picture-card"
></PdfUpload> disabled={codename == '' ? true : false}
</Form.Item>{' '} onPreview={() => handlePreview(periodUpload[0])} // 预览
{tips[1] ? ( onRemove={() => handRemove(3)} //移除
<p style={{ margin: '6px 0 10px 160px', color: '#f00' }}> >
Please complete or delete the incomplete part ! {periodUpload.length >= 1 ? null : uploadButton}
</p> </Upload>
) : ( <div className="tip">
'' <span>Support Files:.jpg, .png, .pdf</span>
)} </div>
</Form.Item> */}
<hr /> <hr />
{/* 帮助中心 */} {/* 帮助中心 */}
<Form.Item label="Help Center" name="help"> <Form.Item label="Help Center" name="help">
<Input.Group compact> <Input.Group compact>
...@@ -450,6 +596,7 @@ const Adds = (props: any) => { ...@@ -450,6 +596,7 @@ const Adds = (props: any) => {
</Form.Item> </Form.Item>
</Input.Group> </Input.Group>
</Form.Item> </Form.Item>
<hr /> <hr />
{/* 提交 */} {/* 提交 */}
<Form.Item label="" colon={false}> <Form.Item label="" colon={false}>
...@@ -459,6 +606,49 @@ const Adds = (props: any) => { ...@@ -459,6 +606,49 @@ const Adds = (props: any) => {
</Form.Item> </Form.Item>
</Form> </Form>
</div> </div>
{/* 附件预览 */}
<Modal
title={previewImage != null ? previewImage.name : 'File Preview'}
visible={previewVisible}
width={800}
onCancel={handleCancel}
style={{ textAlign: 'center' }}
footer={null}
>
{previewImage != null ? (
previewImage.type == 'pdf' ? (
// pdf 换一种
<>
<PDF
file={previewImage.url}
page={pageNumber}
scale={1.25}
onDocumentComplete={onDocumentLoadSuccess}
/>
<Pagination
style={{ textAlign: 'center', marginTop: 10, display: 'block' }}
simple
defaultCurrent={pageNumber}
total={numPages * 10}
onChange={onChangePage}
/>
</>
) : previewImage.type == 'jpg' || previewImage.type == 'png' ? (
// 图片用指定格式
<Image
src={previewImage.url}
preview={false}
style={{ margin: '0 auto', textAlign: 'center' }}
/>
) : (
<FileViewer fileType={previewImage.type} filePath={previewImage.url} />
)
) : (
''
)}
</Modal>
</Spin> </Spin>
</> </>
); );
...@@ -467,6 +657,7 @@ const Adds = (props: any) => { ...@@ -467,6 +657,7 @@ const Adds = (props: any) => {
// export default Adds; // export default Adds;
function map(state: any) { function map(state: any) {
// console.log(state); // console.log(state);
const Data = state.CellList.DataSave; const Data = state.CellList.DataSave;
const { imgUrl, Result } = state.CellList; const { imgUrl, Result } = state.CellList;
const loading = state.loading.models.CellList ? state.loading.models.CellList : false; const loading = state.loading.models.CellList ? state.loading.models.CellList : false;
......
...@@ -8,7 +8,6 @@ import { ...@@ -8,7 +8,6 @@ import {
Button, Button,
TimePicker, TimePicker,
Checkbox, Checkbox,
Upload,
message, message,
Spin, Spin,
Modal, Modal,
...@@ -23,8 +22,9 @@ import { village } from '@/utils/tip'; ...@@ -23,8 +22,9 @@ import { village } from '@/utils/tip';
import moment from 'moment'; import moment from 'moment';
import { getNumber } from '@/utils/string'; // 正则 import { getNumber } from '@/utils/string'; // 正则
import FileViewer from 'react-file-viewer'; import PictureOptionsRow from '@/components/PictureOptions/PictureOptionsRow'; // banner 上传
import PDF from 'react-pdf-js'; import Facilities from '@/components/Form/ZipCode'; // 小区邮编地址名称
import PdfUpload from '@/components/Form/PdfUpload'; // 多图上传
const { RangePicker } = TimePicker; const { RangePicker } = TimePicker;
...@@ -37,23 +37,22 @@ const Adds = (props: any) => { ...@@ -37,23 +37,22 @@ const Adds = (props: any) => {
const [PropertyFee, setPropertyFee] = useState(['1']); // 表单物业费提交值 const [PropertyFee, setPropertyFee] = useState(['1']); // 表单物业费提交值
const [loubaUpload, setLouba] = useState([] as any); // 楼巴上传列表
const [guideUpload, setGuide] = useState([] as any); // 物业办事指南列表
const [periodUpload, setPeriod] = useState([] as any); // 保质期服务列表
// 监听用户填写小区名 以及后续禁止输入 提示信息 // 监听用户填写小区名 以及后续禁止输入 提示信息
const [codename, setCodeName] = useState(''); const [codename, setCodeName] = useState(null);
const [codeStrat, setcodeStrat] = useState(false);
const [tipMain, setTipMain] = useState(''); const [tips, setTips] = useState([false, false, false]); // 三个自定义上传的提示
// const [codeStrat, setcodeStrat] = useState(false);
// const [tipMain, setTipMain] = useState('');
const [previewVisible, setpreviewVisible] = useState(false); // 预览弹窗显示隐藏 // const [previewVisible, setpreviewVisible] = useState(false); // 预览弹窗显示隐藏
const [previewImage, setpreviewImage] = useState({} as any); // 预览图片信息 // const [previewImage, setpreviewImage] = useState({} as any); // 预览图片信息
//pdf 页码内容 // //pdf 页码内容
const [numPages, setNumPages] = useState(1 as any); // 总页码数 // const [numPages, setNumPages] = useState(1 as any); // 总页码数
const [pageNumber, setPageNumber] = useState(1); // 当前页码数 // const [pageNumber, setPageNumber] = useState(1); // 当前页码数
const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态 // const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态
// 赋值 // 赋值
useEffect(() => { useEffect(() => {
...@@ -90,13 +89,13 @@ const Adds = (props: any) => { ...@@ -90,13 +89,13 @@ const Adds = (props: any) => {
}, },
}); });
// 上传 // 上传
setLouba(Data.balouscheduleUrl ? [backUpload(Data.balouscheduleUrl, Data.id)] : []); // setLouba(Data.balouscheduleUrl ? [backUpload(Data.balouscheduleUrl, Data.id)] : []);
setGuide(Data.serviceGuideUrl ? [backUpload(Data.serviceGuideUrl, Data.id)] : []); // setGuide(Data.serviceGuideUrl ? [backUpload(Data.serviceGuideUrl, Data.id)] : []);
// setPeriod(Data.lifeServiceUrl ? [backUpload(Data.lifeServiceUrl, Data.id)] : []); // setPeriod(Data.lifeServiceUrl ? [backUpload(Data.lifeServiceUrl, Data.id)] : []);
// 小区名 -- 上传需要 // 小区名 -- 上传需要
setCodeName(Data.residentialName); setCodeName(Data.residentialName);
setcodeStrat(true); // setcodeStrat(true);
setTipMain('Binding Content Already Exists, Cannot Be Modified!'); // setTipMain('Binding Content Already Exists, Cannot Be Modified!');
} else { } else {
// console.log('新建'); // console.log('新建');
} }
...@@ -131,104 +130,6 @@ const Adds = (props: any) => { ...@@ -131,104 +130,6 @@ const Adds = (props: any) => {
} }
}, [imgUrl]); }, [imgUrl]);
// 编辑 返回上传格式 和 地址
function backUpload(str: any, index: number, url?: any) {
let a = {
uid: str + index,
name: str,
status: 'done',
type: str.match(/\.([^\.]+)$/)[1].toLowerCase(),
url: 'Transfer', // 需要调取接口
};
return a;
}
// 上传设置
const uploads = {
name: 'file',
accept: '.jpg,.png,.pdf',
action: '/tos/image/upload',
data: { imageType: 'tosCreateCommunity', extends: codename },
};
// 文件上传判断
function beforeUpload(file: any) {
// 文件大小判断
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.error('File must be less than or equal to 2MB!');
}
return isLt2M;
}
// 上传返回格式
function BackFormat(name: any, url: any) {
let imgs = [
{
uid: '-1',
name: name,
status: 'done',
type: name.match(/\.([^\.]+)$/)[1].toLowerCase(),
url: url,
},
];
return imgs;
}
// 楼巴上传
const upload1 = {
onChange({ file }: any) {
file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
if (file.status === 'done') {
let data = file.response.data;
setLouba(BackFormat(data.imageName, data.url));
setcodeStrat(true);
setTipMain('Binding Content Already Exists, Cannot Be Modified!');
}
// 结果
uploadMsg(file);
},
};
// 指南上传
const upload2 = {
onChange({ file, fileList }: any) {
file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
if (file.status === 'done') {
let data = file.response.data;
setGuide(BackFormat(data.imageName, data.url));
setcodeStrat(true);
setTipMain('Binding Content Already Exists, Cannot Be Modified!');
}
// 结果
uploadMsg(file);
},
};
// 保质期上传
// const upload3 = {
// onChange({ file }: any) {
// file.status === 'uploading' ? setimgLoad(true) : setimgLoad(false);
// if (file.status === 'done') {
// let data = file.response.data;
// setPeriod(BackFormat(data.imageName, data.url));
// setcodeStrat(true);
// setTipMain('Binding Content Already Exists, Cannot Be Modified!');
// }
// // 结果
// uploadMsg(file);
// },
// };
// 上传提示
function uploadMsg(file: any) {
if (file.status === 'done') {
// message.success(`${file.name} File Uploaded Successfully`);
} else if (file.status === 'error') {
message.error(`${file.name} File Upload Failed.`);
}
}
// 多选选择改变值 // 多选选择改变值
function onChange(checkedValues: any) { function onChange(checkedValues: any) {
// 修改选择值 // 修改选择值
...@@ -244,78 +145,98 @@ const Adds = (props: any) => { ...@@ -244,78 +145,98 @@ const Adds = (props: any) => {
} }
} }
// 表单验证 // 提取pdf地址文件名出来
const onFinish = (values: any) => { const pickUp = (list: any) => {
let { residentialZipCode } = values.des; let newArr = [];
let tel = values.info.tel; // 如果存在
if (values.residentialManagerUserName.length < 2) { if (list) {
message.error('Please Enter 2-digit Administrator Name!'); //循环一次
} else if (residentialZipCode.length < 6) { for (let i in list) {
message.error('Please Enter The Correct Name!'); // 判断有没有错误
} else if (tel.length != 8 && tel.length != 11) { if (list[i].name == '' || list[i].fileList.length == 0) {
message.error('Incorrect Contact Information!'); return '错误';
} else {
let name = list[i].name;
let page = list[i].fileList;
//再循环拼接
for (let v in page) {
name += '&' + page[v].name;
}
newArr.push(name);
}
}
return newArr;
} else { } else {
onUpDate(values); return null;
} }
}; };
// 表单提交 // 表单提交
function onUpDate(values: any) { function onFinish(values: any) {
// 额外判断 let mainPdfList = pickUp(values.mainPdfList);
let obj: any = new Object(); let essentialPdfList = pickUp(values.essentialPdfList);
obj.propertyFee = PropertyFee; if (mainPdfList == '错误') {
let a = tips;
a[0] = true;
setTips([...a]);
return false;
} else if (essentialPdfList == '错误') {
let b = tips;
b[1] = true;
setTips([...b]);
return false;
}
// 小区信息; // 小区信息;
let { residentialZipCode, residentialAddress, residentialName } = values.des; let { residentialZipCode, residentialAddress, residentialName } = values.des;
values.residentialZipCode = `SINGAPORE ${residentialZipCode}`;
values.residentialAddress = residentialAddress;
values.residentialName = residentialName;
obj.residentialZipCode = `SINGAPORE ${residentialZipCode}`; // 支付方式
obj.residentialAddress = residentialAddress; values.propertyFee = PropertyFee.join('');
obj.residentialName = residentialName;
// 小区时间与管理员 // 小区时间与管理员
obj.residentialManagerUserName = undeFi(values.residentialManagerUserName); values.residentialManagerUserName = undeFi(values.residentialManagerUserName);
obj.residentialStartWorking = values.workingHours[0].format('HH:mm'); values.residentialStartWorking = values.workingHours[0].format('HH:mm');
obj.residentialEndWorking = values.workingHours[1].format('HH:mm'); values.residentialEndWorking = values.workingHours[1].format('HH:mm');
obj.residentialPhone = values.info.tel;
obj.residentialEmail = values.info.email;
// 上传内容 // 上传内容
values.bannerUrl = values.bannerUrl ? values.bannerUrl.join('') : null;
obj.balouscheduleUrl = undeFi(loubaUpload.map((item: any) => item.name)[0]); values.mainPdfList = pickUp(values.mainPdfList);
obj.serviceGuideUrl = undeFi(guideUpload.map((item: any) => item.name)[0]); values.essentialPdfList = pickUp(values.essentialPdfList);
// obj.lifeServiceUrl = undeFi(periodUpload.map((item: any) => item.name)[0]); // values.formsPdfList = pickUp(values.formsPdfList);
// 小区热线 // 小区热线
// 表单结构存在数据不存在情况, 所以要多判断一次 let { residentialHotline, residentialHotlineName, time } = values.help;
if (values.help) {
obj.residentialHotlineName = values.help.residentialHotlineName // 没选的话就上面小区联系人和方式
? undeFi(values.help.residentialHotlineName) values.residentialHotline = residentialHotline
: 'Community Hotline'; ? undeFi(residentialHotline)
obj.residentialHotline = values.help.residentialHotline : values.residentialPhone;
? undeFi(values.help.residentialHotline) values.residentialHotlineName = residentialHotlineName
: values.info.tel; ? undeFi(residentialHotlineName)
// 编辑的时候 为空 判断 : values.residentialManagerUserName;
if (values.help.time) {
obj.residentialHotlineServieStartTime = undeFi(values.help.time[0]).format('HH:mm'); // 没选的话就上面小区时间
obj.residentialHotlineServieEndTime = undeFi(values.help.time[1]).format('HH:mm'); if (time) {
} else { values.residentialHotlineServieStartTime = undeFi(time[0].format('HH:mm'));
obj.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm'); values.residentialHotlineServieEndTime = undeFi(time[1].format('HH:mm'));
obj.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm');
}
} else { } else {
obj.residentialHotlineName = values.info.tel; values.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm');
obj.residentialHotline = values.info.tel; values.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm');
obj.residentialHotlineServieStartTime = values.workingHours[0].format('HH:mm');
obj.residentialHotlineServieEndTime = values.workingHours[1].format('HH:mm');
} }
delete values.des;
delete values.help;
delete values.workingHours;
if (Data) { if (Data) {
obj.id = Data.id; values.id = Data.id;
} }
console.log(values); console.log(values);
console.log(obj);
// 上传 // 上传
RA(29, obj, 'CellList', dispatch); RA(63, values, 'CellList', dispatch);
} }
// 返回 // 返回
...@@ -323,10 +244,11 @@ const Adds = (props: any) => { ...@@ -323,10 +244,11 @@ const Adds = (props: any) => {
history.go(-1); history.go(-1);
}; };
// 小区名输入监听ant // 小区名输入监听赋值
function insdInp(value: string) { function insdInp(value: any) {
setCodeName(value); if (value.trim() != '') {
return value; setCodeName(value);
}
} }
// 正则手机号 // 正则手机号
...@@ -339,55 +261,28 @@ const Adds = (props: any) => { ...@@ -339,55 +261,28 @@ const Adds = (props: any) => {
e.target.value = keyup_tool(e.target.value); e.target.value = keyup_tool(e.target.value);
}; };
// 上传按钮 // 邮编小区名字验证
const uploadButton = ( const checkPrice = (_: any, value: any) => {
<div> if (!value) {
{imgLoad ? <LoadingOutlined /> : <PlusOutlined />} return Promise.reject('Please fill in the basic information !');
<div style={{ marginTop: 8 }}>Upload</div> }
</div> if (!value.residentialZipCode || value.residentialZipCode.trim() == '') {
); return Promise.reject('Please enter the postcode !');
} else if (value.residentialZipCode.length < 6 || !/^\d+$/.test(value.residentialZipCode)) {
// 文件预览 return Promise.reject('Wrong zip code !');
const handlePreview = async (file: any) => { } else if (
if (file.url == 'Transfer') { !value.residentialAddress ||
// 这是编辑的预览, 需要发送一个请求 value.residentialAddress.trim() == '' ||
let msg = { value.residentialAddress.length < 2
// userToken: '', ) {
// type: ans.substr(ans.lastIndexOf('.') + 1), return Promise.reject('Please enter the address of the community !');
type: 'tosCommunityFileService', } else if (!value.residentialName || value.residentialName.trim() == '') {
fileName: file.name, return Promise.reject('Please enter the community name !');
extends: Data.residentialName,
};
RA(47, msg, module, dispatch);
} else { } else {
setpreviewImage(file); return Promise.resolve();
setpreviewVisible(true);
} }
}; };
// 点击移除图片
const handRemove = (key: any) => {
key == 1 ? setLouba([]) : key == 2 ? setGuide([]) : setPeriod([]);
};
// 点击遮罩回调
const handleCancel = () => {
setpreviewVisible(false);
// 每次关闭预览都要清掉弹窗图片信息 -- 防止编辑打开页面直接弹出窗口
setpreviewImage({});
dispatch({ type: module + '/urlRemove' });
};
// pdf 总页数
const onDocumentLoadSuccess = (pages: any) => {
setNumPages(pages);
};
// 切换pdf 总数
const onChangePage = (page: any) => {
setPageNumber(page);
};
return ( return (
<> <>
<Spin spinning={loading} tip="loading..." size="large"> <Spin spinning={loading} tip="loading..." size="large">
...@@ -411,49 +306,21 @@ const Adds = (props: any) => { ...@@ -411,49 +306,21 @@ const Adds = (props: any) => {
labelAlign="left" labelAlign="left"
scrollToFirstError={true} scrollToFirstError={true}
> >
{/* 小区邮编、地址和名称 */}
<Form.Item <Form.Item
label="Community Name"
name="des" name="des"
rules={[{ required: false }]} label="Community Name"
rules={[{ validator: checkPrice }]}
style={{ marginBottom: 15 }}
className="must" className="must"
> >
<Input.Group compact> <Facilities
<Form.Item name={['des', 'residentialZipCode']} noStyle rules={village[0] as any}> insdInps={(value: any) => {
<Input insdInp(value);
style={{ marginRight: '10px', width: 120 }} }}
placeholder="6 Postcode" />
maxLength={6}
onKeyUp={keyup_communityManagerFee}
/>
</Form.Item>
<Form.Item name={['des', 'residentialAddress']} noStyle rules={village[1] as any}>
<Input
style={{ width: '360px' }}
placeholder="Please enter community adds"
disabled={codeStrat}
/>
</Form.Item>
<div className="li">
<Form.Item
name={['des', 'residentialName']}
normalize={insdInp}
noStyle
rules={village[2] as any}
>
<Input
style={{ marginRight: '10px', width: '260px' }}
placeholder="Please enter community name"
disabled={codeStrat}
/>
</Form.Item>
{/* 不可修改提示 */}
<span className="redFs">{tipMain}</span>
</div>
</Input.Group>
</Form.Item> </Form.Item>
{/* 小区时间 */}
<Form.Item label="Working Hours" name="workingHours" rules={village[3] as any}> <Form.Item label="Working Hours" name="workingHours" rules={village[3] as any}>
<RangePicker <RangePicker
minuteStep={60} minuteStep={60}
...@@ -461,40 +328,32 @@ const Adds = (props: any) => { ...@@ -461,40 +328,32 @@ const Adds = (props: any) => {
placeholder={['Start Time', 'End Time']} placeholder={['Start Time', 'End Time']}
/> />
</Form.Item> </Form.Item>
{/* 小区联系方式 */}
<Form.Item <Form.Item
name="residentialPhone"
label="Community Telephone" label="Community Telephone"
name="info" rules={village[4] as any}
rules={[{ required: false }]}
className="must"
> >
<Input.Group compact> <Input
<Form.Item name={['info', 'tel']} noStyle rules={village[4] as any}> style={{ marginRight: '10px', width: '240px' }}
<Input placeholder="Please enter phone"
style={{ marginRight: '10px', width: '160px' }} maxLength={11}
placeholder="Please enter phone" onKeyUp={keyup_communityManagerFee}
maxLength={11} />
onKeyUp={keyup_communityManagerFee}
/>
</Form.Item>
<Button type="text">-</Button>
<Form.Item name={['info', 'email']} noStyle rules={village[5] as any}>
<Input
style={{ marginLeft: '10px', width: '180px' }}
placeholder="Please enter email"
/>
</Form.Item>
</Input.Group>
</Form.Item> </Form.Item>
{/* 小区邮箱 */}
<Form.Item name="residentialEmail" label="Community Mailbox" rules={village[5] as any}>
<Input style={{ width: '240px' }} placeholder="Please enter email" />
</Form.Item>
{/* 小区管理员 */}
<Form.Item <Form.Item
label="Administrator" label="Administrator"
name="residentialManagerUserName" name="residentialManagerUserName"
rules={village[6] as any} rules={village[6] as any}
> >
<Input style={{ width: '160px' }} placeholder="Name" maxLength={30} /> <Input style={{ width: '240px' }} placeholder="Please enter name" maxLength={30} />
</Form.Item> </Form.Item>
{/* 小区缴费方式 */}
<Form.Item label="Property Fee" name="propertyFee" style={{ marginBottom: '0' }}> <Form.Item label="Property Fee" name="propertyFee" style={{ marginBottom: '0' }}>
<Checkbox onChange={onChange} disabled> <Checkbox onChange={onChange} disabled>
Online Payment Online Payment
...@@ -503,80 +362,75 @@ const Adds = (props: any) => { ...@@ -503,80 +362,75 @@ const Adds = (props: any) => {
Offline Payment Offline Payment
</Checkbox> </Checkbox>
</Form.Item> </Form.Item>
<hr /> <hr />
{/* 上传部分 */} {/* banner上传部分 */}
<Form.Item <Form.Item
label="Shuttle Bus Timetable" name={'bannerUrl'}
name="balouscheduleFile" label="Banner:"
style={{ marginBottom: '0', minHeight: 159 }} colon={false}
style={{
marginBottom: 8,
}}
> >
<Upload <PictureOptionsRow
{...uploads} action="/tos/image/upload"
{...upload1} data={{
fileList={loubaUpload} imageType: 'communityBannerImage',
beforeUpload={beforeUpload} // extends: codename,
listType="picture-card" }}
disabled={codename == '' ? true : false} limitNums={1}
onPreview={() => handlePreview(loubaUpload[0])} // 预览 // imgs={ImageSrc}
onRemove={() => handRemove(1)} //移除 />
>
{loubaUpload.length >= 1 ? null : uploadButton}
</Upload>
<div className="tip">
<span>Support Files:.jpg, .png, .pdf</span>
</div>
</Form.Item> </Form.Item>
{/* 第一个上传 */}
{/* 上传部分 */}
<Form.Item <Form.Item
label="Property Guide" name={'mainPdfList'}
name="serviceGuideFile" label="Maintenance Schedule:"
style={{ marginBottom: '0', minHeight: 159 }} colon={false}
style={{
marginBottom: tips[0] ? 4 : 14,
}}
> >
<Upload <PdfUpload
{...uploads} action="/tos/community/pdf/upload"
{...upload2} data={{
fileList={guideUpload} type: 'tosCommunityPdf',
beforeUpload={beforeUpload} extends: codename,
listType="picture-card" }}
disabled={codename == '' ? true : false} ></PdfUpload>
onPreview={() => handlePreview(guideUpload[0])} // 预览
onRemove={() => handRemove(2)} //移除
>
{guideUpload.length >= 1 ? null : uploadButton}
</Upload>
<div className="tip">
<span>Support Files:.jpg, .png, .pdf</span>
</div>
</Form.Item> </Form.Item>
{tips[0] ? (
{/* 上传部分 */} <p style={{ margin: '6px 0 10px 160px', color: '#f00' }}>
{/* <Form.Item Please complete or delete the incomplete part !
label="Warranty Period Service" </p>
name="lifeServiceFile" ) : (
style={{ marginBottom: '0', minHeight: 159 }} ''
)}
{/* 第二个上传 */}
<Form.Item
name={'essentialPdfList'}
label=" Essential Information:"
colon={false}
style={{
marginBottom: tips[1] ? 4 : 14,
}}
> >
<Upload <PdfUpload
{...uploads} action="/tos/community/pdf/upload"
{...upload3} data={{
fileList={periodUpload} type: 'tosCommunityPdf',
beforeUpload={beforeUpload} extends: codename,
listType="picture-card" }}
disabled={codename == '' ? true : false} ></PdfUpload>
onPreview={() => handlePreview(periodUpload[0])} // 预览 </Form.Item>{' '}
onRemove={() => handRemove(3)} //移除 {tips[1] ? (
> <p style={{ margin: '6px 0 10px 160px', color: '#f00' }}>
{periodUpload.length >= 1 ? null : uploadButton} Please complete or delete the incomplete part !
</Upload> </p>
<div className="tip"> ) : (
<span>Support Files:.jpg, .png, .pdf</span> ''
</div> )}
</Form.Item> */}
<hr /> <hr />
{/* 帮助中心 */} {/* 帮助中心 */}
<Form.Item label="Help Center" name="help"> <Form.Item label="Help Center" name="help">
<Input.Group compact> <Input.Group compact>
...@@ -596,7 +450,6 @@ const Adds = (props: any) => { ...@@ -596,7 +450,6 @@ const Adds = (props: any) => {
</Form.Item> </Form.Item>
</Input.Group> </Input.Group>
</Form.Item> </Form.Item>
<hr /> <hr />
{/* 提交 */} {/* 提交 */}
<Form.Item label="" colon={false}> <Form.Item label="" colon={false}>
...@@ -606,49 +459,6 @@ const Adds = (props: any) => { ...@@ -606,49 +459,6 @@ const Adds = (props: any) => {
</Form.Item> </Form.Item>
</Form> </Form>
</div> </div>
{/* 附件预览 */}
<Modal
title={previewImage != null ? previewImage.name : 'File Preview'}
visible={previewVisible}
width={800}
onCancel={handleCancel}
style={{ textAlign: 'center' }}
footer={null}
>
{previewImage != null ? (
previewImage.type == 'pdf' ? (
// pdf 换一种
<>
<PDF
file={previewImage.url}
page={pageNumber}
scale={1.25}
onDocumentComplete={onDocumentLoadSuccess}
/>
<Pagination
style={{ textAlign: 'center', marginTop: 10, display: 'block' }}
simple
defaultCurrent={pageNumber}
total={numPages * 10}
onChange={onChangePage}
/>
</>
) : previewImage.type == 'jpg' || previewImage.type == 'png' ? (
// 图片用指定格式
<Image
src={previewImage.url}
preview={false}
style={{ margin: '0 auto', textAlign: 'center' }}
/>
) : (
<FileViewer fileType={previewImage.type} filePath={previewImage.url} />
)
) : (
''
)}
</Modal>
</Spin> </Spin>
</> </>
); );
...@@ -657,7 +467,6 @@ const Adds = (props: any) => { ...@@ -657,7 +467,6 @@ const Adds = (props: any) => {
// export default Adds; // export default Adds;
function map(state: any) { function map(state: any) {
// console.log(state); // console.log(state);
const Data = state.CellList.DataSave; const Data = state.CellList.DataSave;
const { imgUrl, Result } = state.CellList; const { imgUrl, Result } = state.CellList;
const loading = state.loading.models.CellList ? state.loading.models.CellList : false; const loading = state.loading.models.CellList ? state.loading.models.CellList : false;
......
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