lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lsf-dev'

lsf-dev
李神峰 2024-10-23 16:02:48 +08:00
parent d6967ec90c 79ac246f18
commit 442c60a204
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/request.js
View File

@ -40,12 +40,12 @@ async function send(url, options) {
} }
const { code } = res.data; const { code } = res.data;
// if (code === 401) { if (code === 405) {
// // debugger; // debugger;
// //window.location.href = '/mgr/home';// /mgr/home /login //window.location.href = '/mgr/home';// /mgr/home /login
// window.location.href = '/tsg/#/login'; window.location.href = '/tsg/#/login';
// // window.location.hash = '#/login'; // window.location.hash = '#/login';
// } }
return res.data; return res.data;
} catch (e) { } catch (e) {
//message.error(e); //message.error(e);

2
src/views/gcaqjc/gcaqyj/yjgzpz/form.js
View File

@ -137,7 +137,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
useEffect(()=>{ useEffect(()=>{
if (mode !== "save" ) { if (mode !== "save" ) {
// getFileInfo(record) // getFileInfo(record)
// setCondition("1") setCondition(record?.condition)
setTypes(record.type) setTypes(record.type)
} }
}, [record, mode]) }, [record, mode])

2
src/views/rcgl/aqgl/fxgkqd/index.js
View File

@ -49,7 +49,7 @@ const Page = () => {
title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center', title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center',
render: (value) => <span>{value ? value.map(item => item.dictNm).join():''}</span> render: (value) => <span>{value ? value.map(item => item.dictNm).join():''}</span>
}, },
{title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 200,align: 'center',}, {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',},
{title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',}, {title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',},
{ {
title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center', title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',

4
src/views/rcgl/xcxj/xjrw/form.js
View File

@ -59,10 +59,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
} }
const onfinish = (values) => { const onfinish = (values) => {
const userId = localStorage.getItem('userId') const userId = localStorage.getItem('userId')
const userName = localStorage.getItem('userName')
values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):'' values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):''
values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : '' values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : ''
values.createUserId = userId values.createUserId = userId
values.createUserName = userName;
values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName
values.items = itemParams; values.items = itemParams;
if (mode === 'save') { if (mode === 'save') {

2
src/views/sq/qzq/gcdsj/index.js
View File

@ -120,7 +120,7 @@ const viewPdf = (params) => {
<Timeline.Item key={index}> <Timeline.Item key={index}>
<div className='time-line-item'> <div className='time-line-item'>
<span style={{width:100}}>{item.eventsDate}</span> <span style={{width:100}}>{item.eventsDate}</span>
<div className='item-right'> <div className='dsj-item-right'>
<span>{item.eventsDesc}</span> <span>{item.eventsDesc}</span>
<div style={{ display: "flex"}}> <div style={{ display: "flex"}}>
<span>附件：</span> <span>附件：</span>

2
src/views/sq/qzq/gcdsj/index.less
View File

@ -23,7 +23,7 @@
display: flex; display: flex;
// align-items: center; // align-items: center;
column-gap: 20px; column-gap: 20px;
.item-right{ .dsj-item-right{
flex:1 flex:1
} }
} }

4
src/views/sz/pxjlgl/index.js
View File

@ -166,8 +166,8 @@ const Page = () => {
callback={refresh} callback={refresh}
/> />
</Card> </Card>
<div className="ant-card-body" style={{padding:"20px 0 0 0"}}> <div className="ant-card-body" style={{padding:"20px 20px 0 0"}}>
<Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/> <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 680px )"}}/>
</div> </div>
</div> </div>