From b8fa0fa65e994fb0a7067e3348ee8604db815a9b Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sun, 26 Apr 2020 09:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/fetch/_fetch.js | 2 -
SunshineIns/src/view/QuestionnairContent/index.js | 62 +++++++++++++++++--------------
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index 087eace..80e2db8 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -2,8 +2,6 @@
// export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://1p885086k1.iok.la';
-//export const base = 'http://nsjcy.hugeinfo.com.cn';
-// export const base = 'http://1p885086k1.iok.la';
export const base = 'http://localhost:6060';
diff --git a/SunshineIns/src/view/QuestionnairContent/index.js b/SunshineIns/src/view/QuestionnairContent/index.js
index 3828d52..073d0ac 100644
--- a/SunshineIns/src/view/QuestionnairContent/index.js
+++ b/SunshineIns/src/view/QuestionnairContent/index.js
@@ -10,13 +10,13 @@
function typeStatus(type) {
switch (type) {
case 1:
- return "企业体检";
+ return '企业体检';
case 2:
- return "培训活动";
+ return '培训活动';
case 3:
- return "未检调查";
+ return '未检调查';
case 4:
- return "刑执监督";
+ return '刑执监督';
}
}
class QuestionnairContent extends React.PureComponent {
@@ -24,7 +24,7 @@
questionnairSign: false,
questionnairTitle: '',
questionnairDescription: '',
- questionnairBusinessType: ''
+ questionnairBusinessType: '',
};
componentDidMount() {
@@ -33,7 +33,8 @@
this.setState({
questionnairTitle: title,
questionnairDescription: content,
- questionnairBusinessType: typeStatus(businessType)
+ // questionnairBusinessType: typeStatus(businessType)
+ questionnairBusinessType: businessType,
});
}
//新增题目时内容页滚动到底部
@@ -59,7 +60,7 @@
this.scrollTo = false;
}
this.setState({
- questionnairSign: nextProps.questionnairSign
+ questionnairSign: nextProps.questionnairSign,
// questionnairTitle: nextProps.questionnairTitle,
// questionnairDescription: nextProps.questionnairDescription
});
@@ -68,8 +69,8 @@
handleSign = () => {
const { onChangeSign } = this.props;
this.setState(
- prevState => ({
- questionnairSign: !prevState.questionnairSign
+ (prevState) => ({
+ questionnairSign: !prevState.questionnairSign,
}),
() => {
onChangeSign(this.state.questionnairSign);
@@ -78,11 +79,11 @@
};
handleChange = ({ target: { value, name } }) => {
- console.log(value, name)
+ console.log(value, name);
this.setState({
- [name]: value
+ [name]: value,
});
- }
+ };
handleBlur = () => {
// const { onBlurTitle } = this.props;
@@ -96,17 +97,17 @@
questionnairSign,
questionnairTitle,
questionnairDescription,
- questionnairBusinessType
+ questionnairBusinessType,
} = this.state;
const { submitQuestionTemp, editors, btnLoading } = this.props;
- console.log(questionnairBusinessType)
+ console.log(questionnairBusinessType);
const questionnairtitleEl = (
<div className="title-inner">
<span style={{ color: 'red' }}>*</span>
<Input
placeholder="问卷标题"
value={questionnairTitle}
- name='questionnairTitle'
+ name="questionnairTitle"
onChange={this.handleChange}
onBlur={this.handleBlur}
style={{
@@ -115,7 +116,7 @@
textAlign: 'center',
fontSize: 18,
color: '#666',
- fontFamily: 'PingFangSC-Medium'
+ fontFamily: 'PingFangSC-Medium',
}}
className="title-input"
/>
@@ -126,7 +127,7 @@
<Input
placeholder="问卷描述"
value={questionnairDescription}
- name='questionnairDescription'
+ name="questionnairDescription"
onChange={this.handleChange}
onBlur={this.handleBlur}
style={{
@@ -135,7 +136,7 @@
textAlign: 'left',
fontSize: 16,
color: '#666',
- fontFamily: 'PingFangSC-Medium'
+ fontFamily: 'PingFangSC-Medium',
}}
className="title-input"
/>
@@ -144,26 +145,31 @@
const questionnairBusinessType1 = (
<div className="title-inner" style={{ marginTop: 10 }}>
<span style={{ color: 'red' }}>*</span>
- <Select placeholder="业务类型"
+ <Select
+ placeholder="业务类型"
value={questionnairBusinessType}
style={{
width: '100%',
textAlign: 'center',
fontSize: 18,
color: '#666',
- fontFamily: 'PingFangSC-Medium'
+ fontFamily: 'PingFangSC-Medium',
}}
- onChange={(value) => this.handleChange({ target: { name: 'questionnairBusinessType', value } })}
+ onChange={(value) =>
+ this.handleChange({
+ target: { name: 'questionnairBusinessType', value },
+ })
+ }
>
- <Option value='1'>企业体检</Option>
- <Option value='2'>培训活动</Option>
- <Option value='3'>未检调查</Option>
- <Option value='4'>刑执监督</Option>
+ <Option value={1}>企业体检</Option>
+ <Option value={2}>培训活动</Option>
+ <Option value={3}>未检调查</Option>
+ <Option value={4}>刑执监督</Option>
</Select>
</div>
);
return (
- <div className="questionnair-page" ref={el => (this.page = el)}>
+ <div className="questionnair-page" ref={(el) => (this.page = el)}>
<div className="questionnair-page-banner">
{/* <div className='banner-text' onClick={this.handleSign} style={{ color: questionnairSign ? '#FFBF47' : '' }}>
<i className="iconfont icon-dengpao"></i>
@@ -177,7 +183,7 @@
</div>
<div
className="questionnair-page-content"
- ref={el => (this.content = el)}
+ ref={(el) => (this.content = el)}
>
{/*如果组件没有子节点，this.props.children返回false*/}
{this.props.children || (
@@ -203,7 +209,7 @@
submitQuestionTemp(editors, {
questionnairTitle,
questionnairDescription,
- questionnairBusinessType
+ questionnairBusinessType,
});
}}
>
--
Gitblit v1.8.0