Commit 271d8022 by chengming

修改bug

parent d7dc48cd
...@@ -378,7 +378,7 @@ class homePage extends Component { ...@@ -378,7 +378,7 @@ class homePage extends Component {
xAxis: [ xAxis: [
{ {
type: "category", type: "category",
data: ["培训总数", "参加人数"], data: ["测试总数", "参加人数"],
boundaryGap: ["0%", "0%"], boundaryGap: ["0%", "0%"],
axisLine: { axisLine: {
show: false, // 确保显示 Y 轴线 show: false, // 确保显示 Y 轴线
......
...@@ -352,7 +352,6 @@ class addEdit extends React.Component { ...@@ -352,7 +352,6 @@ class addEdit extends React.Component {
disabled={type != "edit" ? true : false} disabled={type != "edit" ? true : false}
options={residences} options={residences}
onChange={this.loadData} onChange={this.loadData}
// disabled={type == "look" ? !false : false}
changeOnSelect={true} changeOnSelect={true}
placeholder="请选择" placeholder="请选择"
/> />
......
...@@ -331,6 +331,10 @@ class Atricle extends React.Component { ...@@ -331,6 +331,10 @@ class Atricle extends React.Component {
if (err) { if (err) {
return; return;
} }
if (!values.type[1]) {
console.log(values,'111111111111111');
return message.error("请完整选择所属栏位");
}
const jsonEdit = { const jsonEdit = {
id, id,
logoPath: values.logoPath, logoPath: values.logoPath,
......
...@@ -18,8 +18,11 @@ function article(state = initialState, action) { ...@@ -18,8 +18,11 @@ function article(state = initialState, action) {
switch (action.type) { switch (action.type) {
//获取资讯分类 //获取资讯分类
case "IFICATIONLIST": case "IFICATIONLIST":
const filteredData = action.data ? action.data.filter(item =>
item.name === "机电视窗" || item.name === "支部风采"
) : null;
return Object.assign({}, state, { return Object.assign({}, state, {
ificationList: action.data, ificationList: filteredData,
}); });
//获取Table List //获取Table List
case "TABLELIST": case "TABLELIST":
......
...@@ -718,6 +718,10 @@ class Information extends React.Component { ...@@ -718,6 +718,10 @@ class Information extends React.Component {
message.warning("新闻类文章必须上传logo"); message.warning("新闻类文章必须上传logo");
return; return;
} }
if (!values.type[1] ) {
message.warning("所属栏位子级未选择");
return;
}
this.props.postUpdata(jsonEdit, () => { this.props.postUpdata(jsonEdit, () => {
// reset // reset
this.props.nullSeeEdit(); this.props.nullSeeEdit();
...@@ -759,6 +763,10 @@ class Information extends React.Component { ...@@ -759,6 +763,10 @@ class Information extends React.Component {
message.warning("新闻类文章必须上传logo"); message.warning("新闻类文章必须上传logo");
return; return;
} }
if (!values.type[1] ) {
message.warning("所属栏位子级未选择");
return;
}
this.props.postInsert(json, () => { this.props.postInsert(json, () => {
// reset // reset
this.props.nullSeeEdit(); this.props.nullSeeEdit();
......
...@@ -18,8 +18,11 @@ function information(state = initialState, action) { ...@@ -18,8 +18,11 @@ function information(state = initialState, action) {
switch (action.type) { switch (action.type) {
//获取资讯分类 //获取资讯分类
case "IFICATIONLIST": case "IFICATIONLIST":
const filteredData = action.data ? action.data.filter(item =>
item.name !== "国学经典" && item.name !== "心理讲堂"
) : null;
return Object.assign({}, state, { return Object.assign({}, state, {
ificationList: action.data, ificationList: filteredData,
}); });
//获取Table List //获取Table List
case "TABLELIST": case "TABLELIST":
......
...@@ -119,7 +119,7 @@ class UploadUtil extends Component { ...@@ -119,7 +119,7 @@ class UploadUtil extends Component {
extra={ extra={
this.props.extra === "markeCardExtra" this.props.extra === "markeCardExtra"
? "请上传资源附件(附件格式:mp4、png、jpg、jpeg、gif、mp3、word、pdf)" ? "请上传资源附件(附件格式:mp4、png、jpg、jpeg、gif、mp3、word、pdf)"
: "请上传资源附件(附件格式:png、jpg、jpeg、gif、word、pdf、xls、xlsx)" : "请上传资源附件(附件格式:doc、docx、pdf、xls、xlsx)"
} }
> >
{getFieldDecorator("upload", { {getFieldDecorator("upload", {
......
...@@ -372,7 +372,7 @@ class Base extends Component { ...@@ -372,7 +372,7 @@ class Base extends Component {
style={{ display: "inline-block" }} style={{ display: "inline-block" }}
/> />
)} )}
{this.props.iscopy == true ? null : ( {/* {this.props.iscopy == true ? null : (
<Button <Button
type="primary" type="primary"
onClick={this.showModal} onClick={this.showModal}
...@@ -381,7 +381,7 @@ class Base extends Component { ...@@ -381,7 +381,7 @@ class Base extends Component {
> >
复制投票 复制投票
</Button> </Button>
)} )} */}
</FormItem> </FormItem>
<FormItem {...formItemLayout} label="业务类型:"> <FormItem {...formItemLayout} label="业务类型:">
{getFieldDecorator("bizType", { {getFieldDecorator("bizType", {
......
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