Skip to content

S
sass-admin
Commit a004dab0 by chengming
Options

投票样式修改

parent f2f1b080
Showing with 44 additions and 164 deletions
src/pages/Dashboard/index.js
...@@ -196,7 +196,7 @@ class homePage extends Component { ...@@ -196,7 +196,7 @@ class homePage extends Component {
}; };
getLllRes = () => { getLllRes = () => {
this.props.getLllData({ this.props.getLllData({
types: "2,6,7,8,9,10,14", types: "3,6,7,8,9,10,14",
date: this.state.lllTime, date: this.state.lllTime,
}); });
}; };
......
src/pages/SystemManagement/Banner/editBanner.jsx
...@@ -369,9 +369,9 @@ class EditBanner extends Component { ...@@ -369,9 +369,9 @@ class EditBanner extends Component {
required: false, required: false,
message: "请输入图片来源", message: "请输入图片来源",
}, },
{ max: 30, message: "图片来源最多30个字符！" }, { max: 100, message: "图片来源最多30个字符！" },
], ],
})(<Input maxLength={30} disabled={editType == "look"} />)} })(<Input maxLength={100} disabled={editType == "look"} />)}
</FormItem> </FormItem>
{moduleType.id === 4 && ( {moduleType.id === 4 && (
<FormItem label="链接地址：" {...formItemLayout}> <FormItem label="链接地址：" {...formItemLayout}>
......
src/pages/SystemManagement/Organization/AddUser/AddUser.jsx
...@@ -229,7 +229,7 @@ class AddUser extends Component { ...@@ -229,7 +229,7 @@ class AddUser extends Component {
/> />
)} )}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="备注2:"> {/* <FormItem {...formItemLayout} label="备注2:">
{getFieldDecorator("remarkSecond", { {getFieldDecorator("remarkSecond", {
rules: [ rules: [
{ {
...@@ -261,7 +261,7 @@ class AddUser extends Component { ...@@ -261,7 +261,7 @@ class AddUser extends Component {
maxLength={50} maxLength={50}
/> />
)} )}
</FormItem> </FormItem> */}
{/*<FormItem*/} {/*<FormItem*/}
{/*{...formItemLayout}*/} {/*{...formItemLayout}*/}
{/*label="微信:"*/} {/*label="微信:"*/}
......
src/pages/SystemManagement/Organization/AddUser/UserInfo.jsx
...@@ -290,7 +290,7 @@ class AddUser extends Component { ...@@ -290,7 +290,7 @@ class AddUser extends Component {
/> />
)} )}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="备注2:"> {/* <FormItem {...formItemLayout} label="备注2:">
{getFieldDecorator("remarkSecond", { {getFieldDecorator("remarkSecond", {
rules: [ rules: [
{ {
...@@ -322,7 +322,7 @@ class AddUser extends Component { ...@@ -322,7 +322,7 @@ class AddUser extends Component {
maxLength={50} maxLength={50}
/> />
)} )}
</FormItem> </FormItem> */}
{/*<FormItem*/} {/*<FormItem*/}
{/*{...formItemLayout}*/} {/*{...formItemLayout}*/}
{/*label="微信:"*/} {/*label="微信:"*/}
......
src/pages/SystemManagement/Organization/EditUser/EditUser.jsx
...@@ -276,7 +276,7 @@ class EditUser extends Component { ...@@ -276,7 +276,7 @@ class EditUser extends Component {
/> />
)} )}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="备注2:"> {/* <FormItem {...formItemLayout} label="备注2:">
{getFieldDecorator("remarkSecond", { {getFieldDecorator("remarkSecond", {
initialValue: editeData.remarkSecond, initialValue: editeData.remarkSecond,
rules: [ rules: [
...@@ -309,7 +309,7 @@ class EditUser extends Component { ...@@ -309,7 +309,7 @@ class EditUser extends Component {
maxLength={50} maxLength={50}
/> />
)} )}
</FormItem> </FormItem> */}
{/*<FormItem*/} {/*<FormItem*/}
{/*{...formItemLayout}*/} {/*{...formItemLayout}*/}
{/*label="微信:"*/} {/*label="微信:"*/}
......
src/pages/SystemManagement/Organization/FixUser/index.jsx
...@@ -324,7 +324,7 @@ class FixUser extends Component { ...@@ -324,7 +324,7 @@ class FixUser extends Component {
/> />
)} )}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="备注2:"> {/* <FormItem {...formItemLayout} label="备注2:">
{getFieldDecorator("remarkSecond", { {getFieldDecorator("remarkSecond", {
initialValue: editeData.remarkSecond, initialValue: editeData.remarkSecond,
rules: [ rules: [
...@@ -357,7 +357,7 @@ class FixUser extends Component { ...@@ -357,7 +357,7 @@ class FixUser extends Component {
maxLength={50} maxLength={50}
/> />
)} )}
</FormItem> </FormItem> */}
{/*<FormItem*/} {/*<FormItem*/}
{/*{...formItemLayout}*/} {/*{...formItemLayout}*/}
{/*label="微信:"*/} {/*label="微信:"*/}
......
src/pages/TrainingPrograms/ProgeamsManage/Plan/Addplan.jsx
...@@ -464,88 +464,13 @@ class addplan extends React.Component { ...@@ -464,88 +464,13 @@ class addplan extends React.Component {
render() { render() {
return ( return (
<div style={{ marginTop: "20px" }}> <div style={{ marginTop: "20px" }}>
<Tabs defaultActiveKey="课程" onChange={callback}> <Tabs defaultActiveKey="投票" onChange={callback}>
{/* <TabPane tab="课程" key="课程">
<Course
selectedCourseRowKeys={this.selectedCourseRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="线下课程" key="线下课程">
<UnderLineActivety
selectedCourseRowKeys={this.selectedUnderLineRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="考试" key="考试">
<Exam
selectedExamRowKeys={this.selectedExamRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane> */}
<TabPane tab="投票" key="投票"> <TabPane tab="投票" key="投票">
<Survey <Survey
selectedSurveyRowKeys={this.selectedSurveyRowKeys} selectedSurveyRowKeys={this.selectedSurveyRowKeys}
activitylist={this.props.activitylist} activitylist={this.props.activitylist}
/> />
</TabPane> </TabPane>
{/*<TabPane tab="投票" key="投票">*/}
{/*<Vote */}
{/*selectedVoteRowKeys={this.selectedVoteRowKeys} */}
{/*activitylist={this.props.activitylist}*/}
{/*/>*/}
{/*</TabPane>*/}
{/* <TabPane tab="直播" key="直播">
<Live
selectedCourseRowKeys={this.selectedLiveRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="作业" key="作业">
<Homework
selectedHomeworkRowKeys={this.selectedHomeworkRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="证书" key="证书">
<Certificate
selectedCertificateRowKeys={this.selectedCertificateRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="原创活动" key="原创活动">
<Caseactive
selectedCourseRowKeys={this.selectedCourseRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="精选作品" key="精选作品">
<Selectcase
selectedCourseRowKeys={this.selectedCourseRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="资料库" key="资料库">
<DataBaseActivity
selectedCourseRowKeys={this.selectedCourseRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane>
<TabPane tab="外部链接" key="外部链接">
<Url
selectedUrlRowKeys={this.selectedUrlRowKeys}
activitylist={this.props.activitylist}
onAcDelete={this.props.onAcDelete}
/>
</TabPane>
<TabPane tab="帖子" key="帖子">
<PostingsAddActivities
selectedCourseRowKeys={this.selectedCourseRowKeys}
activitylist={this.props.activitylist}
/>
</TabPane> */}
</Tabs> </Tabs>
<div style={{ marginTop: 24 }}> <div style={{ marginTop: 24 }}>
<Button type="primary" onClick={this.activitysave}> <Button type="primary" onClick={this.activitysave}>
......
src/pages/TrainingTools/Survey/Create/Base.jsx
...@@ -35,9 +35,9 @@ function disabledDate(current) { ...@@ -35,9 +35,9 @@ function disabledDate(current) {
return ( return (
current && current &&
current < current <
moment() moment()
.endOf("day") .endOf("day")
.subtract(1, "days") .subtract(1, "days")
); );
} }
class Base extends Component { class Base extends Component {
...@@ -92,13 +92,13 @@ class Base extends Component { ...@@ -92,13 +92,13 @@ 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 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 });
} }
if (this.props.defaultValue.pageMode) { if (this.props.defaultValue.styleType) {
this.setState({ pageMode: this.props.defaultValue.pageMode }); this.setState({ styleType: this.props.defaultValue.styleType });
} }
if (this.props.defaultValue.visibleRange) { if (this.props.defaultValue.visibleRange) {
this.setState({ checkValue: this.props.defaultValue.visibleRange }); this.setState({ checkValue: this.props.defaultValue.visibleRange });
...@@ -383,88 +383,41 @@ class Base extends Component { ...@@ -383,88 +383,41 @@ class Base extends Component {
</Button> </Button>
)} */} )} */}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="业务类型：">
{getFieldDecorator("bizType", { <FormItem {...formItemLayout} label="呈现样式：">
initialValue: defaultValue.bizType ? defaultValue.bizType : 2, {getFieldDecorator("styleType", {
initialValue: defaultValue.styleType ? defaultValue.styleType : 1,
rules: [ rules: [
{ {
required: true, required: true,
message: "请选择业务类型", message: "请选择呈现样式",
}, },
], ],
})( })(
<Select <Select style={{ width: "200px" }} placeholder="请选择呈现样式">
style={{ width: "200px" }}
placeholder="请选择业务类型"
disabled
onChange={e => {
this.setState({ option: e });
setFieldsValue({ pageMode: "" });
}}
>
<Option value={1} key={1}> <Option value={1} key={1}>
问卷调查 纯图片
</Option> </Option>
<Option value={2} key={2}> <Option value={2} key={2}>
投票 图文结合
</Option> </Option>
</Select> </Select>
)} )}
</FormItem> </FormItem>
{this.state.option == 1 && (
<FormItem {...formItemLayout} label="呈现样式：">
{getFieldDecorator("pageMode", {
initialValue: defaultValue.pageMode ? defaultValue.pageMode : 3,
rules: [
{
required: true,
message: "请选择呈现样式",
},
],
})(
<Select style={{ width: "200px" }} placeholder="请选择呈现样式">
<Option value={1} key={1}>
逐题
</Option>
<Option value={2} key={2}>
逐页
</Option>
</Select>
)}
</FormItem>
)}
{this.state.option == 2 && (
<FormItem {...formItemLayout} label="呈现样式：">
{getFieldDecorator("pageMode", {
initialValue: defaultValue.pageMode ? defaultValue.pageMode : 3,
rules: [
{
required: true,
message: "请选择呈现样式",
},
],
})(
<Select style={{ width: "200px" }} placeholder="请选择呈现样式">
<Option value={3} key={3}>
整页单选
</Option>
</Select>
)}
</FormItem>
)}
<FormItem {...formItemLayout} label="投票时间："> <FormItem {...formItemLayout} label="投票时间：">
{getFieldDecorator("time", { {getFieldDecorator("time", {
initialValue: defaultValue.startTime initialValue: defaultValue.startTime
? [ ? [
moment( moment(
moment(defaultValue.startTime).format("YYYY-MM-DD HH:mm"), moment(defaultValue.startTime).format("YYYY-MM-DD HH:mm"),
"YYYY-MM-DD HH:mm" "YYYY-MM-DD HH:mm"
), ),
moment( moment(
moment(defaultValue.endTime).format("YYYY-MM-DD HH:mm"), moment(defaultValue.endTime).format("YYYY-MM-DD HH:mm"),
"YYYY-MM-DD HH:mm" "YYYY-MM-DD HH:mm"
), ),
] ]
: "", : "",
rules: [ rules: [
{ {
...@@ -617,8 +570,8 @@ class Base extends Component { ...@@ -617,8 +570,8 @@ class Base extends Component {
} }
types={"research"} types={"research"}
groupTypes={"research"} groupTypes={"research"}
// vsb={true} // vsb={true}
// resId={defaultValue&&defaultValue.id} // resId={defaultValue&&defaultValue.id}
/> />
</Modal> </Modal>
</div> </div>
......
src/pages/TrainingTools/Survey/Create/index.jsx
...@@ -105,8 +105,9 @@ class SurveyCreact extends Component { ...@@ -105,8 +105,9 @@ class SurveyCreact extends Component {
if (_this.id) { if (_this.id) {
let data = { let data = {
name: values.name, name: values.name,
bizType: values.bizType, bizType: 2,
pageMode: values.pageMode, pageMode: 3,
styleType: values.styleType,
voteNum: values.voteNum, voteNum: values.voteNum,
startTime: moment(values.time[0]).format("YYYY-MM-DD HH:mm:ss"), startTime: moment(values.time[0]).format("YYYY-MM-DD HH:mm:ss"),
endTime: moment(values.time[1]).format("YYYY-MM-DD HH:mm:ss"), endTime: moment(values.time[1]).format("YYYY-MM-DD HH:mm:ss"),
...@@ -135,8 +136,9 @@ class SurveyCreact extends Component { ...@@ -135,8 +136,9 @@ class SurveyCreact extends Component {
} else { } else {
let indata = { let indata = {
name: values.name, name: values.name,
bizType: values.bizType, bizType: 2,
pageMode: values.pageMode, pageMode: 3,
styleType: values.styleType,
voteNum: values.voteNum, voteNum: values.voteNum,
startTime: moment(values.time[0]).format("YYYY-MM-DD HH:mm:ss"), startTime: moment(values.time[0]).format("YYYY-MM-DD HH:mm:ss"),
endTime: moment(values.time[1]).format("YYYY-MM-DD HH:mm:ss"), endTime: moment(values.time[1]).format("YYYY-MM-DD HH:mm:ss"),
......
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