Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sass-admin
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hqzhdj_app
sass-admin
Commits
e08fb120
Commit
e08fb120
authored
Apr 23, 2025
by
yanglang123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
0f44f00a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
117 additions
and
346 deletions
+117
-346
dist.zip
+0
-0
src/pages/SystemManagement/Article/addEditForm.jsx
+7
-3
src/pages/SystemManagement/Information/InfoComment.jsx
+5
-2
src/pages/SystemManagement/Information/index.jsx
+14
-14
src/pages/SystemManagement/Information/redux/commentAction.js
+1
-0
src/pages/SystemManagement/Mailbox/index.jsx
+1
-2
src/pages/TrainingPrograms/ProgeamsManage/Baseinfoform.jsx
+0
-148
src/pages/TrainingPrograms/ProgeamsManage/EnrollManag.jsx
+8
-8
src/pages/TrainingPrograms/ProgeamsManage/NewEnrollForm.jsx
+2
-2
src/pages/TrainingPrograms/ProgeamsManage/Plan/Plan.jsx
+0
-0
src/pages/TrainingPrograms/ProgeamsManage/index.jsx
+22
-50
src/pages/TrainingTools/Question/Create/Base.jsx
+19
-18
src/pages/TrainingTools/Question/Create/index.jsx
+4
-4
src/pages/TrainingTools/Question/Details/index.jsx
+7
-12
src/pages/TrainingTools/Question/index.jsx
+8
-0
src/pages/TrainingTools/Question/redux/actions.js
+8
-69
src/pages/TrainingTools/Survey/Create/Base.jsx
+1
-0
src/pages/TrainingTools/Survey/Details/index.jsx
+10
-14
No files found.
dist.zip
deleted
100644 → 0
View file @
0f44f00a
File deleted
src/pages/SystemManagement/Article/addEditForm.jsx
View file @
e08fb120
...
@@ -4,6 +4,7 @@ import {
...
@@ -4,6 +4,7 @@ import {
Modal
,
Modal
,
Form
,
Form
,
Input
,
Input
,
Textarea
,
Radio
,
Radio
,
Cascader
,
Cascader
,
DatePicker
,
DatePicker
,
...
@@ -252,12 +253,15 @@ class addEdit extends React.Component {
...
@@ -252,12 +253,15 @@ class addEdit extends React.Component {
})(<
Input
disabled=
{
type
!=
"edit"
?
true
:
false
}
/>)
}
})(<
Input
disabled=
{
type
!=
"edit"
?
true
:
false
}
/>)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"正文"
>
<
FormItem
{
...
formItemLayout
}
label=
"正文"
>
<
Editor
{
/*
<Editor
key={this.props.keyValue}
key={this.props.keyValue}
cbReceiver={this.getEditorHtml}
cbReceiver={this.getEditorHtml}
importContent=
{
seeEdit
&&
seeEdit
.
content
}
importContent={seeEdit.content}
disabled={type != "edit" ? true : false}
disabled={type != "edit" ? true : false}
/>
/> */
}
{
getFieldDecorator
(
"content"
,
{
initialValue
:
seeEdit
&&
seeEdit
.
content
,
})(<
Input
style=
{
{
"minHeight"
:
'40px'
}
}
disabled=
{
type
!=
"edit"
?
true
:
false
}
/>)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"图片"
>
<
FormItem
{
...
formItemLayout
}
label=
"图片"
>
...
...
src/pages/SystemManagement/Information/InfoComment.jsx
View file @
e08fb120
...
@@ -239,6 +239,7 @@ class InfoComment extends React.Component {
...
@@ -239,6 +239,7 @@ class InfoComment extends React.Component {
},
},
{
{
trainingProjectId
:
this
.
props
.
id
,
trainingProjectId
:
this
.
props
.
id
,
bizType
:
2
,
pageNo
:
this
.
state
.
pageNo
,
pageNo
:
this
.
state
.
pageNo
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
},
},
...
@@ -260,6 +261,7 @@ class InfoComment extends React.Component {
...
@@ -260,6 +261,7 @@ class InfoComment extends React.Component {
},
},
{
{
trainingProjectId
:
this
.
props
.
id
,
trainingProjectId
:
this
.
props
.
id
,
bizType
:
2
,
pageNo
:
this
.
state
.
pageNo
,
pageNo
:
this
.
state
.
pageNo
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
},
},
...
@@ -281,6 +283,7 @@ class InfoComment extends React.Component {
...
@@ -281,6 +283,7 @@ class InfoComment extends React.Component {
},
},
{
{
trainingProjectId
:
this
.
props
.
id
,
trainingProjectId
:
this
.
props
.
id
,
bizType
:
2
,
pageNo
:
this
.
state
.
pageNo
,
pageNo
:
this
.
state
.
pageNo
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
},
},
...
@@ -328,7 +331,7 @@ class InfoComment extends React.Component {
...
@@ -328,7 +331,7 @@ class InfoComment extends React.Component {
return
(
return
(
<
div
className=
{
styles
.
comment
}
>
<
div
className=
{
styles
.
comment
}
>
<
div
className=
{
styles
.
mar40
}
>
<
div
className=
{
styles
.
mar40
}
>
<
span
>
{
/*
<span>
<h2>{this.props.name}</h2>
<h2>{this.props.name}</h2>
<Row style={{ top: "-10px" }}>
<Row style={{ top: "-10px" }}>
<Col span={4} key={4} style={{ float: "right" }}>
<Col span={4} key={4} style={{ float: "right" }}>
...
@@ -340,7 +343,7 @@ class InfoComment extends React.Component {
...
@@ -340,7 +343,7 @@ class InfoComment extends React.Component {
</Popconfirm>
</Popconfirm>
</Col>
</Col>
</Row>
</Row>
</
span
>
</span>
*/
}
<
Table
<
Table
columns=
{
this
.
columns
}
columns=
{
this
.
columns
}
dataSource=
{
commentlist
.
list
}
dataSource=
{
commentlist
.
list
}
...
...
src/pages/SystemManagement/Information/index.jsx
View file @
e08fb120
...
@@ -1101,13 +1101,13 @@ class Information extends React.Component {
...
@@ -1101,13 +1101,13 @@ class Information extends React.Component {
key
:
"readNum"
,
key
:
"readNum"
,
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
},
},
{
//
{
title
:
"点赞量"
,
//
title: "点赞量",
dataIndex
:
"admireNum"
,
//
dataIndex: "admireNum",
width
:
"80px"
,
//
width: "80px",
key
:
"admireNum"
,
//
key: "admireNum",
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
//
render: text => <span>{text ? text : 0}</span>,
},
//
},
{
{
title
:
"收藏量"
,
title
:
"收藏量"
,
dataIndex
:
"favoriteNum"
,
dataIndex
:
"favoriteNum"
,
...
@@ -1115,13 +1115,13 @@ class Information extends React.Component {
...
@@ -1115,13 +1115,13 @@ class Information extends React.Component {
key
:
"favoriteNum"
,
key
:
"favoriteNum"
,
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
},
},
{
//
{
title
:
"转发量"
,
//
title: "转发量",
dataIndex
:
"relayNum"
,
//
dataIndex: "relayNum",
width
:
"80px"
,
//
width: "80px",
key
:
"relayNum"
,
//
key: "relayNum",
render
:
text
=>
<
span
>
{
text
?
text
:
0
}
</
span
>,
//
render: text => <span>{text ? text : 0}</span>,
},
//
},
{
{
title
:
"操作"
,
title
:
"操作"
,
dataIndex
:
"operation"
,
dataIndex
:
"operation"
,
...
...
src/pages/SystemManagement/Information/redux/commentAction.js
View file @
e08fb120
...
@@ -177,6 +177,7 @@ export function checkComment(param, page, callback) {
...
@@ -177,6 +177,7 @@ export function checkComment(param, page, callback) {
export
function
tpCommentDel
(
param
,
page
,
callback
)
{
export
function
tpCommentDel
(
param
,
page
,
callback
)
{
let
params
=
{};
let
params
=
{};
params
.
replyId
=
param
.
id
;
params
.
replyId
=
param
.
id
;
params
.
bizType
=
"2"
;
if
(
param
.
isreply
)
{
if
(
param
.
isreply
)
{
return
dispatch
=>
{
return
dispatch
=>
{
return
request
({
return
request
({
...
...
src/pages/SystemManagement/Mailbox/index.jsx
View file @
e08fb120
...
@@ -417,11 +417,10 @@ class Mailbox extends React.Component {
...
@@ -417,11 +417,10 @@ class Mailbox extends React.Component {
<a
<a
className={Styles.marr10}
className={Styles.marr10}
onClick={() => {
onClick={() => {
this.setState({ title: "编辑" });
this.seeEdit(record.id, "edit");
this.seeEdit(record.id, "edit");
}}
}}
>
>
编辑
删除
</a>
</a>
</div> */
}
</div> */
}
</
div
>
</
div
>
...
...
src/pages/TrainingPrograms/ProgeamsManage/Baseinfoform.jsx
View file @
e08fb120
...
@@ -188,36 +188,8 @@ class App extends React.Component {
...
@@ -188,36 +188,8 @@ class App extends React.Component {
],
],
})(<
Input
placeholder=
"未命名的学习活动"
disabled=
{
usable
}
/>)
}
})(<
Input
placeholder=
"未命名的学习活动"
disabled=
{
usable
}
/>)
}
</
Col
>
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
Row
>
</
FormItem
>
</
FormItem
>
{
/* 副标题 */
}
<
FormItem
{
...
formItemLayout
}
label=
"副标题"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"subtitle"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
subtitle
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入副标题"
,
50
);
},
},
],
})(<
Input
placeholder=
"请输入副标题"
disabled=
{
usable
}
/>)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
{
/* 活动Logo */
}
{
/* {(this.props.infoTitle === "新建信息"||this.props.infoTitle === "修改信息") && ( */
}
{
/* <UpLoad {...uploadPropsNew} ref={c => (this.validate = c)} /> */
}
<
FormItem
{
...
formItemLayout
}
label=
"活动Logo:"
>
<
FormItem
{
...
formItemLayout
}
label=
"活动Logo:"
>
{
getFieldDecorator
(
"logo"
,
{
{
getFieldDecorator
(
"logo"
,
{
rules
:
[
rules
:
[
...
@@ -242,28 +214,6 @@ class App extends React.Component {
...
@@ -242,28 +214,6 @@ class App extends React.Component {
/>
/>
)
}
)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"图片来源"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"pictureSource"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
pictureSource
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入图片来源"
,
50
);
},
},
],
})(<
Input
placeholder=
"请输入图片来源"
disabled=
{
usable
}
/>)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
{
/* )} */
}
{
/* {this.props.infoTitle === "查看信息" &&
{
/* {this.props.infoTitle === "查看信息" &&
trainfirstinfo !== undefined && (
trainfirstinfo !== undefined && (
...
@@ -407,38 +357,6 @@ class App extends React.Component {
...
@@ -407,38 +357,6 @@ class App extends React.Component {
],
],
})(<
Input
placeholder=
"请输入活动地址"
disabled=
{
usable
}
/>)
}
})(<
Input
placeholder=
"请输入活动地址"
disabled=
{
usable
}
/>)
}
</
Col
>
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"上传视频地址"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"videoUrl"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
videoUrl
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入上传视频地址"
,
50
);
},
},
],
})(
<
Input
placeholder=
"请输入上传视频地址"
disabled=
{
usable
}
/>
)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
Row
>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"组织方"
>
<
FormItem
{
...
formItemLayout
}
label=
"组织方"
>
...
@@ -462,69 +380,6 @@ class App extends React.Component {
...
@@ -462,69 +380,6 @@ class App extends React.Component {
</Col>*/
}
</Col>*/
}
</
Row
>
</
Row
>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"协办方"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"coOrganizer"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
coOrganizer
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入协办方"
,
50
);
},
},
],
})(<
Input
placeholder=
"请输入协办方"
disabled=
{
usable
}
/>)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"温馨提示"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"tips"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
tips
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入温馨提示"
,
50
);
},
},
],
})(<
Input
placeholder=
"请输入温馨提示"
disabled=
{
usable
}
/>)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"其他提示"
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
{
getFieldDecorator
(
"other"
,
{
initialValue
:
trainfirstinfo
!==
""
?
trainfirstinfo
.
other
:
""
,
//bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules
:
[
{
required
:
false
,
validator
:
(
rule
,
value
,
callback
)
=>
{
validator
(
rule
,
value
,
callback
,
"请输入其他提示"
,
50
);
},
},
],
})(<
Input
placeholder=
"请输入协办方"
disabled=
{
usable
}
/>)
}
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"活动奖励"
>
<
FormItem
{
...
formItemLayout
}
label=
"活动奖励"
>
<
Row
gutter=
{
12
}
>
<
Row
gutter=
{
12
}
>
<
Col
span=
{
16
}
>
<
Col
span=
{
16
}
>
...
@@ -541,9 +396,6 @@ class App extends React.Component {
...
@@ -541,9 +396,6 @@ class App extends React.Component {
],
],
})(<
Input
placeholder=
"请输入活动奖励"
disabled=
{
usable
}
/>)
}
})(<
Input
placeholder=
"请输入活动奖励"
disabled=
{
usable
}
/>)
}
</
Col
>
</
Col
>
{
/*<Col span={6}>
<Button size="small" disabled={usable} >复制已有活动</Button>
</Col>*/
}
</
Row
>
</
Row
>
</
FormItem
>
</
FormItem
>
<
FormItem
label=
"奖励详情"
{
...
formItemLayout
}
>
<
FormItem
label=
"奖励详情"
{
...
formItemLayout
}
>
...
...
src/pages/TrainingPrograms/ProgeamsManage/EnrollManag.jsx
View file @
e08fb120
...
@@ -76,14 +76,14 @@ class EnrollManag extends React.Component {
...
@@ -76,14 +76,14 @@ class EnrollManag extends React.Component {
return
<
span
>
已报名
</
span
>;
return
<
span
>
已报名
</
span
>;
},
},
},
},
{
//
{
title
:
"报名花费"
,
//
title: "报名花费",
dataIndex
:
"expenditure"
,
//
dataIndex: "expenditure",
key
:
"expenditure"
,
//
key: "expenditure",
render
:
text
=>
{
//
render: text => {
return
text
?
text
:
"/"
;
//
return text?text:"/";
},
//
},
},
//
},
{
{
title
:
"审核结果"
,
title
:
"审核结果"
,
dataIndex
:
"auditResult"
,
dataIndex
:
"auditResult"
,
...
...
src/pages/TrainingPrograms/ProgeamsManage/NewEnrollForm.jsx
View file @
e08fb120
...
@@ -211,7 +211,7 @@ class enrollform extends React.Component {
...
@@ -211,7 +211,7 @@ class enrollform extends React.Component {
<
div
style=
{
{
marginTop
:
"20px"
}
}
>
<
div
style=
{
{
marginTop
:
"20px"
}
}
>
<
Form
{
...
formItemLayout
}
>
<
Form
{
...
formItemLayout
}
>
<
FormItem
label=
{
intl
.
get
(
"exchangeConfigText32"
)
}
>
{
/*
<FormItem label={intl.get("exchangeConfigText32")} >
{getFieldDecorator("isPayForEnroll", {
{getFieldDecorator("isPayForEnroll", {
initialValue: String(isPayForEnroll),
initialValue: String(isPayForEnroll),
...
@@ -274,7 +274,7 @@ class enrollform extends React.Component {
...
@@ -274,7 +274,7 @@ class enrollform extends React.Component {
</Fragment>
</Fragment>
: ""
: ""
}
}
*/
}
{
/* 报名日期 */
}
{
/* 报名日期 */
}
{
(
this
.
props
.
infoTitle
===
"新建信息"
&&
(
{
(
this
.
props
.
infoTitle
===
"新建信息"
&&
(
...
...
src/pages/TrainingPrograms/ProgeamsManage/Plan/Plan.jsx
View file @
e08fb120
This diff is collapsed.
Click to expand it.
src/pages/TrainingPrograms/ProgeamsManage/index.jsx
View file @
e08fb120
...
@@ -783,7 +783,6 @@ class NewTP extends Component {
...
@@ -783,7 +783,6 @@ class NewTP extends Component {
}
}
// 导出签到记录
// 导出签到记录
downTxt
=
record
=>
{
downTxt
=
record
=>
{
console
.
log
(
1111
,
record
);
let
data
=
{
let
data
=
{
trainingProjectId
:
record
,
trainingProjectId
:
record
,
};
};
...
@@ -792,29 +791,28 @@ class NewTP extends Component {
...
@@ -792,29 +791,28 @@ class NewTP extends Component {
data
,
data
,
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
code
===
"1000"
)
{
if
(
res
.
code
===
"1000"
)
{
message
.
success
(
res
.
data
);
message
.
loading
(
"数据导出中.."
,
3
).
then
(()
=>
window
.
open
(
res
.
data
)
);
}
else
{
}
else
{
message
.
error
(
res
.
subMsg
);
message
.
error
(
res
.
subMsg
);
}
}
});
});
};
};
// 导出项目清单
// 导出项目清单
downActivityTxt
=
record
=>
{
// downActivityTxt = record => {
console
.
log
(
"项目"
,
record
);
// let data = {
let
data
=
{
// tpId: record,
tpId
:
record
,
// };
};
// return request({
return
request
({
// url: activitiesExport,
url
:
activitiesExport
,
// data,
data
,
// }).then(res => {
}).
then
(
res
=>
{
// if (res.code === "1000") {
if
(
res
.
code
===
"1000"
)
{
// message.success(res.data);
message
.
success
(
res
.
data
);
// } else {
}
else
{
// message.error(res.subMsg);
message
.
error
(
res
.
subMsg
);
// }
}
// });
});
// };
};
// 下载二维码
// 下载二维码
downqcode
()
{
downqcode
()
{
const
saveAs
=
require
(
"../../../common/FileSaver.js"
);
const
saveAs
=
require
(
"../../../common/FileSaver.js"
);
...
@@ -1242,21 +1240,15 @@ class NewTP extends Component {
...
@@ -1242,21 +1240,15 @@ class NewTP extends Component {
const
param
=
{
const
param
=
{
// 项目名字
// 项目名字
name
:
values
.
name
.
trim
(),
name
:
values
.
name
.
trim
(),
subtitle
:
values
.
subtitle
,
detailsImage
:
[
detailsImage
:
[
{
{
id
:
parseFloat
(
Math
.
random
()).
toFixed
(
6
)
*
1000000
,
id
:
parseFloat
(
Math
.
random
()).
toFixed
(
6
)
*
1000000
,
img
:
values
.
activityUrl
,
img
:
values
.
activityUrl
,
},
},
],
],
pictureSource
:
values
.
pictureSource
,
activityAddress
:
values
.
activityAddress
,
activityAddress
:
values
.
activityAddress
,
organizer
:
values
.
organizer
,
organizer
:
values
.
organizer
,
coOrganizer
:
values
.
coOrganizer
,
tips
:
values
.
tips
,
other
:
values
.
other
,
activityReward
:
values
.
activityReward
,
activityReward
:
values
.
activityReward
,
videoUrl
:
values
.
videoUrl
,
// logo地址
// logo地址
logoImg
:
values
.
logo
,
logoImg
:
values
.
logo
,
// 分类
// 分类
...
@@ -1308,33 +1300,19 @@ class NewTP extends Component {
...
@@ -1308,33 +1300,19 @@ class NewTP extends Component {
moment
(
values
.
time
[
1
]).
format
(
"YYYY-MM-DD HH:mm:ss"
)
moment
(
values
.
time
[
1
]).
format
(
"YYYY-MM-DD HH:mm:ss"
)
).
getTime
(),
).
getTime
(),
// 是否需要审核,付费报名不需要审核
// 是否需要审核,付费报名不需要审核
needAudit
:
needAudit
:
values
.
needAudit
parseInt
(
values
.
isPayForEnroll
)
==
1
?
0
:
values
.
needAudit
?
1
?
1
:
0
,
:
0
,
// 报名人数限制
// 报名人数限制
enablePay
:
0
,
personLimitNum
:
values
.
personLimitNum
?
values
.
personLimitNum
:
0
,
personLimitNum
:
values
.
personLimitNum
?
values
.
personLimitNum
:
0
,
// 报名须知
// 报名须知
notice
:
values
.
notice
?
values
.
notice
:
""
,
notice
:
values
.
notice
?
values
.
notice
:
""
,
//是否付费报名,否:0;是:1
enablePay
:
parseInt
(
values
.
isPayForEnroll
),
//购买实际价格 当enablePay=1时必填
//购买实际价格 当enablePay=1时必填
actualPrice
:
parseInt
(
values
.
enrollPrice
),
actualPrice
:
parseInt
(
values
.
enrollPrice
),
originalPrice
:
originalPrice
:
values
.
isShowOriginalPrice
==
"0"
?
null
:
enrollOriginalPrice
,
values
.
isShowOriginalPrice
==
"0"
?
null
:
enrollOriginalPrice
,
};
};
if
(
parseInt
(
values
.
isPayForEnroll
)
==
1
)
{
that
.
setState
({
isPayTrain
:
true
,
});
}
else
{
that
.
setState
({
isPayTrain
:
false
,
});
}
//
//
//签到
//签到
var
enablePosition
=
this
.
state
.
signPosition
?
1
:
0
;
var
enablePosition
=
this
.
state
.
signPosition
?
1
:
0
;
...
@@ -1716,21 +1694,15 @@ class NewTP extends Component {
...
@@ -1716,21 +1694,15 @@ class NewTP extends Component {
const
param
=
{
const
param
=
{
// 项目名字
// 项目名字
name
:
values
.
name
.
trim
(),
name
:
values
.
name
.
trim
(),
subtitle
:
values
.
subtitle
,
detailsImage
:
[
detailsImage
:
[
{
{
id
:
parseFloat
(
Math
.
random
()).
toFixed
(
6
)
*
1000000
,
id
:
parseFloat
(
Math
.
random
()).
toFixed
(
6
)
*
1000000
,
img
:
values
.
activityUrl
,
img
:
values
.
activityUrl
,
},
},
],
],
pictureSource
:
values
.
pictureSource
,
activityAddress
:
values
.
activityAddress
,
activityAddress
:
values
.
activityAddress
,
organizer
:
values
.
organizer
,
organizer
:
values
.
organizer
,
coOrganizer
:
values
.
coOrganizer
,
tips
:
values
.
tips
,
other
:
values
.
other
,
activityReward
:
values
.
activityReward
,
activityReward
:
values
.
activityReward
,
videoUrl
:
values
.
videoUrl
,
// logo地址
// logo地址
logoImg
:
this
.
state
.
logourl
,
logoImg
:
this
.
state
.
logourl
,
// 分类
// 分类
...
@@ -1794,7 +1766,7 @@ class NewTP extends Component {
...
@@ -1794,7 +1766,7 @@ class NewTP extends Component {
// 报名须知
// 报名须知
notice
:
values
.
notice
?
values
.
notice
:
""
,
notice
:
values
.
notice
?
values
.
notice
:
""
,
//是否付费报名,否:0;是:1
//是否付费报名,否:0;是:1
enablePay
:
parseInt
(
values
.
isPayForEnroll
)
,
enablePay
:
0
,
//购买实际价格 当enablePay=1时必填
//购买实际价格 当enablePay=1时必填
actualPrice
:
parseInt
(
values
.
enrollPrice
),
actualPrice
:
parseInt
(
values
.
enrollPrice
),
originalPrice
:
originalPrice
:
...
@@ -2033,7 +2005,7 @@ class NewTP extends Component {
...
@@ -2033,7 +2005,7 @@ class NewTP extends Component {
// 报名须知
// 报名须知
notice
:
values
.
notice
?
values
.
notice
:
""
,
notice
:
values
.
notice
?
values
.
notice
:
""
,
//是否付费报名,否:0;是:1
//是否付费报名,否:0;是:1
enablePay
:
parseInt
(
values
.
isPayForEnroll
)
,
enablePay
:
0
,
//购买实际价格 当enablePay=1时必填
//购买实际价格 当enablePay=1时必填
actualPrice
:
parseInt
(
values
.
enrollPrice
),
actualPrice
:
parseInt
(
values
.
enrollPrice
),
originalPrice
:
originalPrice
:
...
@@ -3212,7 +3184,7 @@ class NewTP extends Component {
...
@@ -3212,7 +3184,7 @@ class NewTP extends Component {
""
""
)
}
)
}
<
div
>
{
/*
<div>
<Popconfirm
<Popconfirm
title="确认导出?"
title="确认导出?"
okText="确定"
okText="确定"
...
@@ -3223,7 +3195,7 @@ class NewTP extends Component {
...
@@ -3223,7 +3195,7 @@ class NewTP extends Component {
导出项目清单
导出项目清单
</a>
</a>
</Popconfirm>
</Popconfirm>
</
div
>
</div>
*/
}
</
div
>
</
div
>
),
),
},
},
...
...
src/pages/TrainingTools/Question/Create/Base.jsx
View file @
e08fb120
...
@@ -50,17 +50,17 @@ class Base extends Component {
...
@@ -50,17 +50,17 @@ class Base extends Component {
data
:
[
data
:
[
{
{
key
:
"1"
,
key
:
"1"
,
name
:
"金融行业
调研
"
,
name
:
"金融行业
问卷
"
,
age
:
"2017-1-1"
,
age
:
"2017-1-1"
,
},
},
{
{
key
:
"2"
,
key
:
"2"
,
name
:
"金融行业
调研
"
,
name
:
"金融行业
问卷
"
,
age
:
"2017-1-1"
,
age
:
"2017-1-1"
,
},
},
{
{
key
:
"3"
,
key
:
"3"
,
name
:
"金融行业
调研
"
,
name
:
"金融行业
问卷
"
,
age
:
"2017-1-1"
,
age
:
"2017-1-1"
,
},
},
],
],
...
@@ -93,6 +93,7 @@ class Base extends Component {
...
@@ -93,6 +93,7 @@ class Base extends Component {
this
.
props
.
getcopylist
({
this
.
props
.
getcopylist
({
pageNo
:
this
.
state
.
pageNo
,
pageNo
:
this
.
state
.
pageNo
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
bizType
:
1
,
});
});
if
(
this
.
props
.
defaultValue
.
voteNum
)
{
if
(
this
.
props
.
defaultValue
.
voteNum
)
{
this
.
setState
({
voteNum
:
this
.
props
.
defaultValue
.
voteNum
});
this
.
setState
({
voteNum
:
this
.
props
.
defaultValue
.
voteNum
});
...
@@ -326,7 +327,7 @@ class Base extends Component {
...
@@ -326,7 +327,7 @@ class Base extends Component {
const
columns
=
[
const
columns
=
[
{
{
title
:
"
调研
名称"
,
title
:
"
问卷
名称"
,
dataIndex
:
"name"
,
dataIndex
:
"name"
,
key
:
"name"
,
key
:
"name"
,
width
:
"50%"
,
width
:
"50%"
,
...
@@ -353,7 +354,7 @@ class Base extends Component {
...
@@ -353,7 +354,7 @@ class Base extends Component {
return
(
return
(
<
div
className=
{
styles
.
cred_edit
}
>
<
div
className=
{
styles
.
cred_edit
}
>
<
Form
>
<
Form
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
名称:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
名称:"
>
{
getFieldDecorator
(
"name"
,
{
{
getFieldDecorator
(
"name"
,
{
initialValue
:
defaultValue
.
name
?
defaultValue
.
name
:
""
,
initialValue
:
defaultValue
.
name
?
defaultValue
.
name
:
""
,
rules
:
[
rules
:
[
...
@@ -364,7 +365,7 @@ class Base extends Component {
...
@@ -364,7 +365,7 @@ class Base extends Component {
rule
,
rule
,
value
,
value
,
callback
,
callback
,
"请输少于100字的
调研
名称"
,
"请输少于100字的
问卷
名称"
,
100
100
);
);
},
},
...
@@ -372,7 +373,7 @@ class Base extends Component {
...
@@ -372,7 +373,7 @@ class Base extends Component {
],
],
})(
})(
<
Input
<
Input
placeholder=
"请输入
调研
名称"
placeholder=
"请输入
问卷
名称"
style=
{
{
display
:
"inline-block"
}
}
style=
{
{
display
:
"inline-block"
}
}
/>
/>
)
}
)
}
...
@@ -383,7 +384,7 @@ class Base extends Component {
...
@@ -383,7 +384,7 @@ class Base extends Component {
size=
"small"
size=
"small"
style=
{
{
display
:
"inline-block"
}
}
style=
{
{
display
:
"inline-block"
}
}
>
>
复制
调研
复制
问卷
</
Button
>
</
Button
>
)
}
)
}
</
FormItem
>
</
FormItem
>
...
@@ -456,7 +457,7 @@ class Base extends Component {
...
@@ -456,7 +457,7 @@ class Base extends Component {
)
}
)
}
</
FormItem
>
</
FormItem
>
)
}
)
}
<
FormItem
{
...
formItemLayout
}
label=
"
调研
时间:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
时间:"
>
{
getFieldDecorator
(
"time"
,
{
{
getFieldDecorator
(
"time"
,
{
initialValue
:
defaultValue
.
startTime
initialValue
:
defaultValue
.
startTime
?
[
?
[
...
@@ -474,7 +475,7 @@ class Base extends Component {
...
@@ -474,7 +475,7 @@ class Base extends Component {
{
{
type
:
"array"
,
type
:
"array"
,
required
:
true
,
required
:
true
,
message
:
"请选择
调研
时间"
,
message
:
"请选择
问卷
时间"
,
},
},
],
],
})(
})(
...
@@ -486,7 +487,7 @@ class Base extends Component {
...
@@ -486,7 +487,7 @@ class Base extends Component {
/>
/>
)
}
)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"投票次数:"
>
{
/*
<FormItem {...formItemLayout} label="投票次数:">
{getFieldDecorator("voteNum", {
{getFieldDecorator("voteNum", {
initialValue: defaultValue.voteNum ? defaultValue.voteNum : 0,
initialValue: defaultValue.voteNum ? defaultValue.voteNum : 0,
rules: [
rules: [
...
@@ -496,7 +497,7 @@ class Base extends Component {
...
@@ -496,7 +497,7 @@ class Base extends Component {
],
],
})(<Input type="number" placeholder="请输入投票次数" />)}
})(<Input type="number" placeholder="请输入投票次数" />)}
<p style={{ color: "red" }}>(0为不限次数)</p>
<p style={{ color: "red" }}>(0为不限次数)</p>
</
FormItem
>
</FormItem>
*/
}
<
FormItem
<
FormItem
{
...
formItemLayout
}
{
...
formItemLayout
}
label=
{
label=
{
...
@@ -507,7 +508,7 @@ class Base extends Component {
...
@@ -507,7 +508,7 @@ class Base extends Component {
style=
{
{
fontSize
:
12
,
color
:
"#999"
}
}
style=
{
{
fontSize
:
12
,
color
:
"#999"
}
}
/>
/>
</
Tooltip
>
</
Tooltip
>
调研
logo
问卷
logo
</
span
>
</
span
>
}
}
>
>
...
@@ -516,7 +517,7 @@ class Base extends Component {
...
@@ -516,7 +517,7 @@ class Base extends Component {
rules
:
[
rules
:
[
{
{
required
:
false
,
required
:
false
,
message
:
"请上传
调研
logo"
,
message
:
"请上传
问卷
logo"
,
},
},
],
],
})(
})(
...
@@ -549,7 +550,7 @@ class Base extends Component {
...
@@ -549,7 +550,7 @@ class Base extends Component {
</
RadioGroup
>
</
RadioGroup
>
)
}
)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
说明:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
说明:"
>
{
getFieldDecorator
(
"content"
,
{
{
getFieldDecorator
(
"content"
,
{
initialValue
:
defaultValue
.
content
?
defaultValue
.
content
:
""
,
initialValue
:
defaultValue
.
content
?
defaultValue
.
content
:
""
,
rules
:
[
rules
:
[
...
@@ -560,7 +561,7 @@ class Base extends Component {
...
@@ -560,7 +561,7 @@ class Base extends Component {
],
],
})(<
TextArea
/>)
}
})(<
TextArea
/>)
}
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
备注:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
备注:"
>
{
getFieldDecorator
(
"remark"
,
{
{
getFieldDecorator
(
"remark"
,
{
initialValue
:
defaultValue
.
remark
?
defaultValue
.
remark
:
""
,
initialValue
:
defaultValue
.
remark
?
defaultValue
.
remark
:
""
,
rules
:
[
rules
:
[
...
@@ -573,14 +574,14 @@ class Base extends Component {
...
@@ -573,14 +574,14 @@ class Base extends Component {
</
FormItem
>
</
FormItem
>
</
Form
>
</
Form
>
<
Modal
<
Modal
title=
"选择
调研
"
title=
"选择
问卷
"
visible=
{
visible
}
visible=
{
visible
}
onOk=
{
this
.
handleOk
}
onOk=
{
this
.
handleOk
}
confirmLoading=
{
confirmLoading
}
confirmLoading=
{
confirmLoading
}
onCancel=
{
this
.
handleCancel
}
onCancel=
{
this
.
handleCancel
}
>
>
<
Search
<
Search
placeholder=
"请输入
调研
名称"
placeholder=
"请输入
问卷
名称"
onSearch=
{
this
.
searchValue
}
onSearch=
{
this
.
searchValue
}
style=
{
{
width
:
200
,
marginBottom
:
20
}
}
style=
{
{
width
:
200
,
marginBottom
:
20
}
}
/>
/>
...
...
src/pages/TrainingTools/Question/Create/index.jsx
View file @
e08fb120
...
@@ -265,7 +265,7 @@ class SurveyCreact extends Component {
...
@@ -265,7 +265,7 @@ class SurveyCreact extends Component {
usable
:
false
,
usable
:
false
,
contentFlag
:
true
,
contentFlag
:
true
,
};
};
console
.
log
(
details
.
remind
,
"
调研消息是否提醒"
,
this
.
id
,
"调研
id"
);
console
.
log
(
details
.
remind
,
"
问卷消息是否提醒"
,
this
.
id
,
"问卷
id"
);
const
steps
=
[
const
steps
=
[
{
{
title
:
"基本信息"
,
title
:
"基本信息"
,
...
@@ -343,8 +343,8 @@ class SurveyCreact extends Component {
...
@@ -343,8 +343,8 @@ class SurveyCreact extends Component {
title
:
"预览"
,
title
:
"预览"
,
content
:
(
content
:
(
<
div
className=
{
styles
.
survey_create_qccode
}
>
<
div
className=
{
styles
.
survey_create_qccode
}
>
<
p
className=
{
styles
.
survey_create_info
}
>
恭喜您,
调研
发布成功
</
p
>
<
p
className=
{
styles
.
survey_create_info
}
>
恭喜您,
问卷
发布成功
</
p
>
{
/* <p className={styles.survey_create_info}>
调研
二维码</p> */
}
{
/* <p className={styles.survey_create_info}>
问卷
二维码</p> */
}
{
/* <div>
{
/* <div>
<QRCode style={{ marginTop: "20px" }} value={code} key="1" />
<QRCode style={{ marginTop: "20px" }} value={code} key="1" />
</div> */
}
</div> */
}
...
@@ -356,7 +356,7 @@ class SurveyCreact extends Component {
...
@@ -356,7 +356,7 @@ class SurveyCreact extends Component {
const
{
current
}
=
this
.
state
;
const
{
current
}
=
this
.
state
;
return
(
return
(
<
div
className=
{
styles
.
survey_create
}
>
<
div
className=
{
styles
.
survey_create
}
>
<
Breadcrumb
title=
"新建
调研
"
/>
<
Breadcrumb
title=
"新建
问卷
"
/>
<
Steps
current=
{
current
}
className=
{
styles
.
survey_create_steps
}
>
<
Steps
current=
{
current
}
className=
{
styles
.
survey_create_steps
}
>
{
steps
.
map
(
item
=>
(
{
steps
.
map
(
item
=>
(
<
Step
key=
{
item
.
title
}
title=
{
item
.
title
}
/>
<
Step
key=
{
item
.
title
}
title=
{
item
.
title
}
/>
...
...
src/pages/TrainingTools/Question/Details/index.jsx
View file @
e08fb120
...
@@ -673,7 +673,7 @@ class Details extends Component {
...
@@ -673,7 +673,7 @@ class Details extends Component {
<
div
>
<
div
>
{
details
.
name
&&
(
{
details
.
name
&&
(
<
div
className=
"survey-details"
>
<
div
className=
"survey-details"
>
<
Breadcrumb
title=
"修改
调研
"
/>
<
Breadcrumb
title=
"修改
问卷
"
/>
<
p
className=
"survey-details-title"
>
基本信息
</
p
>
<
p
className=
"survey-details-title"
>
基本信息
</
p
>
{
this
.
state
.
isupdata
==
1
?
(
{
this
.
state
.
isupdata
==
1
?
(
<
Base
<
Base
...
@@ -684,10 +684,10 @@ class Details extends Component {
...
@@ -684,10 +684,10 @@ class Details extends Component {
/>
/>
)
:
(
)
:
(
<
Form
>
<
Form
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
名称:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
名称:"
>
<
Input
defaultValue=
{
details
.
name
}
disabled
/>
<
Input
defaultValue=
{
details
.
name
}
disabled
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
时间:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
时间:"
>
<
RangePicker
<
RangePicker
showTime
showTime
disabled
disabled
...
@@ -704,10 +704,10 @@ class Details extends Component {
...
@@ -704,10 +704,10 @@ class Details extends Component {
]
}
]
}
/>
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
logo:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
logo:"
>
<
img
src=
{
details
.
image
}
style=
{
{
width
:
90
,
height
:
54
}
}
/>
<
img
src=
{
details
.
image
}
style=
{
{
width
:
90
,
height
:
54
}
}
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
范围:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
范围:"
>
<
RadioGroup
defaultValue=
{
details
.
visibleRange
}
disabled
>
<
RadioGroup
defaultValue=
{
details
.
visibleRange
}
disabled
>
<
Radio
value=
{
1
}
>
平台用户可见
</
Radio
>
<
Radio
value=
{
1
}
>
平台用户可见
</
Radio
>
<
Radio
value=
{
2
}
>
指定用户可见
</
Radio
>
<
Radio
value=
{
2
}
>
指定用户可见
</
Radio
>
...
@@ -721,10 +721,10 @@ class Details extends Component {
...
@@ -721,10 +721,10 @@ class Details extends Component {
</
Button
>
</
Button
>
</
RadioGroup
>
</
RadioGroup
>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
说明:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
说明:"
>
<
TextArea
disabled
defaultValue=
{
details
.
content
}
/>
<
TextArea
disabled
defaultValue=
{
details
.
content
}
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
备注:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
问卷
备注:"
>
<
TextArea
disabled
defaultValue=
{
details
.
remark
}
/>
<
TextArea
disabled
defaultValue=
{
details
.
remark
}
/>
</
FormItem
>
</
FormItem
>
</
Form
>
</
Form
>
...
@@ -806,11 +806,6 @@ class Details extends Component {
...
@@ -806,11 +806,6 @@ class Details extends Component {
onShowSizeChange={this.handlePageSizeChange}
onShowSizeChange={this.handlePageSizeChange}
/>*/
}
/>*/
}
</
div
>
</
div
>
<
p
className=
"survey-details-title"
>
预览调研
</
p
>
<
div
className=
"dqorde"
style=
{
{
textAlign
:
"center"
}
}
>
<
QRCode
style=
{
{
marginTop
:
"20px"
}
}
value=
{
code
}
key=
"1"
/>
</
div
>
<
div
style=
{
{
marginTop
:
10
,
textAlign
:
"center"
}
}
>
<
div
style=
{
{
marginTop
:
10
,
textAlign
:
"center"
}
}
>
<
Link
<
Link
to=
{
to=
{
...
...
src/pages/TrainingTools/Question/index.jsx
View file @
e08fb120
...
@@ -61,16 +61,19 @@ class Survey extends Component {
...
@@ -61,16 +61,19 @@ class Survey extends Component {
state
:
1
,
state
:
1
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
20
,
pageSize
:
20
,
bizType
:
1
});
});
this
.
props
.
getlist
({
this
.
props
.
getlist
({
state
:
2
,
state
:
2
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
20
,
pageSize
:
20
,
bizType
:
1
});
});
this
.
props
.
getlist
({
this
.
props
.
getlist
({
state
:
0
,
state
:
0
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
20
,
pageSize
:
20
,
bizType
:
1
});
});
}
}
...
@@ -111,6 +114,7 @@ class Survey extends Component {
...
@@ -111,6 +114,7 @@ class Survey extends Component {
name
:
searchValue
,
name
:
searchValue
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
pageSize
,
pageSize
:
pageSize
,
bizType
:
1
});
});
this
.
setState
(
this
.
setState
(
{
{
...
@@ -143,6 +147,7 @@ class Survey extends Component {
...
@@ -143,6 +147,7 @@ class Survey extends Component {
name
:
this
.
state
.
searchValue
,
name
:
this
.
state
.
searchValue
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
bizType
:
1
});
});
});
});
}
}
...
@@ -160,6 +165,7 @@ class Survey extends Component {
...
@@ -160,6 +165,7 @@ class Survey extends Component {
name
:
this
.
state
.
searchValue
,
name
:
this
.
state
.
searchValue
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
bizType
:
1
});
});
if
(
data
.
subMsg
!==
""
)
{
if
(
data
.
subMsg
!==
""
)
{
message
.
error
(
data
.
subMsg
);
message
.
error
(
data
.
subMsg
);
...
@@ -201,6 +207,7 @@ class Survey extends Component {
...
@@ -201,6 +207,7 @@ class Survey extends Component {
state
:
this
.
state
.
key
,
state
:
this
.
state
.
key
,
pageNo
:
page
,
pageNo
:
page
,
pageSize
:
pageSize
,
pageSize
:
pageSize
,
bizType
:
1
});
});
}
}
...
@@ -212,6 +219,7 @@ class Survey extends Component {
...
@@ -212,6 +219,7 @@ class Survey extends Component {
state
:
this
.
state
.
key
,
state
:
this
.
state
.
key
,
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
size
,
pageSize
:
size
,
bizType
:
1
});
});
});
});
}
}
...
...
src/pages/TrainingTools/Question/redux/actions.js
View file @
e08fb120
...
@@ -46,6 +46,7 @@ export function delsur(param, callback) {
...
@@ -46,6 +46,7 @@ export function delsur(param, callback) {
state
:
2
,
state
:
2
,
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
bizType
:
1
})
})
);
);
if
(
callback
)
{
if
(
callback
)
{
...
@@ -83,6 +84,7 @@ export function getListFetch(param) {
...
@@ -83,6 +84,7 @@ export function getListFetch(param) {
url
:
url
,
url
:
url
,
data
:
{
...
param
,
bizType
:
1
},
data
:
{
...
param
,
bizType
:
1
},
}).
then
(
res
=>
{
}).
then
(
res
=>
{
console
.
log
(
'被请求l'
)
const
temp
=
res
.
data
;
const
temp
=
res
.
data
;
switch
(
param
.
state
)
{
switch
(
param
.
state
)
{
case
0
:
case
0
:
...
@@ -148,6 +150,7 @@ export function upFetch(param, callback) {
...
@@ -148,6 +150,7 @@ export function upFetch(param, callback) {
state
:
1
,
state
:
1
,
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
bizType
:
1
})
})
);
);
dispatch
(
dispatch
(
...
@@ -156,6 +159,7 @@ export function upFetch(param, callback) {
...
@@ -156,6 +159,7 @@ export function upFetch(param, callback) {
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
name
:
param
.
name
,
name
:
param
.
name
,
bizType
:
1
})
})
);
);
dispatch
(
dispatch
(
...
@@ -164,6 +168,7 @@ export function upFetch(param, callback) {
...
@@ -164,6 +168,7 @@ export function upFetch(param, callback) {
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
name
:
param
.
name
,
name
:
param
.
name
,
bizType
:
1
})
})
);
);
message
.
success
(
"上架成功"
);
message
.
success
(
"上架成功"
);
...
@@ -248,6 +253,7 @@ export function downFetch(param, callback) {
...
@@ -248,6 +253,7 @@ export function downFetch(param, callback) {
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
name
:
param
.
name
,
name
:
param
.
name
,
bizType
:
1
})
})
);
);
dispatch
(
dispatch
(
...
@@ -255,6 +261,7 @@ export function downFetch(param, callback) {
...
@@ -255,6 +261,7 @@ export function downFetch(param, callback) {
state
:
2
,
state
:
2
,
pageNo
:
param
.
pageNo
,
pageNo
:
param
.
pageNo
,
pageSize
:
param
.
pageSize
,
pageSize
:
param
.
pageSize
,
bizType
:
1
})
})
);
);
if
(
callback
)
{
if
(
callback
)
{
...
@@ -327,9 +334,7 @@ export function insertSurFetch(param, callback) {
...
@@ -327,9 +334,7 @@ export function insertSurFetch(param, callback) {
if
(
res
.
code
===
"1000"
)
{
if
(
res
.
code
===
"1000"
)
{
if
(
callback
)
callback
(
res
);
if
(
callback
)
callback
(
res
);
console
.
log
(
res
.
data
.
id
);
console
.
log
(
res
.
data
.
id
);
// browserHistory.push(
// `/${companyCode}/${siteCode}/index/tool/survey/survey-management/create/${res.data.id}`
// );
dispatch
(
dispatch
(
getTestListFetch
({
researchId
:
res
.
data
.
id
,
pageNo
:
1
,
pageSize
:
20
})
getTestListFetch
({
researchId
:
res
.
data
.
id
,
pageNo
:
1
,
pageSize
:
20
})
);
);
...
@@ -342,19 +347,6 @@ export function insertSurFetch(param, callback) {
...
@@ -342,19 +347,6 @@ export function insertSurFetch(param, callback) {
message
.
error
(
res
.
subMsg
);
message
.
error
(
res
.
subMsg
);
}
}
});
});
// return fetch(url + `/insert`, {type: 'POST', data: param}).then((res) => {
// if(res.code === '1000'){
// if(callback) callback(res);
// console.log(res.data.id)
// browserHistory.push(`/${companyCode}/${siteCode}/index/tool/survey/survey-management/create/${res.data.id}`)
// dispatch(getTestListFetch({researchId: res.data.id, pageNo: 1, pageSize: 20}))
// dispatch({type: Types.GET_SURID, data: res.data.id});
// dispatch({type: Types.GET_SURTEST_LIST, data: {list: [], total: 0}});
// }else{
// message.error(res.subMsg);
// }
// })
};
};
}
}
...
@@ -377,10 +369,6 @@ export function getCopyListFetch(param) {
...
@@ -377,10 +369,6 @@ export function getCopyListFetch(param) {
message
.
error
(
res
.
subMsg
);
message
.
error
(
res
.
subMsg
);
}
}
});
});
// return fetch(url + `/page/list`, {type: 'GET', data: param}).then((res) => {
// const temp = res.data;
// dispatch({type: Types.GET_SUR_LIST, data: {total: temp.total, list: temp.records}})
// })
};
};
}
}
...
@@ -398,20 +386,11 @@ export function getCopySurFetch(param, cb) {
...
@@ -398,20 +386,11 @@ export function getCopySurFetch(param, cb) {
if
(
cb
)
{
if
(
cb
)
{
cb
(
res
);
cb
(
res
);
}
}
// browserHistory.push(
// `/${companyCode}/${siteCode}/index/tool/survey/survey-management/create/${res.data.id}`
// );
dispatch
({
type
:
Types
.
GET_SUR_DETAILS
,
data
:
res
.
data
});
dispatch
({
type
:
Types
.
GET_SUR_DETAILS
,
data
:
res
.
data
});
}
else
{
}
else
{
message
.
error
(
res
.
subMsg
);
message
.
error
(
res
.
subMsg
);
}
}
});
});
// return fetch(url + `/copy`, {type: 'POST', data: param}).then((res) => {
// console.log(res.data)
// browserHistory.push(`/${companyCode}/${siteCode}/index/tool/survey/survey-management/create/${res.data.id}`)
// dispatch({type: Types.GET_SUR_DETAILS, data: res.data})
// })
};
};
}
}
...
@@ -438,20 +417,6 @@ export function updateFetch(param, callback) {
...
@@ -438,20 +417,6 @@ export function updateFetch(param, callback) {
}
}
});
});
// return fetch(url + `/update`, {type: 'POST', data: param}).then((res) => {
//
// if (res.code === "1000") {
// message.success('保存成功');
// dispatch(getTestListFetch({researchId: param.id, pageNo: 1, pageSize: 20}))
// dispatch({type: Types.GET_SURID, data: param.id});
// if (callback) {
// callback(res.code);
// }
// } else {
// message.error('保存失败,请重新尝试');
// }
// })
};
};
}
}
...
@@ -512,10 +477,6 @@ export function insertTestFetch(param, no, size) {
...
@@ -512,10 +477,6 @@ export function insertTestFetch(param, no, size) {
})
})
);
);
});
});
// return fetch(url2 + `/insert`, {type: 'post', data: param}).then((res) => {
//
// dispatch(getTestListFetch({researchId: param.reseachId, pageNo: no, pageSize: size}))
// })
};
};
}
}
...
@@ -562,17 +523,6 @@ export function editTestFetch(params, surid, no, size) {
...
@@ -562,17 +523,6 @@ export function editTestFetch(params, surid, no, size) {
message
.
success
(
"操作失败"
);
message
.
success
(
"操作失败"
);
}
}
});
});
// return fetch(url2 + `/batch/update`, {type: 'post', data: param}).then((res) => {
//
// if (res.code === "1000") {
// dispatch({type: Types.EDIT_TEST, data: res.data})
// dispatch(getTestListFetch({researchId: surid, pageNo: no, pageSize: size}))
// message.success('操作成功');
// } else {
// message.success('操作失败');
// }
// })
};
};
}
}
...
@@ -596,17 +546,6 @@ export function moveTestFetch(params, surid, no, size) {
...
@@ -596,17 +546,6 @@ export function moveTestFetch(params, surid, no, size) {
message
.
success
(
"操作失败"
);
message
.
success
(
"操作失败"
);
}
}
});
});
// return fetch(url2 + `/batch/update`, {type: 'post', data: param}).then((res) => {
//
// if (res.code === "1000") {
// dispatch({type: Types.EDIT_TEST, data: res.data})
// dispatch(getTestListFetch({researchId: surid, pageNo: no, pageSize: size}))
// message.success('操作成功');
// } else {
// message.success('操作失败');
// }
// })
};
};
}
}
...
...
src/pages/TrainingTools/Survey/Create/Base.jsx
View file @
e08fb120
...
@@ -93,6 +93,7 @@ class Base extends Component {
...
@@ -93,6 +93,7 @@ class Base extends Component {
this
.
props
.
getcopylist
({
this
.
props
.
getcopylist
({
pageNo
:
this
.
state
.
pageNo
,
pageNo
:
this
.
state
.
pageNo
,
pageSize
:
this
.
state
.
pageSize
,
pageSize
:
this
.
state
.
pageSize
,
bizType
:
2
});
});
if
(
this
.
props
.
defaultValue
.
voteNum
)
{
if
(
this
.
props
.
defaultValue
.
voteNum
)
{
this
.
setState
({
voteNum
:
this
.
props
.
defaultValue
.
voteNum
});
this
.
setState
({
voteNum
:
this
.
props
.
defaultValue
.
voteNum
});
...
...
src/pages/TrainingTools/Survey/Details/index.jsx
View file @
e08fb120
...
@@ -231,6 +231,7 @@ class Details extends Component {
...
@@ -231,6 +231,7 @@ class Details extends Component {
image
:
values
.
surveyImageUrl
,
image
:
values
.
surveyImageUrl
,
keywords
:
this
.
state
.
keywords
,
keywords
:
this
.
state
.
keywords
,
enableTask
:
this
.
state
.
enableTask
,
enableTask
:
this
.
state
.
enableTask
,
voteNum
:
values
.
voteNum
};
};
if
(
values
.
surveyImageUrl
==
""
)
{
if
(
values
.
surveyImageUrl
==
""
)
{
delete
data
.
image
;
delete
data
.
image
;
...
@@ -244,7 +245,7 @@ class Details extends Component {
...
@@ -244,7 +245,7 @@ class Details extends Component {
companyCode
+
companyCode
+
"/"
+
"/"
+
siteCode
+
siteCode
+
"/index/tool/
question/question
-management"
"/index/tool/
survey/survey
-management"
);
);
}
}
});
});
...
@@ -615,7 +616,7 @@ class Details extends Component {
...
@@ -615,7 +616,7 @@ class Details extends Component {
<
div
>
<
div
>
{
details
.
name
&&
(
{
details
.
name
&&
(
<
div
className=
"survey-details"
>
<
div
className=
"survey-details"
>
<
Breadcrumb
title=
"修改
调研
"
/>
<
Breadcrumb
title=
"修改
投票
"
/>
<
p
className=
"survey-details-title"
>
基本信息
</
p
>
<
p
className=
"survey-details-title"
>
基本信息
</
p
>
{
this
.
state
.
isupdata
==
1
?
(
{
this
.
state
.
isupdata
==
1
?
(
<
Base
<
Base
...
@@ -626,10 +627,10 @@ class Details extends Component {
...
@@ -626,10 +627,10 @@ class Details extends Component {
/>
/>
)
:
(
)
:
(
<
Form
>
<
Form
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
名称:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
名称:"
>
<
Input
defaultValue=
{
details
.
name
}
disabled
/>
<
Input
defaultValue=
{
details
.
name
}
disabled
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
时间:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
时间:"
>
<
RangePicker
<
RangePicker
showTime
showTime
disabled
disabled
...
@@ -646,10 +647,10 @@ class Details extends Component {
...
@@ -646,10 +647,10 @@ class Details extends Component {
]
}
]
}
/>
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
logo:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
logo:"
>
<
img
src=
{
details
.
image
}
style=
{
{
width
:
90
,
height
:
54
}
}
/>
<
img
src=
{
details
.
image
}
style=
{
{
width
:
90
,
height
:
54
}
}
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
范围:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
范围:"
>
<
RadioGroup
defaultValue=
{
details
.
visibleRange
}
disabled
>
<
RadioGroup
defaultValue=
{
details
.
visibleRange
}
disabled
>
<
Radio
value=
{
1
}
>
平台用户可见
</
Radio
>
<
Radio
value=
{
1
}
>
平台用户可见
</
Radio
>
<
Radio
value=
{
2
}
>
指定用户可见
</
Radio
>
<
Radio
value=
{
2
}
>
指定用户可见
</
Radio
>
...
@@ -663,10 +664,10 @@ class Details extends Component {
...
@@ -663,10 +664,10 @@ class Details extends Component {
</
Button
>
</
Button
>
</
RadioGroup
>
</
RadioGroup
>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
说明:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
说明:"
>
<
TextArea
disabled
defaultValue=
{
details
.
content
}
/>
<
TextArea
disabled
defaultValue=
{
details
.
content
}
/>
</
FormItem
>
</
FormItem
>
<
FormItem
{
...
formItemLayout
}
label=
"
调研
备注:"
>
<
FormItem
{
...
formItemLayout
}
label=
"
投票
备注:"
>
<
TextArea
disabled
defaultValue=
{
details
.
remark
}
/>
<
TextArea
disabled
defaultValue=
{
details
.
remark
}
/>
</
FormItem
>
</
FormItem
>
</
Form
>
</
Form
>
...
@@ -726,11 +727,6 @@ class Details extends Component {
...
@@ -726,11 +727,6 @@ class Details extends Component {
onShowSizeChange={this.handlePageSizeChange}
onShowSizeChange={this.handlePageSizeChange}
/>*/
}
/>*/
}
</
div
>
</
div
>
<
p
className=
"survey-details-title"
>
预览调研
</
p
>
<
div
className=
"dqorde"
style=
{
{
textAlign
:
"center"
}
}
>
<
QRCode
style=
{
{
marginTop
:
"20px"
}
}
value=
{
code
}
key=
"1"
/>
</
div
>
<
div
style=
{
{
marginTop
:
10
,
textAlign
:
"center"
}
}
>
<
div
style=
{
{
marginTop
:
10
,
textAlign
:
"center"
}
}
>
<
Link
<
Link
to=
{
to=
{
...
@@ -738,7 +734,7 @@ class Details extends Component {
...
@@ -738,7 +734,7 @@ class Details extends Component {
companyCode
+
companyCode
+
"/"
+
"/"
+
siteCode
+
siteCode
+
"/index/tool/
question/question
-management"
"/index/tool/
survey/survey
-management"
}
}
>
>
<
Button
>
返回
</
Button
>
<
Button
>
返回
</
Button
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment