Commit 7618c2ba by 潘本斌

资讯

parent b42be421
......@@ -184,7 +184,7 @@ function mapStateToProps(state, ownProps) {
let nav = {};
let menuList = [];
if (login.siteData && login.siteData.length > 0) {
debugger;
// debugger;
// 根据后台返回每个站点目录
nav = login.siteData.filter(item => siteCode === item.siteCode)[0];
// 数据整合渲染menu
......
......@@ -8,7 +8,7 @@ import React from "react";
import { Table, Select, Popconfirm, Button } from "antd";
import { connect } from "react-redux";
import styles from "./index.less";
import intl from 'react-intl-universal';
import intl from "react-intl-universal";
import {
getBannerList,
handleBannerDown,
......@@ -135,14 +135,16 @@ class Banner extends React.PureComponent {
>
{record.state === 1 ? "下架" : "上架"}
</span>
{record.state !== 1 ?
{record.state !== 1 ? (
<Popconfirm
title="是否删除?"
onConfirm={() => this.handleDelete(record)}
>
<span style={{ ...buttonStyle }}>删除</span>
</Popconfirm>:''}
</Popconfirm>
) : (
""
)}
</div>
);
},
......@@ -260,7 +262,7 @@ class Banner extends React.PureComponent {
return (
<div className={styles.banner_manage_body}>
<Breadcrumb title="Banner管理"/>
<Breadcrumb title="滚动首图管理" />
<div className={styles.left}>
{this.terminalList.map((item, index) => {
return (
......
......@@ -145,9 +145,12 @@ class TreeItem extends React.Component {
return error;
}
if (this.state.name == "新增分类") {
postAddNewsLists({ parentId: data.id, ...values });
postAddNewsLists({
parentId: data.id,
...values,
});
} else if (this.state.name == "编辑分类") {
postEditNewsLists({ parentId: parentID[1].id, id: data.id, ...values });
postEditNewsLists({ parentId: data.parentId, id: data.id, ...values });
}
this.setState({ visible: false });
// this.props.form.validateFields((errors, values) => {
......@@ -268,7 +271,7 @@ class TreeItem extends React.Component {
};
return (
<div style={{ width: "100%" }}>
<Breadcrumb title="资讯管理"/>
<Breadcrumb title="资讯管理" />
<Modal
className="sort-modal"
visible={visible}
......@@ -342,6 +345,11 @@ class TreeItem extends React.Component {
style={{ float: "right", position: "absolute", right: "15%" }} //bug-12640-liyuan 30 -> 15%
>
<Icon
type="plus"
className={Styles.pmEditIcon}
onClick={() => this.showModal("1")}
/>
<Icon
type="edit"
className={Styles.pmEditIcon}
onClick={() => this.showModal("2")}
......
import React,{Component} from 'react';
import { Icon, List, Rate, Button ,Modal} from "antd";
import React, { Component } from "react";
import { Icon, List, Rate, Button, Modal } from "antd";
import { connect } from "react-redux";
import * as Actions from "../../../redux/actions";
import Styles from "./style.less";
import AddModuleNew from "../AddModuleNew";
import Edit from "./edit";
class NewsListTemplate extends Component{
class NewsListTemplate extends Component {
constructor(props) {
super(props);
this.state = {
......@@ -18,10 +18,10 @@ class NewsListTemplate extends Component{
this.setState({ editVisible: true });
};
saveNewsSelect = (list)=>{
saveNewsSelect = list => {
console.log(this.props);
debugger
}
// debugger
};
render() {
/**
* this.props.keys: 模块类型
......@@ -82,7 +82,16 @@ class NewsListTemplate extends Component{
<List.Item>
<div className={Styles.CourseList}>
<div className={Styles.ImgBox}>
<img src={Item.imgPath?Item.imgPath:this.props.DataList.moduleType==10?"https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png":""} alt="" />
<img
src={
Item.imgPath
? Item.imgPath
: this.props.DataList.moduleType == 10
? "https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png"
: ""
}
alt=""
/>
</div>
<div className={Styles.RightContent}>
{/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */}
......@@ -151,4 +160,4 @@ export default connect((state, ownProps) => {
return {
homeInfo: state.door.homeInfo,
};
}, Actions)(NewsListTemplate);
\ No newline at end of file
}, Actions)(NewsListTemplate);
import React,{Component} from 'react';
import { Icon, List, Rate, Button ,Modal} from "antd";
import React, { Component } from "react";
import { Icon, List, Rate, Button, Modal } from "antd";
import { connect } from "react-redux";
import * as Actions from "../../../redux/actions";
import Styles from "./style.less";
import AddModuleNew from "../AddModuleNew";
import Edit from "./edit.jsx";
class PayContentListTemplate extends Component{
class PayContentListTemplate extends Component {
constructor(props) {
super(props);
this.state = {
......@@ -18,10 +18,10 @@ class PayContentListTemplate extends Component{
this.setState({ editVisible: true });
};
saveNewsSelect = (list)=>{
saveNewsSelect = list => {
console.log(this.props);
debugger
}
// debugger
};
render() {
/**
* this.props.keys: 模块类型
......@@ -82,7 +82,16 @@ class PayContentListTemplate extends Component{
<List.Item>
<div className={Styles.CourseList}>
<div className={Styles.ImgBox}>
<img src={Item.imgPath?Item.imgPath:this.props.DataList.moduleType==10?"https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png":""} alt="" />
<img
src={
Item.imgPath
? Item.imgPath
: this.props.DataList.moduleType == 10
? "https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png"
: ""
}
alt=""
/>
</div>
<div className={Styles.RightContent}>
{/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */}
......@@ -151,4 +160,4 @@ export default connect((state, ownProps) => {
return {
homeInfo: state.door.homeInfo,
};
}, Actions)(PayContentListTemplate);
\ No newline at end of file
}, Actions)(PayContentListTemplate);
......@@ -246,7 +246,6 @@ class EditJingXuan extends Component {
num: activityNum,
};
if (isPc) {
data.listPlate = activityContent.map(item => {
//
if (item.contentType == 13) {
......@@ -288,7 +287,7 @@ class EditJingXuan extends Component {
if (moduleName.length == 0) {
message.info("请填写模块名称");
} else {
debugger
// debugger
data.moduleName = moduleName;
data.homeId = homeId;
data.siteId = siteId;
......@@ -448,7 +447,8 @@ const mapDispatchToProps = dispatch => {
// addTemplateDataPc: bindActionCreators(addTemplateDataPc, dispatch),
addTemplateDataPc: (obj, cb) => dispatch(addTemplateDataPc(obj, cb)),
// addTemplateDataWechat: bindActionCreators(addTemplateDataWechat, dispatch),
addTemplateDataWechat: (obj, cb) => dispatch(addTemplateDataWechat(obj, cb))
addTemplateDataWechat: (obj, cb) =>
dispatch(addTemplateDataWechat(obj, cb)),
};
};
export default Form.create()(
......
......@@ -39,7 +39,7 @@ class PostingsAddActivities extends React.Component {
}
componentWillReceiveProps(nextProps) {
let arr = [];
debugger
// debugger
if (nextProps.activitylist.length !== 0) {
for (let i = 0; i < nextProps.activitylist.length; i++) {
arr.push(nextProps.activitylist[i].id);
......@@ -51,7 +51,7 @@ class PostingsAddActivities extends React.Component {
}
// 选中数据
onSelectChange = (selectedRowKeys, selectedRows) => {
debugger
// debugger
var arr = [];
for (let i = 0; i < selectedRows.length; i++) {
arr.push(selectedRows[i].name);
......@@ -60,11 +60,7 @@ class PostingsAddActivities extends React.Component {
selectedRowKeys: selectedRowKeys,
selectedRows: selectedRows,
});
this.props.selectedCourseRowKeys(
selectedRowKeys,
selectedRows,
"postings"
);
this.props.selectedCourseRowKeys(selectedRowKeys, selectedRows, "postings");
};
//table相关分页 总条数
......
......@@ -104,7 +104,7 @@ class UrlAddactivity extends React.Component {
render: (text, record) => {
return this.state.dataSource.length >= 1 ? (
<Popconfirm
title={intl.get("ConfirmDelete").d("确定删除")+"?"}
title={intl.get("ConfirmDelete").d("确定删除") + "?"}
onConfirm={() => this.onDelete(record.key)}
>
<a href="javascript:;">{intl.get("Delete") || "删除"}</a>
......@@ -153,7 +153,7 @@ class UrlAddactivity extends React.Component {
const param = [key];
this.props.onAcDelete(param, (code, msg) => {
if (code === "1000") {
message.success(intl.get("DeletedSuccess")||"删除成功");
message.success(intl.get("DeletedSuccess") || "删除成功");
} else if (code !== "1000") {
// message.error("删除失败"+msg);
return;
......@@ -161,15 +161,15 @@ class UrlAddactivity extends React.Component {
});
};
handleAdd = () => {
debugger
// debugger;
const { count, dataSource } = this.state;
const newData = {
key: Math.random(),
// id: (new String(count+1).toString()),
acname: intl.get("comment13")||`名称`,
acname: intl.get("comment13") || `名称`,
address: `https://`,
typename: intl.get("OutsideLink")||`外链`,
typenaem: intl.get("customProject92")||"外部链接",
typename: intl.get("OutsideLink") || `外链`,
typenaem: intl.get("customProject92") || "外部链接",
type: 7,
};
......@@ -181,7 +181,7 @@ class UrlAddactivity extends React.Component {
dataSource: arr,
count: count + 1,
});
debugger
// debugger
this.props.selectedUrlRowKeys(arr);
};
render() {
......@@ -191,7 +191,7 @@ class UrlAddactivity extends React.Component {
return (
<div>
<Button className="editable-add-btn" onClick={this.handleAdd}>
{intl.get("Add")||"添加"}
{intl.get("Add") || "添加"}
</Button>
<Table
style={{ marginTop: "20px" }}
......
......@@ -67,20 +67,20 @@ class addplan extends React.Component {
}
componentDidMount() {
// bug-12744-czd
let activitylist = this.props.activitylist
debugger
let selectedCourseRowKeys = activitylist.filter(i => i.type === 0)
let selectedUnderLineRowKeys = activitylist.filter(i => i.type === 10)
let selectedLiveeRowKeys = activitylist.filter(i => i.type === 3)
let selectedSurveyRowKeys = activitylist.filter(i => i.type === 2)
let selectedExamRowKeys = activitylist.filter(i => i.type === 1)
let selectedVoteRowKeys = activitylist.filter(i => i.type === 4)
let selectedHomeworkRowKeys = activitylist.filter(i => i.type === 5)
let selectedCertificateRowKeys = activitylist.filter(i => i.type === 6)
let SelectCaseactiveRowKeys = activitylist.filter(i => i.type === 11)
let SelectcaseRowKeys = activitylist.filter(i => i.type === 12)
let DataBaseRowKeys = activitylist.filter(i => i.type === 13)
let postingsRowKeys = activitylist.filter(i => i.type === 14)
let activitylist = this.props.activitylist;
// debugger
let selectedCourseRowKeys = activitylist.filter(i => i.type === 0);
let selectedUnderLineRowKeys = activitylist.filter(i => i.type === 10);
let selectedLiveeRowKeys = activitylist.filter(i => i.type === 3);
let selectedSurveyRowKeys = activitylist.filter(i => i.type === 2);
let selectedExamRowKeys = activitylist.filter(i => i.type === 1);
let selectedVoteRowKeys = activitylist.filter(i => i.type === 4);
let selectedHomeworkRowKeys = activitylist.filter(i => i.type === 5);
let selectedCertificateRowKeys = activitylist.filter(i => i.type === 6);
let SelectCaseactiveRowKeys = activitylist.filter(i => i.type === 11);
let SelectcaseRowKeys = activitylist.filter(i => i.type === 12);
let DataBaseRowKeys = activitylist.filter(i => i.type === 13);
let postingsRowKeys = activitylist.filter(i => i.type === 14);
this.setState({
selectedCourseRowKeys,
selectedUnderLineRowKeys,
......@@ -111,7 +111,7 @@ class addplan extends React.Component {
.concat(Array.from(new Set(this.state.SelectCaseactiveRowKeys)))
.concat(Array.from(new Set(this.state.SelectcaseRowKeys)))
.concat(Array.from(new Set(this.state.DataBaseRowKeys)))
.concat(Array.from(new Set(this.state.postingsRowKeys)))
.concat(Array.from(new Set(this.state.postingsRowKeys)));
// .concat(this.props.activitylist); // bug-12744-czd
activitylist = activitylist
.filter(i => i.type !== 7)
......@@ -175,7 +175,7 @@ class addplan extends React.Component {
// 课程活动选中保存 、作品、原创活动、资料
selectedCourseRowKeys(selectedRowKeys, selectedRows, flag) {
debugger
// debugger
const arr = [];
const selset = [];
if (this.state.selectedCourseRowKeys.length !== 0) {
......@@ -203,7 +203,7 @@ class addplan extends React.Component {
}
// selectedRows[]
}
debugger
// debugger
if (flag === "Caseactive") {
// 作品
this.setState({
......
......@@ -90,7 +90,7 @@ class NewPostings extends Component {
pageNo: 1,
pageSize: 50,
};
this.props.getPostingsManagerClassifyList(requestClassifyParams, function (
this.props.getPostingsManagerClassifyList(requestClassifyParams, function(
classifyList
) {
console.log("didM-classifyList", classifyList);
......@@ -185,11 +185,7 @@ class NewPostings extends Component {
id: file.id,
fileName: file.name,
ossUrl:
uploadParam.host +
"/" +
uploadParam.dir +
"/" +
file.fileName,
uploadParam.host + "/" + uploadParam.dir + "/" + file.fileName,
size: file.size,
percent: 0,
suffix: "." + file.name.split(".")[fileLength - 1],
......@@ -213,11 +209,7 @@ class NewPostings extends Component {
this.setState(
{
caseCoverImage:
uploadParam.host +
"/" +
uploadParam.dir +
"/" +
file.target_name,
uploadParam.host + "/" + uploadParam.dir + "/" + file.target_name,
},
() => {
_this.props.form.setFieldsValue({
......@@ -227,7 +219,6 @@ class NewPostings extends Component {
);
break;
case "content":
this.setState(
{
contentFile: {
......@@ -248,7 +239,6 @@ class NewPostings extends Component {
);
break;
case "attachment":
let sameArr = attachmentFiles.filter(item => {
return item.id == file.id;
});
......@@ -294,8 +284,7 @@ class NewPostings extends Component {
);
}
}
}
};
attachmentProgress(file) {
let { attachmentFiles } = this.state;
......@@ -573,7 +562,7 @@ class NewPostings extends Component {
}
savePostings = type => {
debugger
// debugger
const _this = this;
const {
title,
......@@ -664,7 +653,6 @@ class NewPostings extends Component {
//保存或者提交 type==0保存草稿,type==1提交
this.props.saveNewPostings(saveParams, data => {
if (data) {
// 跳转至列表
// this.props.history.push(
// "/" + companyCode + "/" + siteCode + "/index/tool/lecturer/create"
......@@ -746,23 +734,27 @@ class NewPostings extends Component {
<div className={styles.divider} />
<div className={styles.newPostingsBody}>
<Form className={styles.title}>
<FormItem style={{ display: "flex" }} label="帖子标题:">{
getFieldDecorator("title", {
<FormItem style={{ display: "flex" }} label="帖子标题:">
{getFieldDecorator("title", {
rules: [
{
required: true,
message: "请输入帖子名称"
}, {
message: "请输入帖子名称",
},
{
max: 100,
message: "最多可输入100个字"
}
]
})(<Input
message: "最多可输入100个字",
},
],
})(
<Input
placeholder="请输入帖子标题(100字以内)"
style={{ width: "300px",marginLeft:"20px" }} onChange={e => {
style={{ width: "300px", marginLeft: "20px" }}
onChange={e => {
this.handleChange(e, "title");
}}/>)
}
}}
/>
)}
</FormItem>
</Form>
{/* <div className={styles.title}>
......@@ -864,7 +856,12 @@ class NewPostings extends Component {
deleteFile={id => this.preDeleteByType("", "attachment", id)}
/>
{this.state.attachmentFiles.length < 9 ? (
<OssUploader fileList={this.state.attachmentFiles} beforeUpload={this.preFile.bind(this)} success={this.completeFile.bind(this)} fail={this.uploadError.bind(this)} />
<OssUploader
fileList={this.state.attachmentFiles}
beforeUpload={this.preFile.bind(this)}
success={this.completeFile.bind(this)}
fail={this.uploadError.bind(this)}
/>
) : (
""
)}
......@@ -876,7 +873,8 @@ class NewPostings extends Component {
关联平台活动:
</div>
<div className={styles.relativeActivitiesValue}>
<Button type="primary"
<Button
type="primary"
className={styles.targetPlatformActivities}
style={
this.state.relativeActivitiesData.length == 5
......@@ -942,7 +940,8 @@ class NewPostings extends Component {
>
存草稿
</Button>
<Button type="primary"
<Button
type="primary"
className={styles.publishingNewPostings}
onClick={() => {
this.savePostings(2);
......@@ -1052,7 +1051,6 @@ class NewPostings extends Component {
}
}
function mapStateToProps(state, ownProps) {
return {
uploadParam: state.uploadParam.param,
......
......@@ -211,7 +211,6 @@ class Check extends Component {
}
submitScore(type) {
const { info } = this.props;
let _this = this;
let falsetrue = this.state.scoreData.filter(item =>
......@@ -240,7 +239,7 @@ class Check extends Component {
searchPaper() {
const { getPaperList } = this.props;
const { paperPagesize,paperNum, username, name, depart } = this.state;
const { paperPagesize, paperNum, username, name, depart } = this.state;
let reg1 = /[#\$%\^&\*{}|\\]+/g.test(username);
let reg2 = /[#\$%\^&\*{}|\\]+/g.test(name);
let reg3 = /[#\$%\^&\*{}|\\]+/g.test(depart);
......@@ -305,7 +304,7 @@ class Check extends Component {
id: text.readOverId,
},
() => {
debugger
// debugger
var json = {
examName: _this.props.info.examName,
name: _this.props.info.name,
......@@ -314,7 +313,7 @@ class Check extends Component {
impersonality: String(_this.props.info.objectiveScore),
sum: String(_this.props.info.sumScore),
isQualified: _this.props.info.isQualified,
finalScoring:String(_this.props.info.sumScore),
finalScoring: String(_this.props.info.sumScore),
// _this.props.info.subjectiveScore + _this.props.info.objectiveScore,
};
_this.setState({
......@@ -354,7 +353,6 @@ class Check extends Component {
paperPagesize: pagesize,
paperNum: page,
});
};
render() {
......@@ -374,9 +372,7 @@ class Check extends Component {
sum: paperList[i].sumScore,
impersonality: paperList[i].objectiveScore,
subjectivity:
paperList[i].subjectiveScore >= 0
? paperList[i].subjectiveScore
: "",
paperList[i].subjectiveScore >= 0 ? paperList[i].subjectiveScore : "",
action: paperList[i],
});
}
......@@ -386,7 +382,7 @@ class Check extends Component {
width: "20%",
textAlign: "center",
};
console.log(this.state.paperDetail.impersonality )
console.log(this.state.paperDetail.impersonality);
return (
<div className={styles.list} style={{ padding: "20px" }}>
<div>
......@@ -446,9 +442,7 @@ class Check extends Component {
{this.state.paperDetail.impersonality}
</Grid>
<Grid style={gridStyle}>{this.state.paperDetail.subjectivity}</Grid>
<Grid style={gridStyle}>
{this.state.paperDetail.finalScoring}
</Grid>
<Grid style={gridStyle}>{this.state.paperDetail.finalScoring}</Grid>
<Grid style={gridStyle}>
{this.state.paperDetail.isQualified == 1 ? "合格" : "不合格"}
</Grid>
......
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