deartibers 2 years ago
parent
commit
a5d4fc1c67
  1. 2
      web/client/src/sections/install/components/adminModal.jsx
  2. 3
      web/client/src/sections/install/components/memberModal.jsx
  3. 2
      web/client/src/sections/install/containers/system.jsx
  4. 2
      web/client/src/sections/service/containers/emPush.jsx

2
web/client/src/sections/install/components/adminModal.jsx

@ -117,6 +117,7 @@ function adminModal (props) {
style={{ width: 417 }} style={{ width: 417 }}
rules={[{ required: true, message: "请选择部门" }]} rules={[{ required: true, message: "请选择部门" }]}
initValue={departmentId || ""} initValue={departmentId || ""}
filter
showClear showClear
> >
{ {
@ -139,6 +140,7 @@ function adminModal (props) {
rules={[{ required: true, message: "请选择人员" }]} rules={[{ required: true, message: "请选择人员" }]}
initValue={peopleId || ""} initValue={peopleId || ""}
showClear showClear
filter
disabled={disablePeople} disabled={disablePeople}
> >
{ {

3
web/client/src/sections/install/components/memberModal.jsx

@ -139,6 +139,7 @@ function memberModal (props) {
style={{ width: 417 }} style={{ width: 417 }}
rules={[{ required: true, message: "请选择部门" }]} rules={[{ required: true, message: "请选择部门" }]}
showClear showClear
filter
initValue={departmentId || ""} initValue={departmentId || ""}
disabled={memberEdit} disabled={memberEdit}
> >
@ -157,6 +158,7 @@ function memberModal (props) {
<Form.Select <Form.Select
label="选择人员:" label="选择人员:"
field="pepUserId" field="pepUserId"
filter
placeholder="请选择人员" placeholder="请选择人员"
style={{ width: 417 }} style={{ width: 417 }}
rules={[{ required: true, message: "请选择人员" }]} rules={[{ required: true, message: "请选择人员" }]}
@ -208,6 +210,7 @@ function memberModal (props) {
placeholder="请选择关联项目" placeholder="请选择关联项目"
initValue={anxincloudArr} initValue={anxincloudArr}
style={{ width: 417 }} style={{ width: 417 }}
filter
showClear showClear
> >
{ {

2
web/client/src/sections/install/containers/system.jsx

@ -56,7 +56,7 @@ const Example = (props) => {
dispatch(install.getProjectAppList(query)).then((res) => {// dispatch(install.getProjectAppList(query)).then((res) => {//
setAppList(res.payload.data) setAppList(res.payload.data)
}) })
console.log('user',user);
}, []) }, [])
useEffect(() => { useEffect(() => {
getProjectPomsList(); getProjectPomsList();

2
web/client/src/sections/service/containers/emPush.jsx

@ -513,7 +513,7 @@ const EmPush = (props) => {
dataIndex: "pushCount", dataIndex: "pushCount",
key: "pushCount", key: "pushCount",
render: (_, r, index) => { render: (_, r, index) => {
return r.pushCount + '次' return (r.pushCount||0) + '次'
}, },
}, },
]; ];

Loading…
Cancel
Save