From 8a9247ea6abbe3ae9914428db38e1bc38e77f2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Thu, 2 Feb 2023 17:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E3=80=81?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E3=80=81=E6=88=90=E6=9E=9C=E7=AD=89=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 4 +- src/forge/Head/header.scss | 5 ++- src/forge/Wiki/components/config.js | 2 +- .../achievement/noticeEdit/index.jsx | 5 ++- src/managements/needApply/list.jsx | 6 +-- src/managements/notice/noticeEdit/index.jsx | 5 ++- src/military/components/config.js | 2 +- src/military/components/login/index.jsx | 2 +- src/military/expert/expertList/index.jsx | 13 +++---- .../expert/expertUser/taskDetail/index.jsx | 3 +- src/military/expert/registerList/index.jsx | 13 +++---- .../components/itemAgreementManage/index.jsx | 5 +-- .../task/components/itemDelayManage/index.jsx | 2 +- .../task/components/itemListMyTask/index.jsx | 8 ++-- .../task/components/itemListPaper/index.jsx | 5 +-- .../task/components/itemListTask/index.jsx | 2 +- .../task/components/itemPayProof/index.jsx | 23 ++++++++++-- .../task/components/itemProofManage/index.jsx | 5 +-- .../itemPublicityComplain/index.jsx | 5 +-- .../task/components/itemTaskManage/index.jsx | 2 +- src/military/task/myTask/followTask.jsx | 37 ++----------------- src/military/task/paperComplain/index.js | 3 +- src/military/task/paperManage/index.jsx | 7 ++-- src/military/task/taskDetail/index.jsx | 8 ++-- src/military/task/taskEdit/index.jsx | 6 +-- src/modules/tpm/NewHeader.js | 6 +-- src/modules/tpm/TPMIndex.css | 4 +- 27 files changed, 82 insertions(+), 106 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index 34432e15..7d0284c4 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -33,8 +33,8 @@ export function initAxiosInterceptors(props) { initOnlineOfflineListener(); // var proxy = "http://192.168.1.40:3000"; - // var proxy = "http://111.8.36.180:8000"; - var proxy = "http://117.50.100.12:49999"; + var proxy = "http://111.8.36.180:8000"; + // var proxy = "http://117.50.100.12:49999"; // var proxy = "https://www.osredm.com"; //响应前的设置 diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index d5f4d571..044180a1 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -147,7 +147,7 @@ height: 446px; box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5); border-radius: 4px; - margin-top: -10px; + margin-top: -11px; padding: 12px 1px 12px 0; } } @@ -184,6 +184,9 @@ .message-icon{ position: relative; + height: 60px; + display: inline-flex; + align-items: center; .ant-scroll-number{ // right:12px; padding: 0 0px; diff --git a/src/forge/Wiki/components/config.js b/src/forge/Wiki/components/config.js index bda41339..0ed142a8 100644 --- a/src/forge/Wiki/components/config.js +++ b/src/forge/Wiki/components/config.js @@ -18,7 +18,7 @@ export const editorConfig = { customInsert: function (insertImgFn, result) { // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可 if (result && result.data && result.data.id) { - insertImgFn(`${httpUrl}/busiAttachments/view/${result.data.id}`); + insertImgFn(`${httpUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`); } } }, diff --git a/src/managements/achievement/noticeEdit/index.jsx b/src/managements/achievement/noticeEdit/index.jsx index fe170620..5ed45127 100644 --- a/src/managements/achievement/noticeEdit/index.jsx +++ b/src/managements/achievement/noticeEdit/index.jsx @@ -90,7 +90,7 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) => // result 即服务端返回的接口 // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可 if (result && result.data && result.data.id) { - insertImgFn(`${actionUrl}/busiAttachments/view/${result.data.id}`); + insertImgFn(`${actionUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`); } } } @@ -149,7 +149,8 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) => params.isSecret = Number(params.isSecret); if (fileList && fileList.length) { params.fileName = fileList[0].fileName || fileList[0].response.data.fileName; - params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`; + // params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`; + params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/downloadAttachment/${fileList[0].response.data.uniqueFileName}`; } if (id) { // 编辑 diff --git a/src/managements/needApply/list.jsx b/src/managements/needApply/list.jsx index fa9c67d8..cf772836 100644 --- a/src/managements/needApply/list.jsx +++ b/src/managements/needApply/list.jsx @@ -172,7 +172,7 @@ function List(props){ title: '任务书', dataIndex: 'assignmentBookAttachments', ellipsis: true, - render: (text, record) => {return text ? {text[0].fileName} : '--'} + render: (text, record) => {return text ? {text[0].fileName} : '--'} }, ] case 3: return [ @@ -233,7 +233,7 @@ function List(props){ title: '策划书', dataIndex: 'competitionProposalAttachments', ellipsis: true, - render: (text, record) => {return text ? {text[0].fileName} : '--'} + render: (text, record) => {return text ? {text[0].fileName} : '--'} }, ] default: return [ @@ -292,7 +292,7 @@ function List(props){ title: '成果证明材料', dataIndex: 'achievementMaterialAttachments', ellipsis: true, - render: (text, record) => {return text ? {text[0].fileName} : '--'} + render: (text, record) => {return text ? {text[0].fileName} : '--'} }, ] } diff --git a/src/managements/notice/noticeEdit/index.jsx b/src/managements/notice/noticeEdit/index.jsx index 6957451a..ac05d0bb 100644 --- a/src/managements/notice/noticeEdit/index.jsx +++ b/src/managements/notice/noticeEdit/index.jsx @@ -91,7 +91,7 @@ const NoticeEdit = Form.create()(forwardRef(({ form, match, history }, ref) => { // result 即服务端返回的接口 // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可 if (result && result.data && result.data.id) { - insertImgFn(`${actionUrl}/busiAttachments/view/${result.data.id}`); + insertImgFn(`${actionUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`); } } } @@ -151,7 +151,8 @@ const NoticeEdit = Form.create()(forwardRef(({ form, match, history }, ref) => { params.isSecret = Number(params.isSecret); if (fileList && fileList.length) { params.fileName = fileList[0].fileName || fileList[0].response.data.fileName; - params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`; + // params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`; + params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/downloadAttachment/${fileList[0].response.data.uniqueFileName}`; } if (id) { // 编辑 diff --git a/src/military/components/config.js b/src/military/components/config.js index 320dd15f..548734e2 100644 --- a/src/military/components/config.js +++ b/src/military/components/config.js @@ -18,7 +18,7 @@ export const editorConfig = { customInsert: function (insertImgFn, result) { // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可 if (result && result.data && result.data.id) { - insertImgFn(`${httpUrl}/busiAttachments/view/${result.data.id}`); + insertImgFn(`${httpUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`); } } }, diff --git a/src/military/components/login/index.jsx b/src/military/components/login/index.jsx index 57d3804f..d9655ebd 100644 --- a/src/military/components/login/index.jsx +++ b/src/military/components/login/index.jsx @@ -92,7 +92,7 @@ export default ({ current_user, showLoginDialog }) => { src={getImageUrl(current_user.image_url)} width="34"> {/* */} -