Skip to content

S
sass-admin
Commit 7618c2ba by 潘本斌
Options

资讯

parent b42be421
Showing with 459 additions and 445 deletions
src/pages/MunuNav/index.jsx
...@@ -184,7 +184,7 @@ function mapStateToProps(state, ownProps) { ...@@ -184,7 +184,7 @@ function mapStateToProps(state, ownProps) {
let nav = {}; let nav = {};
let menuList = []; let menuList = [];
if (login.siteData && login.siteData.length > 0) { if (login.siteData && login.siteData.length > 0) {
debugger; // debugger;
// 根据后台返回每个站点目录 // 根据后台返回每个站点目录
nav = login.siteData.filter(item => siteCode === item.siteCode)[0]; nav = login.siteData.filter(item => siteCode === item.siteCode)[0];
// 数据整合渲染menu // 数据整合渲染menu
......
src/pages/SystemManagement/Banner/index.jsx
...@@ -8,7 +8,7 @@ import React from "react"; ...@@ -8,7 +8,7 @@ import React from "react";
import { Table, Select, Popconfirm, Button } from "antd"; import { Table, Select, Popconfirm, Button } from "antd";
import { connect } from "react-redux"; import { connect } from "react-redux";
import styles from "./index.less"; import styles from "./index.less";
import intl from 'react-intl-universal'; import intl from "react-intl-universal";
import { import {
getBannerList, getBannerList,
handleBannerDown, handleBannerDown,
...@@ -135,14 +135,16 @@ class Banner extends React.PureComponent { ...@@ -135,14 +135,16 @@ class Banner extends React.PureComponent {
> >
{record.state === 1 ? "下架" : "上架"} {record.state === 1 ? "下架" : "上架"}
</span> </span>
{record.state !== 1 ? {record.state !== 1 ? (
<Popconfirm <Popconfirm
title="是否删除？" title="是否删除？"
onConfirm={() => this.handleDelete(record)} onConfirm={() => this.handleDelete(record)}
> >
<span style={{ ...buttonStyle }}>删除</span> <span style={{ ...buttonStyle }}>删除</span>
</Popconfirm>:''} </Popconfirm>
) : (
""
)}
</div> </div>
); );
}, },
...@@ -260,7 +262,7 @@ class Banner extends React.PureComponent { ...@@ -260,7 +262,7 @@ class Banner extends React.PureComponent {
return ( return (
<div className={styles.banner_manage_body}> <div className={styles.banner_manage_body}>
<Breadcrumb title="Banner管理"/> <Breadcrumb title="滚动首图管理" />
<div className={styles.left}> <div className={styles.left}>
{this.terminalList.map((item, index) => { {this.terminalList.map((item, index) => {
return ( return (
......
src/pages/SystemManagement/Information/index.jsx
...@@ -145,9 +145,12 @@ class TreeItem extends React.Component { ...@@ -145,9 +145,12 @@ class TreeItem extends React.Component {
return error; return error;
} }
if (this.state.name == "新增分类") { if (this.state.name == "新增分类") {
postAddNewsLists({ parentId: data.id, ...values }); postAddNewsLists({
parentId: data.id,
...values,
});
} else if (this.state.name == "编辑分类") { } 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.setState({ visible: false });
// this.props.form.validateFields((errors, values) => { // this.props.form.validateFields((errors, values) => {
...@@ -268,7 +271,7 @@ class TreeItem extends React.Component { ...@@ -268,7 +271,7 @@ class TreeItem extends React.Component {
}; };
return ( return (
<div style={{ width: "100%" }}> <div style={{ width: "100%" }}>
<Breadcrumb title="资讯管理"/> <Breadcrumb title="资讯管理" />
<Modal <Modal
className="sort-modal" className="sort-modal"
visible={visible} visible={visible}
...@@ -342,6 +345,11 @@ class TreeItem extends React.Component { ...@@ -342,6 +345,11 @@ class TreeItem extends React.Component {
style={{ float: "right", position: "absolute", right: "15%" }} //bug-12640-liyuan 30 -> 15% style={{ float: "right", position: "absolute", right: "15%" }} //bug-12640-liyuan 30 -> 15%
> >
<Icon <Icon
type="plus"
className={Styles.pmEditIcon}
onClick={() => this.showModal("1")}
/>
<Icon
type="edit" type="edit"
className={Styles.pmEditIcon} className={Styles.pmEditIcon}
onClick={() => this.showModal("2")} onClick={() => this.showModal("2")}
......
src/pages/SystemManagement/Site/Door/indexPage/mobilePlugin/newslist/index.jsx
import React,{Component} from 'react'; import React, { Component } from "react";
import { Icon, List, Rate, Button ,Modal} from "antd"; import { Icon, List, Rate, Button, Modal } from "antd";
import { connect } from "react-redux"; import { connect } from "react-redux";
import * as Actions from "../../../redux/actions"; import * as Actions from "../../../redux/actions";
import Styles from "./style.less"; import Styles from "./style.less";
import AddModuleNew from "../AddModuleNew"; import AddModuleNew from "../AddModuleNew";
import Edit from "./edit"; import Edit from "./edit";
class NewsListTemplate extends Component{ class NewsListTemplate extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
index: 1, index: 1,
list: [], list: [],
}; };
} }
showeditVi = () => { showeditVi = () => {
this.setState({ editVisible: true }); this.setState({ editVisible: true });
}; };
saveNewsSelect = list => {
console.log(this.props);
// debugger
};
render() {
/**
* this.props.keys: 模块类型
* moduleName:模块名称
* homeId: "979993971453558791"首页ID ,
* templateId: 模块id
* moduleType: 模块类型
* siteId: 站点id
* templateList:模块列表
* DataList:回显对象
*
* **/
let { moduleName = "" } = this.props.DataList;
const {
homeId,
siteId,
templateList = [{}],
templateId,
} = this.props.DataList;
const id = templateId;
let DataList = this.props.DataList;
// 序号
templateList.map((item, i) => {
item.index = i + 1;
});
saveNewsSelect = (list)=>{ DataList.plateList = templateList;
console.log(this.props); const data2 = this.props.DataList.templateList
debugger ? this.props.DataList.templateList
} : [];
render() { return (
/** <div className={Styles.CourseBox}>
* this.props.keys: 模块类型 <div
* moduleName:模块名称 className={Styles.CourseName}
* homeId: "979993971453558791"首页ID , onClick={() => this.setState({ editVisible: true })}
* templateId: 模块id >
* moduleType: 模块类型 <div
* siteId: 站点id className={Styles.Name}
* templateList:模块列表 title={moduleName} //bug-11364-liyuan
* DataList:回显对象 >
* {moduleName}
* **/ </div>
<div className={Styles.More}>
let { moduleName = "" } = this.props.DataList; <Button
const {
homeId,
siteId,
templateList = [{}],
templateId,
} = this.props.DataList;
const id = templateId;
let DataList = this.props.DataList;
// 序号
templateList.map((item, i) => {
item.index = i + 1;
});
DataList.plateList = templateList;
const data2 = this.props.DataList.templateList
? this.props.DataList.templateList
: [];
return (
<div className={Styles.CourseBox}>
<div
className={Styles.CourseName}
onClick={() => this.setState({ editVisible: true })} onClick={() => this.setState({ editVisible: true })}
type="primary"
> >
<div 编辑内容
className={Styles.Name} </Button>
title={moduleName} //bug-11364-liyuan </div>
> </div>
{moduleName} <List
</div> onClick={() => this.setState({ editVisible: true })}
<div className={Styles.More}> grid={{ gutter: 16, column: 1 }}
<Button dataSource={data2}
onClick={() => this.setState({ editVisible: true })} renderItem={(Item, index) => (
type="primary" <List.Item>
> <div className={Styles.CourseList}>
编辑内容 <div className={Styles.ImgBox}>
</Button> <img
</div> src={
</div> Item.imgPath
<List ? Item.imgPath
onClick={() => this.setState({ editVisible: true })} : this.props.DataList.moduleType == 10
grid={{ gutter: 16, column: 1 }} ? "https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png"
dataSource={data2} : ""
renderItem={(Item, index) => ( }
<List.Item> alt=""
<div className={Styles.CourseList}> />
<div className={Styles.ImgBox}> </div>
<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 className={Styles.RightContent}>
</div> {/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */}
<div className={Styles.RightContent}> <div className={Styles.Name}>{Item.linkContentName}</div>
{/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */} <div className={Styles.People}>
<div className={Styles.Name}>{Item.linkContentName}</div> {Item.author || Item.createByName}
<div className={Styles.People}> </div>
{Item.author || Item.createByName} {this.props.keys == 3 && (
<div className={Styles.RightBottom}>
<div className={Styles.Points}>
<Rate
count={5}
disabled
allowHalf
value={parseInt(Item.score)}
className={Styles.Rate}
/>
{Item.score}
</div>
<div className={Styles.Learning}>
<Icon type="team" />
{`${Item.studyNo || 0}+`}
</div> </div>
{this.props.keys == 3 && (
<div className={Styles.RightBottom}>
<div className={Styles.Points}>
<Rate
count={5}
disabled
allowHalf
value={parseInt(Item.score)}
className={Styles.Rate}
/>
{Item.score}
</div>
<div className={Styles.Learning}>
<Icon type="team" />
{`${Item.studyNo || 0}+`}
</div>
</div>
)}
{this.props.keys == 4 && (
<div className={Styles.RightBottom}>{Item.title}</div>
)}
</div> </div>
</div> )}
</List.Item>
)} {this.props.keys == 4 && (
/> <div className={Styles.RightBottom}>{Item.title}</div>
)}
{/*添加模块*/} </div>
<AddModuleNew </div>
homeId={homeId} </List.Item>
templateId={templateId} )}
siteId={siteId} />
id={id}
isLast={this.props.isLast} {/*添加模块*/}
isFirst={this.props.isFirst} <AddModuleNew
/> homeId={homeId}
templateId={templateId}
{/*更新模块*/} siteId={siteId}
{this.state.editVisible && ( id={id}
<Edit isLast={this.props.isLast}
keys={this.props.keys} isFirst={this.props.isFirst}
homeId={homeId} />
siteId={siteId}
templateId={templateId} {/*更新模块*/}
id={id} {this.state.editVisible && (
editVo={DataList} <Edit
saveNewsSelect={this.saveNewsSelect} keys={this.props.keys}
onCancle={() => this.setState({ editVisible: false })} homeId={homeId}
/> siteId={siteId}
)} templateId={templateId}
</div> id={id}
); editVo={DataList}
} saveNewsSelect={this.saveNewsSelect}
onCancle={() => this.setState({ editVisible: false })}
/>
)}
</div>
);
}
} }
//把Reducer和Action与页面组件关联起来 //把Reducer和Action与页面组件关联起来
export default connect((state, ownProps) => { export default connect((state, ownProps) => {
return { return {
homeInfo: state.door.homeInfo, homeInfo: state.door.homeInfo,
}; };
}, Actions)(NewsListTemplate); }, Actions)(NewsListTemplate);
\ No newline at end of file
src/pages/SystemManagement/Site/Door/indexPage/mobilePlugin/payContentList/index.jsx
import React,{Component} from 'react'; import React, { Component } from "react";
import { Icon, List, Rate, Button ,Modal} from "antd"; import { Icon, List, Rate, Button, Modal } from "antd";
import { connect } from "react-redux"; import { connect } from "react-redux";
import * as Actions from "../../../redux/actions"; import * as Actions from "../../../redux/actions";
import Styles from "./style.less"; import Styles from "./style.less";
import AddModuleNew from "../AddModuleNew"; import AddModuleNew from "../AddModuleNew";
import Edit from "./edit.jsx"; import Edit from "./edit.jsx";
class PayContentListTemplate extends Component{ class PayContentListTemplate extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
index: 1, index: 1,
list: [], list: [],
}; };
} }
showeditVi = () => { showeditVi = () => {
this.setState({ editVisible: true }); this.setState({ editVisible: true });
}; };
saveNewsSelect = list => {
console.log(this.props);
// debugger
};
render() {
/**
* this.props.keys: 模块类型
* moduleName:模块名称
* homeId: "979993971453558791"首页ID ,
* templateId: 模块id
* moduleType: 模块类型
* siteId: 站点id
* templateList:模块列表
* DataList:回显对象
*
* **/
let { moduleName = "" } = this.props.DataList;
const {
homeId,
siteId,
templateList = [{}],
templateId,
} = this.props.DataList;
const id = templateId;
let DataList = this.props.DataList;
// 序号
templateList.map((item, i) => {
item.index = i + 1;
});
saveNewsSelect = (list)=>{ DataList.plateList = templateList;
console.log(this.props); const data2 = this.props.DataList.templateList
debugger ? this.props.DataList.templateList
} : [];
render() { return (
/** <div className={Styles.CourseBox}>
* this.props.keys: 模块类型 <div
* moduleName:模块名称 className={Styles.CourseName}
* homeId: "979993971453558791"首页ID , onClick={() => this.setState({ editVisible: true })}
* templateId: 模块id >
* moduleType: 模块类型 <div
* siteId: 站点id className={Styles.Name}
* templateList:模块列表 title={moduleName} //bug-11364-liyuan
* DataList:回显对象 >
* {moduleName}
* **/ </div>
<div className={Styles.More}>
let { moduleName = "" } = this.props.DataList; <Button
const {
homeId,
siteId,
templateList = [{}],
templateId,
} = this.props.DataList;
const id = templateId;
let DataList = this.props.DataList;
// 序号
templateList.map((item, i) => {
item.index = i + 1;
});
DataList.plateList = templateList;
const data2 = this.props.DataList.templateList
? this.props.DataList.templateList
: [];
return (
<div className={Styles.CourseBox}>
<div
className={Styles.CourseName}
onClick={() => this.setState({ editVisible: true })} onClick={() => this.setState({ editVisible: true })}
type="primary"
> >
<div 编辑内容
className={Styles.Name} </Button>
title={moduleName} //bug-11364-liyuan </div>
> </div>
{moduleName} <List
</div> onClick={() => this.setState({ editVisible: true })}
<div className={Styles.More}> grid={{ gutter: 16, column: 1 }}
<Button dataSource={data2}
onClick={() => this.setState({ editVisible: true })} renderItem={(Item, index) => (
type="primary" <List.Item>
> <div className={Styles.CourseList}>
编辑内容 <div className={Styles.ImgBox}>
</Button> <img
</div> src={
</div> Item.imgPath
<List ? Item.imgPath
onClick={() => this.setState({ editVisible: true })} : this.props.DataList.moduleType == 10
grid={{ gutter: 16, column: 1 }} ? "https://customproject.oss-cn-shanghai.aliyuncs.com/yzphoto/site_defalut_logo.png"
dataSource={data2} : ""
renderItem={(Item, index) => ( }
<List.Item> alt=""
<div className={Styles.CourseList}> />
<div className={Styles.ImgBox}> </div>
<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 className={Styles.RightContent}>
</div> {/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */}
<div className={Styles.RightContent}> <div className={Styles.Name}>{Item.title}</div>
{/* {console.log('linkContentNamelinkContentNamelinkContentNamelinkContentName',Item.linkContentName)} */} <div className={Styles.People}>
<div className={Styles.Name}>{Item.title}</div> {Item.author || Item.createByName}
<div className={Styles.People}> </div>
{Item.author || Item.createByName} {this.props.keys == 3 && (
<div className={Styles.RightBottom}>
<div className={Styles.Points}>
<Rate
count={5}
disabled
allowHalf
value={parseInt(Item.score)}
className={Styles.Rate}
/>
{Item.score}
</div>
<div className={Styles.Learning}>
<Icon type="team" />
{`${Item.studyNo || 0}+`}
</div> </div>
{this.props.keys == 3 && (
<div className={Styles.RightBottom}>
<div className={Styles.Points}>
<Rate
count={5}
disabled
allowHalf
value={parseInt(Item.score)}
className={Styles.Rate}
/>
{Item.score}
</div>
<div className={Styles.Learning}>
<Icon type="team" />
{`${Item.studyNo || 0}+`}
</div>
</div>
)}
{this.props.keys == 4 && (
<div className={Styles.RightBottom}>{Item.title}</div>
)}
</div> </div>
</div> )}
</List.Item>
)} {this.props.keys == 4 && (
/> <div className={Styles.RightBottom}>{Item.title}</div>
)}
{/*添加模块*/} </div>
<AddModuleNew </div>
homeId={homeId} </List.Item>
templateId={templateId} )}
siteId={siteId} />
id={id}
isLast={this.props.isLast} {/*添加模块*/}
isFirst={this.props.isFirst} <AddModuleNew
/> homeId={homeId}
templateId={templateId}
{/*更新模块*/} siteId={siteId}
{this.state.editVisible && ( id={id}
<Edit isLast={this.props.isLast}
keys={this.props.keys} isFirst={this.props.isFirst}
homeId={homeId} />
siteId={siteId}
templateId={templateId} {/*更新模块*/}
id={id} {this.state.editVisible && (
editVo={DataList} <Edit
saveNewsSelect={this.saveNewsSelect} keys={this.props.keys}
onCancle={() => this.setState({ editVisible: false })} homeId={homeId}
/> siteId={siteId}
)} templateId={templateId}
</div> id={id}
); editVo={DataList}
} saveNewsSelect={this.saveNewsSelect}
onCancle={() => this.setState({ editVisible: false })}
/>
)}
</div>
);
}
} }
//把Reducer和Action与页面组件关联起来 //把Reducer和Action与页面组件关联起来
export default connect((state, ownProps) => { export default connect((state, ownProps) => {
return { return {
homeInfo: state.door.homeInfo, homeInfo: state.door.homeInfo,
}; };
}, Actions)(PayContentListTemplate); }, Actions)(PayContentListTemplate);
\ No newline at end of file
src/pages/SystemManagement/Site/Door/pcIndex/component/ModuleType1/editJingxuan/index.jsx
...@@ -246,7 +246,6 @@ class EditJingXuan extends Component { ...@@ -246,7 +246,6 @@ class EditJingXuan extends Component {
num: activityNum, num: activityNum,
}; };
if (isPc) { if (isPc) {
data.listPlate = activityContent.map(item => { data.listPlate = activityContent.map(item => {
// //
if (item.contentType == 13) { if (item.contentType == 13) {
...@@ -288,7 +287,7 @@ class EditJingXuan extends Component { ...@@ -288,7 +287,7 @@ class EditJingXuan extends Component {
if (moduleName.length == 0) { if (moduleName.length == 0) {
message.info("请填写模块名称"); message.info("请填写模块名称");
} else { } else {
debugger // debugger
data.moduleName = moduleName; data.moduleName = moduleName;
data.homeId = homeId; data.homeId = homeId;
data.siteId = siteId; data.siteId = siteId;
...@@ -366,20 +365,20 @@ class EditJingXuan extends Component { ...@@ -366,20 +365,20 @@ class EditJingXuan extends Component {
{isPc ? ( {isPc ? (
"" ""
) : ( ) : (
<FormItem label="模块名称"> <FormItem label="模块名称">
{getFieldDecorator("moduleName", { {getFieldDecorator("moduleName", {
rules: [{ required: true, message: "填写模块名称!" }], rules: [{ required: true, message: "填写模块名称!" }],
initialValue: this.state.moduleName, initialValue: this.state.moduleName,
})( })(
<Input <Input
style={{ width: 220 }} style={{ width: 220 }}
placeholder={"请输入输入模块名称"} placeholder={"请输入输入模块名称"}
// maxLength={10} //bug-1364-liyuan 模块名称不做字数限制 // maxLength={10} //bug-1364-liyuan 模块名称不做字数限制
onChange={this.moduleNameChange} onChange={this.moduleNameChange}
/> />
)} )}
</FormItem> </FormItem>
)} )}
{isPc ? "" : <br />} {isPc ? "" : <br />}
<FormItem label={isPc ? "推荐数量" : "推荐数量"}> <FormItem label={isPc ? "推荐数量" : "推荐数量"}>
...@@ -390,19 +389,19 @@ class EditJingXuan extends Component { ...@@ -390,19 +389,19 @@ class EditJingXuan extends Component {
<Select style={{ width: 220 }} onChange={this.activeNumChange}> <Select style={{ width: 220 }} onChange={this.activeNumChange}>
{isPc {isPc
? pcOptions.map((item, index) => { ? pcOptions.map((item, index) => {
return ( return (
<Option key={index} value={item}> <Option key={index} value={item}>
{item} {item}
</Option> </Option>
); );
}) })
: wechatOptions.map((item, index) => { : wechatOptions.map((item, index) => {
return ( return (
<Option key={index} value={item}> <Option key={index} value={item}>
{item} {item}
</Option> </Option>
); );
})} })}
</Select> </Select>
)} )}
</FormItem> </FormItem>
...@@ -448,7 +447,8 @@ const mapDispatchToProps = dispatch => { ...@@ -448,7 +447,8 @@ const mapDispatchToProps = dispatch => {
// addTemplateDataPc: bindActionCreators(addTemplateDataPc, dispatch), // addTemplateDataPc: bindActionCreators(addTemplateDataPc, dispatch),
addTemplateDataPc: (obj, cb) => dispatch(addTemplateDataPc(obj, cb)), addTemplateDataPc: (obj, cb) => dispatch(addTemplateDataPc(obj, cb)),
// addTemplateDataWechat: bindActionCreators(addTemplateDataWechat, dispatch), // addTemplateDataWechat: bindActionCreators(addTemplateDataWechat, dispatch),
addTemplateDataWechat: (obj, cb) => dispatch(addTemplateDataWechat(obj, cb)) addTemplateDataWechat: (obj, cb) =>
dispatch(addTemplateDataWechat(obj, cb)),
}; };
}; };
export default Form.create()( export default Form.create()(
......
src/pages/TrainingPrograms/ProgeamsManage/Plan/Addactivity/PostingsAddActivities.jsx
...@@ -39,7 +39,7 @@ class PostingsAddActivities extends React.Component { ...@@ -39,7 +39,7 @@ class PostingsAddActivities extends React.Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
let arr = []; let arr = [];
debugger // debugger
if (nextProps.activitylist.length !== 0) { if (nextProps.activitylist.length !== 0) {
for (let i = 0; i < nextProps.activitylist.length; i++) { for (let i = 0; i < nextProps.activitylist.length; i++) {
arr.push(nextProps.activitylist[i].id); arr.push(nextProps.activitylist[i].id);
...@@ -51,7 +51,7 @@ class PostingsAddActivities extends React.Component { ...@@ -51,7 +51,7 @@ class PostingsAddActivities extends React.Component {
} }
// 选中数据 // 选中数据
onSelectChange = (selectedRowKeys, selectedRows) => { onSelectChange = (selectedRowKeys, selectedRows) => {
debugger // debugger
var arr = []; var arr = [];
for (let i = 0; i < selectedRows.length; i++) { for (let i = 0; i < selectedRows.length; i++) {
arr.push(selectedRows[i].name); arr.push(selectedRows[i].name);
...@@ -60,11 +60,7 @@ class PostingsAddActivities extends React.Component { ...@@ -60,11 +60,7 @@ class PostingsAddActivities extends React.Component {
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
selectedRows: selectedRows, selectedRows: selectedRows,
}); });
this.props.selectedCourseRowKeys( this.props.selectedCourseRowKeys(selectedRowKeys, selectedRows, "postings");
selectedRowKeys,
selectedRows,
"postings"
);
}; };
//table相关分页 总条数 //table相关分页 总条数
......
src/pages/TrainingPrograms/ProgeamsManage/Plan/Addactivity/UrlAddactivity.jsx
...@@ -104,7 +104,7 @@ class UrlAddactivity extends React.Component { ...@@ -104,7 +104,7 @@ class UrlAddactivity extends React.Component {
render: (text, record) => { render: (text, record) => {
return this.state.dataSource.length >= 1 ? ( return this.state.dataSource.length >= 1 ? (
<Popconfirm <Popconfirm
title={intl.get("ConfirmDelete").d("确定删除")+"?"} title={intl.get("ConfirmDelete").d("确定删除") + "?"}
onConfirm={() => this.onDelete(record.key)} onConfirm={() => this.onDelete(record.key)}
> >
<a href="javascript:;">{intl.get("Delete") || "删除"}</a> <a href="javascript:;">{intl.get("Delete") || "删除"}</a>
...@@ -153,7 +153,7 @@ class UrlAddactivity extends React.Component { ...@@ -153,7 +153,7 @@ class UrlAddactivity extends React.Component {
const param = [key]; const param = [key];
this.props.onAcDelete(param, (code, msg) => { this.props.onAcDelete(param, (code, msg) => {
if (code === "1000") { if (code === "1000") {
message.success(intl.get("DeletedSuccess")||"删除成功"); message.success(intl.get("DeletedSuccess") || "删除成功");
} else if (code !== "1000") { } else if (code !== "1000") {
// message.error("删除失败"+msg); // message.error("删除失败"+msg);
return; return;
...@@ -161,15 +161,15 @@ class UrlAddactivity extends React.Component { ...@@ -161,15 +161,15 @@ class UrlAddactivity extends React.Component {
}); });
}; };
handleAdd = () => { handleAdd = () => {
debugger // debugger;
const { count, dataSource } = this.state; const { count, dataSource } = this.state;
const newData = { const newData = {
key: Math.random(), key: Math.random(),
// id: (new String(count+1).toString()), // id: (new String(count+1).toString()),
acname: intl.get("comment13")||`名称`, acname: intl.get("comment13") || `名称`,
address: `https://`, address: `https://`,
typename: intl.get("OutsideLink")||`外链`, typename: intl.get("OutsideLink") || `外链`,
typenaem: intl.get("customProject92")||"外部链接", typenaem: intl.get("customProject92") || "外部链接",
type: 7, type: 7,
}; };
...@@ -181,7 +181,7 @@ class UrlAddactivity extends React.Component { ...@@ -181,7 +181,7 @@ class UrlAddactivity extends React.Component {
dataSource: arr, dataSource: arr,
count: count + 1, count: count + 1,
}); });
debugger // debugger
this.props.selectedUrlRowKeys(arr); this.props.selectedUrlRowKeys(arr);
}; };
render() { render() {
...@@ -191,7 +191,7 @@ class UrlAddactivity extends React.Component { ...@@ -191,7 +191,7 @@ class UrlAddactivity extends React.Component {
return ( return (
<div> <div>
<Button className="editable-add-btn" onClick={this.handleAdd}> <Button className="editable-add-btn" onClick={this.handleAdd}>
{intl.get("Add")||"添加"} {intl.get("Add") || "添加"}
</Button> </Button>
<Table <Table
style={{ marginTop: "20px" }} style={{ marginTop: "20px" }}
......
src/pages/TrainingPrograms/ProgeamsManage/Plan/Addplan.jsx
...@@ -67,20 +67,20 @@ class addplan extends React.Component { ...@@ -67,20 +67,20 @@ class addplan extends React.Component {
} }
componentDidMount() { componentDidMount() {
// bug-12744-czd // bug-12744-czd
let activitylist = this.props.activitylist let activitylist = this.props.activitylist;
debugger // debugger
let selectedCourseRowKeys = activitylist.filter(i => i.type === 0) let selectedCourseRowKeys = activitylist.filter(i => i.type === 0);
let selectedUnderLineRowKeys = activitylist.filter(i => i.type === 10) let selectedUnderLineRowKeys = activitylist.filter(i => i.type === 10);
let selectedLiveeRowKeys = activitylist.filter(i => i.type === 3) let selectedLiveeRowKeys = activitylist.filter(i => i.type === 3);
let selectedSurveyRowKeys = activitylist.filter(i => i.type === 2) let selectedSurveyRowKeys = activitylist.filter(i => i.type === 2);
let selectedExamRowKeys = activitylist.filter(i => i.type === 1) let selectedExamRowKeys = activitylist.filter(i => i.type === 1);
let selectedVoteRowKeys = activitylist.filter(i => i.type === 4) let selectedVoteRowKeys = activitylist.filter(i => i.type === 4);
let selectedHomeworkRowKeys = activitylist.filter(i => i.type === 5) let selectedHomeworkRowKeys = activitylist.filter(i => i.type === 5);
let selectedCertificateRowKeys = activitylist.filter(i => i.type === 6) let selectedCertificateRowKeys = activitylist.filter(i => i.type === 6);
let SelectCaseactiveRowKeys = activitylist.filter(i => i.type === 11) let SelectCaseactiveRowKeys = activitylist.filter(i => i.type === 11);
let SelectcaseRowKeys = activitylist.filter(i => i.type === 12) let SelectcaseRowKeys = activitylist.filter(i => i.type === 12);
let DataBaseRowKeys = activitylist.filter(i => i.type === 13) let DataBaseRowKeys = activitylist.filter(i => i.type === 13);
let postingsRowKeys = activitylist.filter(i => i.type === 14) let postingsRowKeys = activitylist.filter(i => i.type === 14);
this.setState({ this.setState({
selectedCourseRowKeys, selectedCourseRowKeys,
selectedUnderLineRowKeys, selectedUnderLineRowKeys,
...@@ -111,7 +111,7 @@ class addplan extends React.Component { ...@@ -111,7 +111,7 @@ class addplan extends React.Component {
.concat(Array.from(new Set(this.state.SelectCaseactiveRowKeys))) .concat(Array.from(new Set(this.state.SelectCaseactiveRowKeys)))
.concat(Array.from(new Set(this.state.SelectcaseRowKeys))) .concat(Array.from(new Set(this.state.SelectcaseRowKeys)))
.concat(Array.from(new Set(this.state.DataBaseRowKeys))) .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 // .concat(this.props.activitylist); // bug-12744-czd
activitylist = activitylist activitylist = activitylist
.filter(i => i.type !== 7) .filter(i => i.type !== 7)
...@@ -175,7 +175,7 @@ class addplan extends React.Component { ...@@ -175,7 +175,7 @@ class addplan extends React.Component {
// 课程活动选中保存 、作品、原创活动、资料 // 课程活动选中保存 、作品、原创活动、资料
selectedCourseRowKeys(selectedRowKeys, selectedRows, flag) { selectedCourseRowKeys(selectedRowKeys, selectedRows, flag) {
debugger // debugger
const arr = []; const arr = [];
const selset = []; const selset = [];
if (this.state.selectedCourseRowKeys.length !== 0) { if (this.state.selectedCourseRowKeys.length !== 0) {
...@@ -203,7 +203,7 @@ class addplan extends React.Component { ...@@ -203,7 +203,7 @@ class addplan extends React.Component {
} }
// selectedRows[] // selectedRows[]
} }
debugger // debugger
if (flag === "Caseactive") { if (flag === "Caseactive") {
// 作品 // 作品
this.setState({ this.setState({
......
src/pages/TrainingTools/ForumManagement/PostingsManagement/NewPostings.jsx
...@@ -90,7 +90,7 @@ class NewPostings extends Component { ...@@ -90,7 +90,7 @@ class NewPostings extends Component {
pageNo: 1, pageNo: 1,
pageSize: 50, pageSize: 50,
}; };
this.props.getPostingsManagerClassifyList(requestClassifyParams, function ( this.props.getPostingsManagerClassifyList(requestClassifyParams, function(
classifyList classifyList
) { ) {
console.log("didM-classifyList", classifyList); console.log("didM-classifyList", classifyList);
...@@ -185,11 +185,7 @@ class NewPostings extends Component { ...@@ -185,11 +185,7 @@ class NewPostings extends Component {
id: file.id, id: file.id,
fileName: file.name, fileName: file.name,
ossUrl: ossUrl:
uploadParam.host + uploadParam.host + "/" + uploadParam.dir + "/" + file.fileName,
"/" +
uploadParam.dir +
"/" +
file.fileName,
size: file.size, size: file.size,
percent: 0, percent: 0,
suffix: "." + file.name.split(".")[fileLength - 1], suffix: "." + file.name.split(".")[fileLength - 1],
...@@ -213,11 +209,7 @@ class NewPostings extends Component { ...@@ -213,11 +209,7 @@ class NewPostings extends Component {
this.setState( this.setState(
{ {
caseCoverImage: caseCoverImage:
uploadParam.host + uploadParam.host + "/" + uploadParam.dir + "/" + file.target_name,
"/" +
uploadParam.dir +
"/" +
file.target_name,
}, },
() => { () => {
_this.props.form.setFieldsValue({ _this.props.form.setFieldsValue({
...@@ -227,7 +219,6 @@ class NewPostings extends Component { ...@@ -227,7 +219,6 @@ class NewPostings extends Component {
); );
break; break;
case "content": case "content":
this.setState( this.setState(
{ {
contentFile: { contentFile: {
...@@ -248,7 +239,6 @@ class NewPostings extends Component { ...@@ -248,7 +239,6 @@ class NewPostings extends Component {
); );
break; break;
case "attachment": case "attachment":
let sameArr = attachmentFiles.filter(item => { let sameArr = attachmentFiles.filter(item => {
return item.id == file.id; return item.id == file.id;
}); });
...@@ -294,8 +284,7 @@ class NewPostings extends Component { ...@@ -294,8 +284,7 @@ class NewPostings extends Component {
); );
} }
} }
} };
attachmentProgress(file) { attachmentProgress(file) {
let { attachmentFiles } = this.state; let { attachmentFiles } = this.state;
...@@ -573,7 +562,7 @@ class NewPostings extends Component { ...@@ -573,7 +562,7 @@ class NewPostings extends Component {
} }
savePostings = type => { savePostings = type => {
debugger // debugger
const _this = this; const _this = this;
const { const {
title, title,
...@@ -664,7 +653,6 @@ class NewPostings extends Component { ...@@ -664,7 +653,6 @@ class NewPostings extends Component {
//保存或者提交 type==0保存草稿，type==1提交 //保存或者提交 type==0保存草稿，type==1提交
this.props.saveNewPostings(saveParams, data => { this.props.saveNewPostings(saveParams, data => {
if (data) { if (data) {
// 跳转至列表 // 跳转至列表
// this.props.history.push( // this.props.history.push(
// "/" + companyCode + "/" + siteCode + "/index/tool/lecturer/create" // "/" + companyCode + "/" + siteCode + "/index/tool/lecturer/create"
...@@ -746,23 +734,27 @@ class NewPostings extends Component { ...@@ -746,23 +734,27 @@ class NewPostings extends Component {
<div className={styles.divider} /> <div className={styles.divider} />
<div className={styles.newPostingsBody}> <div className={styles.newPostingsBody}>
<Form className={styles.title}> <Form className={styles.title}>
<FormItem style={{ display: "flex" }} label="帖子标题：">{ <FormItem style={{ display: "flex" }} label="帖子标题：">
getFieldDecorator("title", { {getFieldDecorator("title", {
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入帖子名称" message: "请输入帖子名称",
}, { },
{
max: 100, max: 100,
message: "最多可输入100个字" message: "最多可输入100个字",
} },
] ],
})(<Input })(
placeholder="请输入帖子标题（100字以内）" <Input
style={{ width: "300px",marginLeft:"20px" }} onChange={e => { placeholder="请输入帖子标题（100字以内）"
style={{ width: "300px", marginLeft: "20px" }}
onChange={e => {
this.handleChange(e, "title"); this.handleChange(e, "title");
}}/>) }}
} />
)}
</FormItem> </FormItem>
</Form> </Form>
{/* <div className={styles.title}> {/* <div className={styles.title}>
...@@ -864,10 +856,15 @@ class NewPostings extends Component { ...@@ -864,10 +856,15 @@ class NewPostings extends Component {
deleteFile={id => this.preDeleteByType("", "attachment", id)} deleteFile={id => this.preDeleteByType("", "attachment", id)}
/> />
{this.state.attachmentFiles.length < 9 ? ( {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)}
/>
) : ( ) : (
"" ""
)} )}
</div> </div>
</div> </div>
<div className={styles.relativeActivities}> <div className={styles.relativeActivities}>
...@@ -876,7 +873,8 @@ class NewPostings extends Component { ...@@ -876,7 +873,8 @@ class NewPostings extends Component {
关联平台活动： 关联平台活动：
</div> </div>
<div className={styles.relativeActivitiesValue}> <div className={styles.relativeActivitiesValue}>
<Button type="primary" <Button
type="primary"
className={styles.targetPlatformActivities} className={styles.targetPlatformActivities}
style={ style={
this.state.relativeActivitiesData.length == 5 this.state.relativeActivitiesData.length == 5
...@@ -942,7 +940,8 @@ class NewPostings extends Component { ...@@ -942,7 +940,8 @@ class NewPostings extends Component {
> >
存草稿 存草稿
</Button> </Button>
<Button type="primary" <Button
type="primary"
className={styles.publishingNewPostings} className={styles.publishingNewPostings}
onClick={() => { onClick={() => {
this.savePostings(2); this.savePostings(2);
...@@ -969,13 +968,13 @@ class NewPostings extends Component { ...@@ -969,13 +968,13 @@ class NewPostings extends Component {
alt="" alt=""
/> />
) : ( ) : (
<img <img
src={require("../images/promotIcon.png")} src={require("../images/promotIcon.png")}
className={styles.canceCollection} className={styles.canceCollection}
style={{ width: 48, height: 48, marginRight: 16 }} style={{ width: 48, height: 48, marginRight: 16 }}
alt="" alt=""
/> />
)} )}
{this.state.caseRemindKey || "你确定删除该文档吗？"} {this.state.caseRemindKey || "你确定删除该文档吗？"}
{this.state.caseRemindType == "submit" ? ( {this.state.caseRemindType == "submit" ? (
...@@ -988,21 +987,21 @@ class NewPostings extends Component { ...@@ -988,21 +987,21 @@ class NewPostings extends Component {
</div> </div>
</div> </div>
) : ( ) : (
<div className={styles.remind_btn_container}> <div className={styles.remind_btn_container}>
<div <div
className={styles.remind_btn_confirm} className={styles.remind_btn_confirm}
onClick={this.remindConfirmDelete} onClick={this.remindConfirmDelete}
> >
{"确定"} {"确定"}
</div>
<div
className={styles.remind_btn_cancel}
onClick={this.closeCaseRemind}
>
{"取消"}
</div>
</div> </div>
)} <div
className={styles.remind_btn_cancel}
onClick={this.closeCaseRemind}
>
{"取消"}
</div>
</div>
)}
</div> </div>
</Modal> </Modal>
<Modal <Modal
...@@ -1023,8 +1022,8 @@ class NewPostings extends Component { ...@@ -1023,8 +1022,8 @@ class NewPostings extends Component {
// tpPlanId={this.props.tpPlanId} // tpPlanId={this.props.tpPlanId}
activityListSave={this.activityListSave} activityListSave={this.activityListSave}
activitylist={this.state.relativeActivitiesData} activitylist={this.state.relativeActivitiesData}
// onAcDelete={this.props.onAcDelete} // onAcDelete={this.props.onAcDelete}
// getList={this.getList} // getList={this.getList}
/> />
</Modal> </Modal>
<Modal <Modal
...@@ -1052,7 +1051,6 @@ class NewPostings extends Component { ...@@ -1052,7 +1051,6 @@ class NewPostings extends Component {
} }
} }
function mapStateToProps(state, ownProps) { function mapStateToProps(state, ownProps) {
return { return {
uploadParam: state.uploadParam.param, uploadParam: state.uploadParam.param,
......
src/pages/TrainingTools/exam/examCheck/check/index.jsx
...@@ -211,7 +211,6 @@ class Check extends Component { ...@@ -211,7 +211,6 @@ class Check extends Component {
} }
submitScore(type) { submitScore(type) {
const { info } = this.props; const { info } = this.props;
let _this = this; let _this = this;
let falsetrue = this.state.scoreData.filter(item => let falsetrue = this.state.scoreData.filter(item =>
...@@ -240,7 +239,7 @@ class Check extends Component { ...@@ -240,7 +239,7 @@ class Check extends Component {
searchPaper() { searchPaper() {
const { getPaperList } = this.props; 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 reg1 = /[#\$%\^&\*{}|\\]+/g.test(username);
let reg2 = /[#\$%\^&\*{}|\\]+/g.test(name); let reg2 = /[#\$%\^&\*{}|\\]+/g.test(name);
let reg3 = /[#\$%\^&\*{}|\\]+/g.test(depart); let reg3 = /[#\$%\^&\*{}|\\]+/g.test(depart);
...@@ -305,7 +304,7 @@ class Check extends Component { ...@@ -305,7 +304,7 @@ class Check extends Component {
id: text.readOverId, id: text.readOverId,
}, },
() => { () => {
debugger // debugger
var json = { var json = {
examName: _this.props.info.examName, examName: _this.props.info.examName,
name: _this.props.info.name, name: _this.props.info.name,
...@@ -314,8 +313,8 @@ class Check extends Component { ...@@ -314,8 +313,8 @@ class Check extends Component {
impersonality: String(_this.props.info.objectiveScore), impersonality: String(_this.props.info.objectiveScore),
sum: String(_this.props.info.sumScore), sum: String(_this.props.info.sumScore),
isQualified: _this.props.info.isQualified, 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.props.info.subjectiveScore + _this.props.info.objectiveScore,
}; };
_this.setState({ _this.setState({
paperVisible: true, paperVisible: true,
...@@ -350,11 +349,10 @@ class Check extends Component { ...@@ -350,11 +349,10 @@ class Check extends Component {
pageindex: page, pageindex: page,
pagesize: pagesize, pagesize: pagesize,
}); });
this.setState({ this.setState({
paperPagesize: pagesize, paperPagesize: pagesize,
paperNum: page, paperNum: page,
}); });
}; };
render() { render() {
...@@ -362,31 +360,29 @@ class Check extends Component { ...@@ -362,31 +360,29 @@ class Check extends Component {
var paperPagination = func.paginationConfig(this.paperPageChange); var paperPagination = func.paginationConfig(this.paperPageChange);
var paperListData = []; var paperListData = [];
// if (paperList.length > 0) { //bug-12795-liyuan // if (paperList.length > 0) { //bug-12795-liyuan
paperPagination.total = paperTotal; paperPagination.total = paperTotal;
paperPagination.showTotal = paperTotal => `总共：${paperTotal} 条`; paperPagination.showTotal = paperTotal => `总共：${paperTotal} 条`;
for (let i = 0; i < paperList.length; i++) { for (let i = 0; i < paperList.length; i++) {
paperListData.push({ paperListData.push({
key: i, key: i,
username: paperList[i].username, username: paperList[i].username,
name: paperList[i].name, name: paperList[i].name,
department: paperList[i].depart, department: paperList[i].depart,
status: paperList[i].state, status: paperList[i].state,
sum: paperList[i].sumScore, sum: paperList[i].sumScore,
impersonality: paperList[i].objectiveScore, impersonality: paperList[i].objectiveScore,
subjectivity: subjectivity:
paperList[i].subjectiveScore >= 0 paperList[i].subjectiveScore >= 0 ? paperList[i].subjectiveScore : "",
? paperList[i].subjectiveScore action: paperList[i],
: "", });
action: paperList[i], }
});
}
// } // }
const gridStyle = { const gridStyle = {
width: "20%", width: "20%",
textAlign: "center", textAlign: "center",
}; };
console.log(this.state.paperDetail.impersonality ) console.log(this.state.paperDetail.impersonality);
return ( return (
<div className={styles.list} style={{ padding: "20px" }}> <div className={styles.list} style={{ padding: "20px" }}>
<div> <div>
...@@ -446,9 +442,7 @@ class Check extends Component { ...@@ -446,9 +442,7 @@ class Check extends Component {
{this.state.paperDetail.impersonality} {this.state.paperDetail.impersonality}
</Grid> </Grid>
<Grid style={gridStyle}>{this.state.paperDetail.subjectivity}</Grid> <Grid style={gridStyle}>{this.state.paperDetail.subjectivity}</Grid>
<Grid style={gridStyle}> <Grid style={gridStyle}>{this.state.paperDetail.finalScoring}</Grid>
{this.state.paperDetail.finalScoring}
</Grid>
<Grid style={gridStyle}> <Grid style={gridStyle}>
{this.state.paperDetail.isQualified == 1 ? "合格" : "不合格"} {this.state.paperDetail.isQualified == 1 ? "合格" : "不合格"}
</Grid> </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