diff --git a/src/setupProxy.js b/src/setupProxy.js index 84d5b7104..d6ab7969a 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -5,10 +5,11 @@ module.exports = function (app) { app.use( '/gunshiApp', createProxyMiddleware({ - target: 'http://local.gunshiiot.com:18083/',//测试 + // target: 'http://local.gunshiiot.com:18083/',//测试 // target: 'http://192.168.66.199:24105/',//正式 // target: 'http://36.139.207.50:18083/',//移动云 // target: 'http://192.168.66.49:24105/',//移动云 + target: 'http://192.168.66.32:24105/', //ls changeOrigin: true, }) ); diff --git a/src/views/rcgl/zmjk/ModalContent.js b/src/views/rcgl/zmjk/ModalContent.js index b9ee4b935..4ddc22ba2 100644 --- a/src/views/rcgl/zmjk/ModalContent.js +++ b/src/views/rcgl/zmjk/ModalContent.js @@ -52,8 +52,8 @@ export default function ModalContent() {
diff --git a/src/views/sz/zdgl/form.js b/src/views/sz/zdgl/form.js index 8b8bc0e41..605de61a1 100644 --- a/src/views/sz/zdgl/form.js +++ b/src/views/sz/zdgl/form.js @@ -111,7 +111,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { fileId: o.fileId } }, - })) + })) setFileList(imgFile) } }, [record, mode]) @@ -194,7 +194,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
- {file.name.indexOf('.docx') > -1 ? + {file.name.indexOf('.doc') > -1 ?
{ download(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} @@ -220,7 +220,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
: - file.name.indexOf('.xlsx') > -1 ? + file.name.indexOf('.xls') > -1 ?
{ download(file.response?.data?.fileId) }} style={{ cursor: 'pointer' }} diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js index 11f529e8f..039b09594 100644 --- a/src/views/sz/zdgl/index.js +++ b/src/views/sz/zdgl/index.js @@ -39,7 +39,7 @@ const Page = () => { title: '发布单位', key: 'fillUnit', dataIndex: 'fillUnit' }, { - title: '上传时间', key: 'uploadDate', dataIndex: 'uploadDate' + title: '上传时间', key: 'minUpTime', dataIndex: 'minUpTime' }, { title: '附件', key: 'files', dataIndex: 'files', render:(v,r)=>download(v[0].fileId,v[0]?.fileName)}>{v[0]?.fileName} diff --git a/src/views/szydd/ddjl/index.js b/src/views/szydd/ddjl/index.js index d95a50dd3..325b71a60 100644 --- a/src/views/szydd/ddjl/index.js +++ b/src/views/szydd/ddjl/index.js @@ -86,8 +86,6 @@ const Page = () => { const { tableProps, search, refresh } = usePageTable(createCrudService(apiurl.ddjl.page).find_noCode); - console.log(tableProps); - /** * @description 处理成功的回调 */ @@ -109,7 +107,7 @@ const Page = () => { "pageSize": 10, "pageNumber": 1 }, - "dateSo": { + "dateTimeSo": { "start": moment().format('YYYY-01-01 00:00:00'), "end": moment().format('YYYY-MM-DD HH:mm:ss') } diff --git a/src/views/szydd/ddjl/toolbar.js b/src/views/szydd/ddjl/toolbar.js index 4a2399877..cef574aa6 100644 --- a/src/views/szydd/ddjl/toolbar.js +++ b/src/views/szydd/ddjl/toolbar.js @@ -21,24 +21,24 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVa } const onFinish = (values) => { - let dateSo; + let dateTimeSo; if (values.tm) { - dateSo = { + dateTimeSo = { start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'), end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00') } } delete values.tm - setSearchVal({...values, dateSo}); + setSearchVal({...values, dateTimeSo}); } useEffect(() => { - let dateSo = { + let dateTimeSo = { start: moment().format('YYYY-01-01 00:00:00'), end: moment().format('YYYY-MM-DD 00:00:00') } - form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) - setSearchVal({ dateSo }) + form.setFieldValue("tm", [moment(dateTimeSo.start), moment(dateTimeSo.end)]) + setSearchVal({ dateTimeSo }) }, []) return (