Commit 1d16a4cb by end

修改

parent 2a72e52a
No preview for this file type
......@@ -405,14 +405,14 @@ class AlbumComment extends React.Component {
<b>{this.props.match.params.name}</b>
</h2>
</Col>
<Col span={4} key={4} style={{ float: "right" }}>
{/* <Col span={4} key={4} style={{ float: "right" }}>
<Popconfirm
title="确定下载评论信息?"
onConfirm={this.downloadCommentFun}
>
<Button type="primary"> 下载评论信息</Button>
</Popconfirm>
</Col>
</Col> */}
</Row>
</Form>
</div>
......
......@@ -239,7 +239,7 @@ class Casecomment extends Component {
<Col span={20} key={1}>
<h2>作品名称</h2>
</Col>
<Col span={4} key={2}>
{/* <Col span={4} key={2}>
<Button
type="primary"
style={{ marginTop: "4px" }}
......@@ -247,7 +247,7 @@ class Casecomment extends Component {
>
下载评论信息
</Button>
</Col>
</Col> */}
</Row>
<div>
<Table
......
......@@ -426,7 +426,7 @@ class Comment extends React.Component {
</span>
</div>
<div
{/* <div
className="get-comment"
style={{ overflow: "hidden", marginBottom: 20, marginTop: 20 }}
>
......@@ -442,7 +442,7 @@ class Comment extends React.Component {
</Col>
</Row>
</Form>
</div>
</div> */}
<Table
key={this.state.tableKey}
......
......@@ -295,7 +295,7 @@ class Atricle extends React.Component {
const jsonEdit = {
id,
fileName: values.fileName.trim(),
content: _this.state.editor,
content: values.content,
author: values.author,
deptName: values.deptName,
pdfOssUrl: pdfOssUrl,
......@@ -475,7 +475,7 @@ class Atricle extends React.Component {
>
取消发布
</a>
<a
{/* <a
className={Styles.marr10}
onClick={() => {
this.setState({ title: "编辑" });
......@@ -483,7 +483,7 @@ class Atricle extends React.Component {
}}
>
编辑
</a>
</a> */}
<a
className={Styles.marr10}
onClick={() => {
......
......@@ -377,15 +377,6 @@ class Message extends React.Component {
},
},
{
title: "投稿时间",
dataIndex: "submitTime",
width: "100px",
key: "submitTime",
render: text => (
<span>{text ? moment(text).format("YYYY-MM-DD HH:mm") : "-"}</span>
),
},
{
title: "接收时间",
dataIndex: "acceptTime",
width: "100px",
......
......@@ -180,7 +180,7 @@ class App extends React.Component {
trainfirstinfo !== "" ? trainfirstinfo.name : "", //bug-11153-liyuan 修改新增活动会出现缓存名称和时间
rules: [
{
required: false,
required: true,
validator: (rule, value, callback) => {
validator(rule, value, callback, "请输入活动名称", 50);
},
......@@ -281,7 +281,7 @@ class App extends React.Component {
<FormItem label="活动时间" {...timeLayout}>
{getFieldDecorator("time", {
rules: [
{ type: "array", required: false, message: "请选择时间" },
{ type: "array", required: true, message: "请选择时间" },
],
initialValue: "",
})(
......
......@@ -330,7 +330,7 @@ class Comment extends React.Component {
<div className={styles.mar40}>
<span>
<h2>{this.props.name}</h2>
<Row style={{ top: "-10px" }}>
{/* <Row style={{ top: "-10px" }}>
<Col span={4} key={4} style={{ float: "right" }}>
<Popconfirm
title="确定下载评论信息?"
......@@ -339,7 +339,7 @@ class Comment extends React.Component {
<Button type="primary">下载评论信息</Button>
</Popconfirm>
</Col>
</Row>
</Row> */}
</span>
<Table
columns={this.columns}
......
......@@ -3074,14 +3074,14 @@ class NewTP extends Component {
</a>
</div>
)}
<div>
{/* <div>
<a
style={{ marginLeft: "10px", color: "rgb(24, 144, 255)" }}
onClick={() => this.openResource(record.id)}
>
资料
</a>
</div>
</div> */}
{/*修改可见范围*/}
{/*<a href="#4" style={{marginLeft:"10px",color:"#00CCFF"}}>项目范围</a>*/}
......
......@@ -176,10 +176,10 @@ class ExamStrategy extends Component {
strategyInfo: {
examRange: 1,
displayStyle: 1,
showPaper: 0,
showGrade: 0,
showAnswer: 0,
showAnalysis: 0,
showPaper: 1,
showGrade: 1,
showAnswer: 1,
showAnalysis: 1,
showComment: 0,
integral: 0,
remind: 0,
......@@ -956,9 +956,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showPaper,
})(
<Select disabled>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -972,9 +972,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showGrade,
})(
<Select disabled>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -988,9 +988,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showAnswer,
})(
<Select disabled>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1004,9 +1004,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showAnalysis,
})(
<Select disabled>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1021,8 +1021,8 @@ class ExamStrategy extends Component {
})(
<Select onChange={this.onSelectComment} disabled>
<Option value={0}>不显示</Option>
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={1}>交卷后显示</Option> */}
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
<div
......@@ -1218,9 +1218,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showPaper,
})(
<Select style={{ width: 200 }}>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1232,9 +1232,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showGrade,
})(
<Select style={{ width: 200 }}>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1246,9 +1246,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showAnswer,
})(
<Select style={{ width: 200 }}>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1260,9 +1260,9 @@ class ExamStrategy extends Component {
: this.state.strategyInfo.showAnalysis,
})(
<Select style={{ width: 200 }}>
<Option value={0}>不显示</Option>
{/* <Option value={0}>不显示</Option> */}
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={2}>考试结束后显示</Option> */}
</Select>
)}
</FormItem>
......@@ -1278,8 +1278,8 @@ class ExamStrategy extends Component {
onChange={this.onSelectComment}
>
<Option value={0}>不显示</Option>
<Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option>
{/* <Option value={1}>交卷后显示</Option>
<Option value={2}>考试结束后显示</Option> */}
</Select>
)}
{/*<Popover content={evaluate}>*/}
......
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