Skip to content

E
elegantDeepKinase
Commit da33d10f by wangshufen
Options

feature:搜索优化功能修改

parent 3a8b772b
Showing with 78 additions and 46 deletions
.vscode/settings.json deleted 100644 → 0
{
"liveServer.settings.port": 5501
}
\ No newline at end of file
README.md
项目启动:
1.yarn
2.yarn start
src/routes/Kinase/index.js
......@@ -76,7 +76,7 @@ class Home extends React.Component {
compoundList: ['DrugName', 'Smiles'],
targetList: ['TargetName', 'UniprotId'],
optionsList: [{ label: '查询drug相关靶点', value: 1 }, { label: '查询ligand相关靶点', value: 2, disabled: false }, { label: '是否有PDB结构', value: 3 }],
activeKey: this.props.kinaseSearch.activeTabKey || 'Drug',
activeKinaseTabKey: this.props.kinaseSearch.activeTabKey || 'Drug',
};
// Mutation
CheckChange = (e) => {
......@@ -154,8 +154,10 @@ class Home extends React.Component {
IndicationSearchData.indication = value;
this.setState(() => ({ IndicationSearchData: IndicationSearchData }));
};
//Indication Tab搜索
getIndicationList = () => {
let data = this.state.IndicationSearchData;
this.props.kinaseSearch.addIndicationSearchParams(data);
if (data.indication == '') {
return message.warning('请输入查询条件！');
}
......@@ -189,8 +191,10 @@ class Home extends React.Component {
this.setState(() => ({ ligandSearchData: ligandSearchData }));
// this.setState(()=>({data:e }))
};
//Ligand Tab搜索
getLigendList = () => {
let data = this.state.ligandSearchData;
this.props.kinaseSearch.addLigandSearchParams(data);
if (data.ligand_data == '') {
return message.warning('请输入查询条件！');
}
......@@ -287,8 +291,13 @@ class Home extends React.Component {
TargetSearchData.drug_name = value;
this.setState(() => ({ TargetSearchData: TargetSearchData }));
};
//Target Tab搜索
getTargetList = () => {
let data = this.state.TargetSearchData;
console.log('data:------ ', data);
this.props.kinaseSearch.addTargetSearchParams(data);
if (data.target_class == '' && data.target_data == '') {
return message.warning('请输入查询条件！');
}
......@@ -354,11 +363,19 @@ class Home extends React.Component {
};
componentDidMount() {
console.log('111', this.props.kinaseSearch.searchParams);
if (this.props.kinaseSearch.searchParams.drugs_data) {
this.state.searchData = this.props.kinaseSearch.searchParams;
console.log('111', this.props.kinaseSearch.ligandSearchParams);
if (this.props.kinaseSearch.drugSearchParams.drugs_data) {
this.state.searchData = this.props.kinaseSearch.drugSearchParams;
}
if (this.props.kinaseSearch.targetSearchParams.target_data) {
this.state.TargetSearchData = this.props.kinaseSearch.targetSearchParams;
}
if (this.props.kinaseSearch.ligandSearchParams.ligand_data) {
this.state.ligandSearchData = this.props.kinaseSearch.ligandSearchParams;
}
if (this.props.kinaseSearch.indicationSearchParams.indication) {
this.state.IndicationSearchData = this.props.kinaseSearch.indicationSearchParams;
}
// console.log('222',qs.parse(this.props.location.search.slice(1)),)
// this.getList()
// this.getSelectList()
this.getTargetSelectList();
......@@ -474,9 +491,10 @@ class Home extends React.Component {
console.error(err);
});
};
//Drug Tab搜索
getDrugsList = () => {
let data = this.state.searchData;
this.props.kinaseSearch.addSearchParams(data);
this.props.kinaseSearch.addDrugSearchParams(data);
if (data.drugs_data == '') {
return message.warning('请输入查询条件！');
}
......@@ -513,8 +531,8 @@ class Home extends React.Component {
searchData.name = e;
this.setState(() => ({ searchData: searchData }));
console.log(this.state.searchData);
this.setState({ activeKey: e });
this.props.kinaseSearch.setActiveKey(e);
this.setState({ activeKinaseTabKey: e });
this.props.kinaseSearch.setActiveKinaseTabKey(e);
};
getJsme = () => {
console.log(1);
......@@ -538,7 +556,7 @@ class Home extends React.Component {
<div className='home'>
<div className='home-div'>
{/* <LogoTitlte></LogoTitlte> */}
<Tabs onChange={this.callback} activeKey={this.state.activeKey} type='card'>
<Tabs onChange={this.callback} activeKey={this.state.activeKinaseTabKey} type='card'>
<TabPane tab='Drug' key='Drug'>
<div className='top-div'>
<div>
......@@ -648,7 +666,7 @@ class Home extends React.Component {
<div>
<Form layout='horizontal'>
<Form.Item label='输入Chemblid或Smiles' {...formItemLayout}>
<Input placeholder='请输入' style={{ width: 250 }} size='large' onChange={this.getLigendValue} value={this.state.ligandSearchData.ligand_data} />
<Input placeholder='请输入3' style={{ width: 250 }} size='large' onChange={this.getLigendValue} value={this.state.ligandSearchData.ligand_data} />
</Form.Item>
<Form.Item label='' {...formTailLayout}>
<Button type='primary' style={{ marginRight: '50px' }} onClick={this.getDraw}>
......
src/store/kinaseSearch.js
import { observable, action } from 'mobx';
class KianseSearch {
@observable searchParams = {};
@observable activeKey = '';
@action addSearchParams(data) {
console.log('data', data);
this.searchParams = data;
@observable drugSearchParams = {}; //kinase drug 搜索参数
@observable targetSearchParams = {}; //kinase target 搜索参数
@observable ligandSearchParams = {}; //kinase ligand 搜索参数
@observable indicationSearchParams = {}; //kinase indication 搜索参数
@observable activeKinaseTabKey = ''; //记录选中的tab
@action addDrugSearchParams(data) {
this.drugSearchParams = data;
}
@action addTargetSearchParams(data) {
this.targetSearchParams = data;
}
@action addLigandSearchParams(data) {
this.ligandSearchParams = data;
}
@action setActiveKey = (key) => {
console.log('key----',key)
@action addIndicationSearchParams(data) {
this.indicationSearchParams = data;
}
@action setActiveKinaseTabKey = (key) => {
console.log('key----', key);
this.activeTabKey = key;
};
}
......
src/utils/request.js
......@@ -17,10 +17,26 @@ function disableF12() {
}
// disableF12();
const baseURL = 'http://52.83.169.190:8002/'; //线上正式环境
// const baseURL = 'http://69.235.144.91:8002/'; 测试环境
const request = axios.create({
baseURL,
timeout: 15000,
headers: {
// 'Content-Type': 'application/json',
// 部分接口需要formdate格式的数据 'Content-Type': 'application/x-www-form-urlencoded' qs.stringify(data)
accessToken: getQueryString('token') || localStorage.getItem('token'),
},
});
// 封装同步Ajax请求
function checkAjaxToken() {
const token = getQueryString('token') || localStorage.getItem('token');
let xhr = new XMLHttpRequest();
xhr.open('GET', 'http://69.235.144.91:8048/yszh-login/auth/checkToken', false);
xhr.setRequestHeader('accessToken', token);
xhr.send(null);
......@@ -35,33 +51,18 @@ function checkAjaxToken() {
return false;
}
}
checkAjaxToken();
const token = getQueryString('token') || localStorage.getItem('token');
const baseURL = 'http://52.83.169.190:8002/'; //线上正式环境
// const baseURL = 'http://69.235.144.91:8002/'; 测试环境
const request = axios.create({
baseURL,
timeout: 15000,
headers: {
// 'Content-Type': 'application/json',
// 部分接口需要formdate格式的数据 'Content-Type': 'application/x-www-form-urlencoded' qs.stringify(data)
accessToken: token,
},
});
// checkAjaxToken();
//拦截器
request.interceptors.request.use((config) => {
console.log('config',config);
if (checkAjaxToken()) {
return config;
} else {
console.log('token为空....');
window.open('http://ysplatform.atelligence-ai.com/#/login', '_self');
}
});
// request.interceptors.request.use((config) => {
// console.log('config',config);
// if (checkAjaxToken()) {
// return config;
// } else {
// console.log('token校验失败...');
// window.open('http://ysplatform.atelligence-ai.com/#/login', '_self');
// }
// });
request.interceptors.response.use(
(res) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment