From 406355203adcc1fe6c92bb59203fb958296a8da4 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Wed, 18 Mar 2020 12:00:10 +0800
Subject: [PATCH] 提交
---
SunshineIns/src/page/ApplyForEdit.jsx | 19 +++++++------------
SunshineIns/src/page/PoliceSecurity.jsx | 4 ++--
SunshineIns/src/fetch/_fetch.js | 4 +++-
SunshineIns/src/page/Login.jsx | 2 +-
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index c1f0b48..c2f1bd5 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -2,7 +2,9 @@
// export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://nsjc.vaiwan.com';
-export const base = 'http://nsjcy.hugeinfo.com.cn';
+// export const base = 'http://nsjcy.hugeinfo.com.cn';
+export const base = 'http://1p885086k1.iok.la';
+
// export const base = 'http://192.168.0.147:8081';
diff --git a/SunshineIns/src/page/ApplyForEdit.jsx b/SunshineIns/src/page/ApplyForEdit.jsx
index 7589c31..7a102bd 100644
--- a/SunshineIns/src/page/ApplyForEdit.jsx
+++ b/SunshineIns/src/page/ApplyForEdit.jsx
@@ -69,7 +69,7 @@
},
disabled: res.status ? true : false,
loading: false,
- fileList: res.list ? res.list.map((item, index) => ({ uid: index, id:item.id, name:item.name, status:'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })):[]
+ fileList: res.list ? res.list.map((item, index) => ({ uid: index, id: item.id, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })) : []
});
})
@@ -241,7 +241,7 @@
this.setState({ fileList });
},
fileList: fileList,
- onDownload:(file)=>{
+ onDownload: (file) => {
Fetch.attachmentDownload(file.id)
.then(res => {
message.success("下载成功！");
@@ -294,20 +294,15 @@
</div>
{
- savedate.status == 2 || savedate.status == 99 ?
+ savedate ?
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
</div>
:
- savedate.status == 1 ?
- <div style={{ display: 'flex', justifyContent: 'center' }}>
- <Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.showModal}>结束任务</Button>
- <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
- </div> :
- <div style={{ display: 'flex', justifyContent: 'center' }}>
- <Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
- <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
- </div>
+ <div style={{ display: 'flex', justifyContent: 'center' }}>
+ <Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
+ <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
+ </div>
}
</BusDetailView>
diff --git a/SunshineIns/src/page/Login.jsx b/SunshineIns/src/page/Login.jsx
index a25323a..c1e21fe 100644
--- a/SunshineIns/src/page/Login.jsx
+++ b/SunshineIns/src/page/Login.jsx
@@ -43,7 +43,7 @@
if (res.code === 0) {
// location.href = res.data;
// location.href ='http://localhost:8080/index.html#/'
- location.href ='http://nsjcy.hugeinfo.com.cn/nsjc-charge/pc/index.html#/'
+ // location.href ='http://nsjcy.hugeinfo.com.cn/nsjc-charge/pc/index.html#/'
} else {
message.error(res.msg, 2)
}
diff --git a/SunshineIns/src/page/PoliceSecurity.jsx b/SunshineIns/src/page/PoliceSecurity.jsx
index c6ff5f8..e3cfaa5 100644
--- a/SunshineIns/src/page/PoliceSecurity.jsx
+++ b/SunshineIns/src/page/PoliceSecurity.jsx
@@ -87,7 +87,7 @@
}))
}
showModal = (id) => {
- this.props.history.push("/entry/policeSecurity/" + id);
+ this.props.history.push("/entry/policeSecurityEdit/" + id);
}
Seaech = () => {
@@ -147,7 +147,7 @@
dataIndex: 'status',
key: 'status',
render: text => (
- text == 1 ? <Badge style={{ backgroundColor: '#6C757C' }} count={'待处理'} /> : text == 2 ? <Badge style={{ backgroundColor: '#F1C40F' }} count={'已受理'} /> : <Badge style={{ backgroundColor: '#2ECC71' }} count={'已反馈'} />
+ text == 1 ? <Badge style={{ backgroundColor: '#6C757C' }} count={'待处理'} /> : text == 2 ? <Badge style={{ backgroundColor: '#F1C40F' }} count={'检察院已审核'} /> : <Badge style={{ backgroundColor: '#2ECC71' }} count={'已反馈'} />
)
}, {
title: '操作',
--
Gitblit v1.8.0