From ebd0471888eefd2d3f4edf8af9a7a3b5033a8802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Sun, 2 Oct 2022 10:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E6=95=B0=EF=BC=8C=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8D=8F?=
=?UTF-8?q?=E8=AE=AE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/AppConfig.js | 2 +-
src/military/task/agreementContent/index.js | 6 +++---
src/military/task/components/itemListTask/index.jsx | 2 +-
src/military/task/components/itemListTask/index.scss | 4 ++++
src/military/task/taskDetail/index.jsx | 4 ++++
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 970cd6201..6e20bcf28 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -34,7 +34,7 @@ export function initAxiosInterceptors(props) {
// 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 = "https://www.osredm.com";
//响应前的设置
axios.interceptors.request.use(
diff --git a/src/military/task/agreementContent/index.js b/src/military/task/agreementContent/index.js
index 13c9fb762..df77db4a2 100644
--- a/src/military/task/agreementContent/index.js
+++ b/src/military/task/agreementContent/index.js
@@ -9,9 +9,9 @@ export default Form.create()(({ form,current_user, showNotification, match, hist
const { getFieldDecorator, validateFields, setFieldsValue } = form;
// console.log(history.location.search);
let search=history.location.search;
- let title='协议模板';
+ let title='应征投稿协议内容';
if(search){
- title=window.decodeURIComponent(search.split('title=')[1]);
+ title=window.decodeURI(search.split('title=')[1]);
}
const [id,setId]=useState(0);
@@ -24,7 +24,7 @@ export default Form.create()(({ form,current_user, showNotification, match, hist
setId(res.data.id);
}
})
- },[])
+ },[title])
// 保存,包括新增和修改
function saveFile() {
diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx
index 5e0341ab6..900ab3196 100644
--- a/src/military/task/components/itemListTask/index.jsx
+++ b/src/military/task/components/itemListTask/index.jsx
@@ -51,7 +51,7 @@ export default (props) => {
{(item.user && item.user.nickname) || (item.user && item.user.login)}
- {item.visits*2+2*item.id}
+ {item.visits}
{/* {item.papersCount || 0}人参与 */}
{(item.status !== 8) && {item.delayTime}}
diff --git a/src/military/task/components/itemListTask/index.scss b/src/military/task/components/itemListTask/index.scss
index 71793ca02..5775733b2 100644
--- a/src/military/task/components/itemListTask/index.scss
+++ b/src/military/task/components/itemListTask/index.scss
@@ -6,6 +6,10 @@
margin: 0 1.5rem;
background: #fff;
border-bottom: 1px solid #dedede;
+
+ .list-content{
+ width: 85%;
+ }
}
.user-box{
cursor: pointer;
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index d21dbf216..e93a52125 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -200,6 +200,10 @@ export default Form.create()(
function downFile(item) {
+ if(!current_user.login){
+ showLoginDialog();
+ return;
+ }
let url = httpUrl + '/busiAttachments/download/' + item.id;
window.open(url);
}