Browse Source

滚动条提交

master
xingyongchun 2 years ago
parent
commit
72e8039470
  1. 8
      web/client/src/sections/article/actions/index.js
  2. 20
      web/client/src/sections/homePage/containers/configure.js
  3. 7
      web/client/src/sections/personnel/actions/index.js
  4. 6
      web/client/src/sections/personnel/containers/index.js
  5. 7
      web/client/src/sections/wait/actions/index.js
  6. 3
      web/client/src/sections/wait/components/modeal.js

8
web/client/src/sections/article/actions/index.js

@ -1,9 +1,7 @@
"use strict"; "use strict";
import { addArticle, editArticle, getDataList, delDataList } from "./article"; import { } from "./article";
export default { export default {
addArticle,
editArticle,
getDataList,
delDataList,
}; };

20
web/client/src/sections/homePage/containers/configure.js

@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { Table, Button } from "antd"; import { Table, Button } from "antd";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { getDataList } from "../actions/profile"; // import { getDataList } from "../actions/profile";
let BG = "/assets/images/pagebg.png"; let BG = "/assets/images/pagebg.png";
let BARBG = "../../../../assets/images/barbg.png"; let BARBG = "../../../../assets/images/barbg.png";
import { push } from "react-router-redux"; import { push } from "react-router-redux";
@ -14,23 +14,7 @@ function More(props) {
const [pagesize, setPagesize] = useState(); //当前页码 const [pagesize, setPagesize] = useState(); //当前页码
useEffect(() => { useEffect(() => {
dispatch(
getDataList({
type: props.location.state.type,
page: pagesize,
limit: 10,
status: 1,
})
).then((res) => {
res.payload ? setDatas(res.payload.data.data) : "";
if (res.payload) {
setAddress(res.payload.data.data[0].type);
setLimit(res.payload.data.total);
return;
} else {
return "工会地址";
}
});
}, []); }, []);
const columns = [ const columns = [
{ {

7
web/client/src/sections/personnel/actions/index.js

@ -1,9 +1,6 @@
"use strict"; "use strict";
import { addArticle, editArticle, getDataList, delDataList } from "./article"; import { } from "./article";
export default { export default {
addArticle,
editArticle,
getDataList,
delDataList,
}; };

6
web/client/src/sections/personnel/containers/index.js

@ -46,7 +46,7 @@ export const Default = (props) => {
dataIndex: "md", dataIndex: "md",
hideInSearch: true, hideInSearch: true,
render: (dom, record) => { render: (dom, record) => {
return record.md; return <div>{record.md || ""}</div>;
}, },
}, },
{ {
@ -55,7 +55,7 @@ export const Default = (props) => {
dataIndex: "td", dataIndex: "td",
hideInSearch: true, hideInSearch: true,
render: (dom, record) => { render: (dom, record) => {
return record.td; return <div>{record.td || ""}</div>;
}, },
}, },
{ {
@ -100,7 +100,7 @@ export const Default = (props) => {
dataIndex: "ssd", dataIndex: "ssd",
hideInSearch: true, hideInSearch: true,
render: (dom, record) => { render: (dom, record) => {
return record.ssd; return <div>{record.ssd==undefined?'' :record.ssd}</div>;
}, },
}, },
{ {

7
web/client/src/sections/wait/actions/index.js

@ -1,9 +1,6 @@
"use strict"; "use strict";
import { addArticle, editArticle, getDataList, delDataList } from "./article"; import {} from "./article";
export default { export default {
addArticle,
editArticle,
getDataList,
delDataList,
}; };

3
web/client/src/sections/wait/components/modeal.js

@ -11,7 +11,8 @@ function modeal(props) {
name_project: editData.name_project, name_project: editData.name_project,
from_project: editData.from_project, from_project: editData.from_project,
contacts: editData.contacts, contacts: editData.contacts,
progress:editData.progress progress: editData.progress,
consum_time:editData.consum_time
}) })
setState(true) setState(true)
} }

Loading…
Cancel
Save