Skip to content

E
ems3.3
Commit 911a41cd authored by TZW's avatar TZW
Browse files
Options

Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

parents 729e1d5e a2b28a59
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 74 deletions
.gitignore
View file @ 911a41cd
......@@ -8,6 +8,7 @@ _roadhog-api-doc
# production
/dist
/static
# misc
.DS_Store
......
src/components/InitForm/EditTable/index.jsx
View file @ 911a41cd
......@@ -164,6 +164,7 @@ const EditTable = (props) => {
}}
search={{
filterType: 'light', //轻量模式
placement: 'bottomLeft'
}}
/>
);
......
src/pages/check/plan/columns.js
View file @ 911a41cd
......@@ -248,6 +248,7 @@ function getcolumns(setdrawer) {
path: '/asset/equipment/list/user/shop',
columns,
hideInDescriptions: true,
rowName: "equipmentNo"
},
],
pathconfig: {
......
src/pages/check/task/columns.js
View file @ 911a41cd
......@@ -219,6 +219,7 @@ function getcolumns(setdrawer) {
dataIndex: 'checkStartTime',
key: 'checkStartTime',
hideInForm: true,
hideInSearch: true,
},
{
title: '点检人员',
......@@ -232,8 +233,9 @@ function getcolumns(setdrawer) {
params: {},
},
fieldProps: {
dropdownMatchSelectWidth: 100
}
placeholder: '请选择',
showSearch: true,
},
},
{
title: '状态',
......@@ -370,6 +372,7 @@ function getcolumns(setdrawer) {
dataIndex: 'checkStartTime',
key: 'checkStartTime',
hideInForm: true,
hideInSearch: true,
},
{
title: '关单时间',
......@@ -392,8 +395,9 @@ function getcolumns(setdrawer) {
params: {},
},
fieldProps: {
dropdownMatchSelectWidth: 100
}
placeholder: '请选择',
showSearch: true,
},
},
{
title: '状态',
......
src/pages/check/task/index.jsx
View file @ 911a41cd
......@@ -461,6 +461,9 @@ function Task(props) {
dataIndex: 'result',
key: 'result',
hideInForm: true,
render: (text, row, _, action) => {
return <span>{row.judgeType == 1 ? row.result == 1 ? "正常" : "异常" : row.result}</span>
}
},
{
title: '下限值',
......
src/pages/maintain/plan/index.jsx
View file @ 911a41cd
......@@ -21,8 +21,8 @@ function Plan(props) {
const actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading, runAsync } = useRequest(doFetch, {
......@@ -460,43 +460,32 @@ function Plan(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1
? defcolumn.concat([
{
title: '启用/停用',
dataIndex: 'isStopStatus',
key: 'isStopStatus',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.isStopStatus == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.isStopStatus == 1) {
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { id: row.id, isStopFlag: 2 },
});
}
}}
okText="确定"
cancelText="取消"
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
{
title: '启用/停用',
dataIndex: 'isStopStatus',
key: 'isStopStatus',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.isStopStatus == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.isStopStatus == 1) {
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { id: row.id, isStopFlag: 2 },
});
}
>
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
/>
</Popconfirm>
) : (
}}
okText="确定"
cancelText="取消"
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
>
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
......@@ -505,36 +494,47 @@ function Plan(props) {
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
onChange={(checked) => {
if (checked) {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '调整日期',
val: 'detailaddon',
id: row?.id,
from: 'tq',
}));
}
}}
/>
);
},
hideInDescriptions: true,
},
{
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2)) &&
editDate(text, row, _, action),
row.maintainStatus == 2 && close(text, row, _, action),
defpath?.enabledelete && row.maintainStatus == 1 && remove(text, row, _, action),
],
</Popconfirm>
) : (
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
onChange={(checked) => {
if (checked) {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '调整日期',
val: 'detailaddon',
id: row?.id,
from: 'tq',
}));
}
}}
/>
);
},
])
hideInDescriptions: true,
},
{
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2)) &&
editDate(text, row, _, action),
row.maintainStatus == 2 && close(text, row, _, action),
defpath?.enabledelete && row.maintainStatus == 1 && remove(text, row, _, action),
],
},
])
: defcolumn;
}, [activeTabKey]);
......@@ -579,8 +579,8 @@ function Plan(props) {
drawer?.val == 'detailaddon'
? editDateColumns
: drawer?.val == 'detail'
? detailsColumns
: columns
? detailsColumns
: columns
}
detailpath={pathconfig?.detail || null}
// detailData={drawer?.item}
......@@ -596,7 +596,6 @@ function Plan(props) {
}}
{...drawer}
onFinish={async (vals) => {
console.log(vals);
let params = JSON.parse(JSON.stringify(vals));
params.equipmentList = vals?.paramList?.map((it) => {
return {
......@@ -610,7 +609,6 @@ function Plan(props) {
message.warning('下次保养日期必填！');
return;
}
console.log(params);
if (drawer?.val == 'add') {
await runAsync({ url: pathconfig?.add || '/add', params: { ...params } });
} else if (drawer?.val == 'edit') {
......
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