Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ems3.3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wuhao
ems3.3
Commits
cb540380
Commit
cb540380
authored
Jan 19, 2023
by
TZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除 log
parent
fee786c5
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
32 deletions
+14
-32
mtable.jsx
src/components/AutoTable/mtable.jsx
+0
-1
index.jsx
src/components/DetailNode/index.jsx
+0
-3
index.jsx
src/components/InitForm/Diyrule/index.jsx
+0
-1
FormItems.jsx
src/components/InitForm/FormItems.jsx
+0
-1
AvatarDropdown.jsx
src/components/RightContent/AvatarDropdown.jsx
+3
-3
index.jsx
src/pages/device/account/index.jsx
+1
-2
index.jsx
src/pages/maintain/plan/index.jsx
+8
-7
index.jsx
src/pages/maintain/workOrder/index.jsx
+0
-2
RepairOrderHandle.jsx
src/pages/repair/platform/RepairOrderHandle.jsx
+1
-4
index.jsx
src/pages/system/field/index.jsx
+0
-3
index.jsx
src/pages/system/rules/index.jsx
+1
-5
No files found.
src/components/AutoTable/mtable.jsx
View file @
cb540380
...
@@ -43,7 +43,6 @@ const Mtable = (props) => {
...
@@ -43,7 +43,6 @@ const Mtable = (props) => {
resizeable
=
false
,
resizeable
=
false
,
dataSource
,
dataSource
,
}
=
props
;
}
=
props
;
console
.
log
(
dataSource
);
const
actionRefs
=
actionRef
??
useRef
(),
const
actionRefs
=
actionRef
??
useRef
(),
formRefs
=
formRef
??
useRef
(),
formRefs
=
formRef
??
useRef
(),
ifspagination
=
pagination
==
'false'
||
pagination
===
false
,
ifspagination
=
pagination
==
'false'
||
pagination
===
false
,
...
...
src/components/DetailNode/index.jsx
View file @
cb540380
...
@@ -8,7 +8,6 @@ import DetailNode from './detailnode';
...
@@ -8,7 +8,6 @@ import DetailNode from './detailnode';
import
AutoTable
from
'../AutoTable/mtable'
;
import
AutoTable
from
'../AutoTable/mtable'
;
const
Detail
=
(
props
)
=>
{
const
Detail
=
(
props
)
=>
{
console
.
log
(
props
);
const
{
path
,
params
,
titleColumns
,
detailKey
,
columns
}
=
props
;
const
{
path
,
params
,
titleColumns
,
detailKey
,
columns
}
=
props
;
let
[
firstcolumns
,
...
mescolumns
]
=
titleColumns
;
let
[
firstcolumns
,
...
mescolumns
]
=
titleColumns
;
// columns?.forEach((it) => {
// columns?.forEach((it) => {
...
@@ -23,7 +22,6 @@ const Detail = (props) => {
...
@@ -23,7 +22,6 @@ const Detail = (props) => {
return
res
?.
data
?.
dataList
;
return
res
?.
data
?.
dataList
;
});
});
console
.
log
(
columns
);
return
(
return
(
<>
<>
...
@@ -34,7 +32,6 @@ const Detail = (props) => {
...
@@ -34,7 +32,6 @@ const Detail = (props) => {
<
Divider
/>
<
Divider
/>
<
div
>
<
div
>
{
detailData
?.
data
?.
map
((
it
,
index
)
=>
{
{
detailData
?.
data
?.
map
((
it
,
index
)
=>
{
console
.
log
(
it
);
const
detailColumns
=
[],
const
detailColumns
=
[],
tableColumns
=
[];
tableColumns
=
[];
columns
[
it
?.
operationType
]?.
forEach
((
it
)
=>
{
columns
[
it
?.
operationType
]?.
forEach
((
it
)
=>
{
...
...
src/components/InitForm/Diyrule/index.jsx
View file @
cb540380
...
@@ -34,7 +34,6 @@ let Diyrule = (props) => {
...
@@ -34,7 +34,6 @@ let Diyrule = (props) => {
useEffect
(()
=>
{
useEffect
(()
=>
{
onChange
(
defval
);
onChange
(
defval
);
});
});
console
.
log
(
'other.sort :'
,
other
?.
sort
);
let
{
data
,
loading
}
=
useRequest
(()
=>
{
let
{
data
,
loading
}
=
useRequest
(()
=>
{
return
doFetch
({
url
:
'/base/bmNoRule/querySelect'
,
params
:
{}
});
return
doFetch
({
url
:
'/base/bmNoRule/querySelect'
,
params
:
{}
});
});
});
...
...
src/components/InitForm/FormItems.jsx
View file @
cb540380
...
@@ -904,7 +904,6 @@ function LinkRadio({ item, colProps, formRef, name, curindex }) {
...
@@ -904,7 +904,6 @@ function LinkRadio({ item, colProps, formRef, name, curindex }) {
let curoption = item.options ?? null,
let curoption = item.options ?? null,
curlinkparams = curoption?.linkParams ?? {}, //获取linkParams下声明的key
curlinkparams = curoption?.linkParams ?? {}, //获取linkParams下声明的key
extraParams = curoption?.extraParams ?? {};
extraParams = curoption?.extraParams ?? {};
console.log(extraParams);
return (
return (
<>
<>
<ProFormDependency name={Object.keys(curlinkparams)}>
<ProFormDependency name={Object.keys(curlinkparams)}>
...
...
src/components/RightContent/AvatarDropdown.jsx
View file @
cb540380
...
@@ -129,9 +129,9 @@ const AvatarDropdown = ({ menu }) => {
...
@@ -129,9 +129,9 @@ const AvatarDropdown = ({ menu }) => {
if
(
!
currentUser
||
!
currentUser
.
username
)
{
if
(
!
currentUser
||
!
currentUser
.
username
)
{
return
loadings
;
return
loadings
;
}
}
console
.
log
(
//
console.log(
getUserApp
?.
data
?.
dataList
?.
filter
((
it
)
=>
it
?.
appId
==
getUserApp
?.
data
?.
appId
)[
0
]?.
value
,
//
getUserApp?.data?.dataList?.filter((it) => it?.appId == getUserApp?.data?.appId)[0]?.value,
);
//
);
let
saveData
=
(
values
)
=>
{
let
saveData
=
(
values
)
=>
{
let
newfields
=
JSON
.
parse
(
JSON
.
stringify
(
values
));
let
newfields
=
JSON
.
parse
(
JSON
.
stringify
(
values
));
...
...
src/pages/device/account/index.jsx
View file @
cb540380
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56
* @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-1
3 09:46:11
* @Last Modified time: 2023-01-1
9 09:42:58
*/
*/
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
...
@@ -709,7 +709,6 @@ function Model(props) {
...
@@ -709,7 +709,6 @@ function Model(props) {
const
[
request
,
setrequest
]
=
useState
();
const
[
request
,
setrequest
]
=
useState
();
useEffect
(()
=>
{
useEffect
(()
=>
{
const
fn
=
async
()
=>
{
const
fn
=
async
()
=>
{
console
.
log
(
'd'
);
let
res
=
await
doFetch
({
let
res
=
await
doFetch
({
url
:
'/base/paFormField/queryList'
,
url
:
'/base/paFormField/queryList'
,
...
...
src/pages/maintain/plan/index.jsx
View file @
cb540380
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2023-01-16 15:35:00
* @Date: 2023-01-16 15:35:00
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-1
8 16:36:26
* @Last Modified time: 2023-01-1
9 09:41:53
*/
*/
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
import
{
useState
,
useMemo
,
useRef
}
from
'react'
;
import
{
useState
,
useMemo
,
useRef
}
from
'react'
;
import
{
Switch
,
Popconfirm
}
from
'antd'
;
import
{
Switch
,
Popconfirm
,
message
}
from
'antd'
;
import
DrawerPro
from
'@/components/DrawerPro'
;
import
DrawerPro
from
'@/components/DrawerPro'
;
import
AutoTable
from
'@/components/AutoTable'
;
import
AutoTable
from
'@/components/AutoTable'
;
import
AutoTables
from
'@/components/AutoTable/mtable'
;
import
AutoTables
from
'@/components/AutoTable/mtable'
;
...
@@ -597,6 +597,11 @@ function Plan(props) {
...
@@ -597,6 +597,11 @@ function Plan(props) {
}
}
}
}
{
...
drawer
}
{
...
drawer
}
onFinish=
{
async
(
vals
)
=>
{
onFinish=
{
async
(
vals
)
=>
{
let
flag
=
vals
.
paramList
?.
some
((
it
)
=>
!
it
.
nextMaintainDate
);
if
(
flag
)
{
message
.
warning
(
'下次保养日期必填!'
);
return
;
}
let
params
=
JSON
.
parse
(
JSON
.
stringify
(
vals
));
let
params
=
JSON
.
parse
(
JSON
.
stringify
(
vals
));
params
.
equipmentList
=
vals
?.
paramList
?.
map
((
it
)
=>
{
params
.
equipmentList
=
vals
?.
paramList
?.
map
((
it
)
=>
{
return
{
return
{
...
@@ -605,11 +610,7 @@ function Plan(props) {
...
@@ -605,11 +610,7 @@ function Plan(props) {
};
};
});
});
delete
params
.
paramList
;
delete
params
.
paramList
;
let
flag
=
params
.
equipmentList
?.
some
((
it
)
=>
!
it
.
nextMaintainDate
);
if
(
flag
)
{
message
.
warning
(
'下次保养日期必填!'
);
return
;
}
if
(
drawer
?.
val
==
'add'
)
{
if
(
drawer
?.
val
==
'add'
)
{
await
runAsync
({
url
:
pathconfig
?.
add
||
'/add'
,
params
:
{
...
params
}
});
await
runAsync
({
url
:
pathconfig
?.
add
||
'/add'
,
params
:
{
...
params
}
});
}
else
if
(
drawer
?.
val
==
'edit'
)
{
}
else
if
(
drawer
?.
val
==
'edit'
)
{
...
...
src/pages/maintain/workOrder/index.jsx
View file @
cb540380
...
@@ -387,7 +387,6 @@ function WorkOrder(props) {
...
@@ -387,7 +387,6 @@ function WorkOrder(props) {
url
:
'/maintain/umMaintainTask/queryById'
,
url
:
'/maintain/umMaintainTask/queryById'
,
params
:
{
id
:
row
.
id
},
params
:
{
id
:
row
.
id
},
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
console
.
log
(
res
);
if
(
res
.
code
==
'0000'
)
{
if
(
res
.
code
==
'0000'
)
{
setdrawer
((
s
)
=>
({
setdrawer
((
s
)
=>
({
...
s
,
...
s
,
...
@@ -441,7 +440,6 @@ function WorkOrder(props) {
...
@@ -441,7 +440,6 @@ function WorkOrder(props) {
url
:
'/maintain/umMaintainTask/queryById'
,
url
:
'/maintain/umMaintainTask/queryById'
,
params
:
{
id
:
row
.
id
},
params
:
{
id
:
row
.
id
},
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
console
.
log
(
res
);
if
(
res
.
code
==
'0000'
)
{
if
(
res
.
code
==
'0000'
)
{
setdrawer
((
s
)
=>
({
setdrawer
((
s
)
=>
({
...
s
,
...
s
,
...
...
src/pages/repair/platform/RepairOrderHandle.jsx
View file @
cb540380
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2022-12-05 11:13:26
* @Date: 2022-12-05 11:13:26
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-1
8 17:39:50
* @Last Modified time: 2023-01-1
9 09:43:15
*/
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
@@ -94,9 +94,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
...
@@ -94,9 +94,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
}
}
},
},
wxpd
:
async
(
vals
)
=>
{
wxpd
:
async
(
vals
)
=>
{
console
.
log
(
vals
,
url
);
let
params
=
{};
let
params
=
{};
console
.
log
(
params
);
if
(
vals
.
repairAssistList
)
{
if
(
vals
.
repairAssistList
)
{
params
.
repairAssistList
=
vals
?.
repairAssistList
.
map
((
it
)
=>
{
params
.
repairAssistList
=
vals
?.
repairAssistList
.
map
((
it
)
=>
{
return
{
return
{
...
@@ -104,7 +102,6 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
...
@@ -104,7 +102,6 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
};
};
});
});
}
}
console
.
log
(
params
);
let
res
=
await
doFetch
({
let
res
=
await
doFetch
({
url
,
url
,
params
:
{
...
params
,
id
},
params
:
{
...
params
,
id
},
...
...
src/pages/system/field/index.jsx
View file @
cb540380
...
@@ -65,7 +65,6 @@ function Field(props) {
...
@@ -65,7 +65,6 @@ function Field(props) {
btn=
{
{
btn=
{
{
size
:
'small'
,
size
:
'small'
,
onClick
:
()
=>
{
onClick
:
()
=>
{
console
.
log
(
drawer
);
setDrawer
((
s
)
=>
({
setDrawer
((
s
)
=>
({
...
s
,
...
s
,
visible
:
true
,
visible
:
true
,
...
@@ -81,14 +80,12 @@ function Field(props) {
...
@@ -81,14 +80,12 @@ function Field(props) {
// detailpath: urlParams.detail,
// detailpath: urlParams.detail,
// params:
{
id
:
row
.
id
},
// params:
{
id
:
row
.
id
},
onFinish
:
async
(
vals
)
=>
{
onFinish
:
async
(
vals
)
=>
{
console
.
log
(
vals
);
let
params
=
{
let
params
=
{
...
vals
,
...
vals
,
id
:
row
?.
id
,
id
:
row
?.
id
,
formId
:
drawer
?.
formId
,
formId
:
drawer
?.
formId
,
};
};
delete
params
.
formName
;
delete
params
.
formName
;
console
.
log
(
params
);
let
res
=
await
doFetch
({
let
res
=
await
doFetch
({
url
:
urlParams
.
save
,
url
:
urlParams
.
save
,
params
,
params
,
...
...
src/pages/system/rules/index.jsx
View file @
cb540380
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44
* @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-1
7 09:30:00
* @Last Modified time: 2023-01-1
9 09:43:42
*/
*/
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
...
@@ -66,7 +66,6 @@ function Rules(props) {
...
@@ -66,7 +66,6 @@ function Rules(props) {
title
:
'编辑'
,
title
:
'编辑'
,
val
:
'edit'
,
val
:
'edit'
,
onFinish
:
async
(
vals
)
=>
{
onFinish
:
async
(
vals
)
=>
{
console
.
log
(
'编辑'
,
vals
);
vals
.
nrList
.
other
=
_
.
pick
(
vals
.
nrList
.
other
,
[
vals
.
nrList
.
other
=
_
.
pick
(
vals
.
nrList
.
other
,
[
'formatType'
,
'formatType'
,
'increaseList'
,
'increaseList'
,
...
@@ -76,7 +75,6 @@ function Rules(props) {
...
@@ -76,7 +75,6 @@ function Rules(props) {
vals
.
nrList
.
value
=
vals
.
nrList
.
value
.
map
((
it
)
=>
{
vals
.
nrList
.
value
=
vals
.
nrList
.
value
.
map
((
it
)
=>
{
return
_
.
pick
(
it
,
[
'id'
,
'noContent'
,
'noRuleCode'
,
'sort'
,
'paramList'
]);
return
_
.
pick
(
it
,
[
'id'
,
'noContent'
,
'noRuleCode'
,
'sort'
,
'paramList'
]);
});
});
console
.
log
(
'1214'
,
vals
);
let
params
=
{
...
vals
};
let
params
=
{
...
vals
};
params
.
nrList
=
[];
params
.
nrList
=
[];
params
.
nrList
=
params
.
nrList
.
concat
(
vals
?.
nrList
.
value
);
params
.
nrList
=
params
.
nrList
.
concat
(
vals
?.
nrList
.
value
);
...
@@ -94,7 +92,6 @@ function Rules(props) {
...
@@ -94,7 +92,6 @@ function Rules(props) {
return
;
return
;
}
}
params
.
id
=
row
?.
id
;
params
.
id
=
row
?.
id
;
console
.
log
(
'11111'
,
params
);
let
res
=
await
doFetch
({
let
res
=
await
doFetch
({
url
:
urlParams
.
save
,
url
:
urlParams
.
save
,
params
,
params
,
...
@@ -180,7 +177,6 @@ function Rules(props) {
...
@@ -180,7 +177,6 @@ function Rules(props) {
title
:
'新增'
,
title
:
'新增'
,
val
:
'add'
,
val
:
'add'
,
onFinish
:
async
(
vals
)
=>
{
onFinish
:
async
(
vals
)
=>
{
console
.
log
(
'新增:'
,
vals
);
let
params
=
{
...
vals
};
let
params
=
{
...
vals
};
params
.
nrList
=
[];
params
.
nrList
=
[];
params
.
nrList
=
params
.
nrList
.
concat
(
vals
?.
nrList
.
value
);
params
.
nrList
=
params
.
nrList
.
concat
(
vals
?.
nrList
.
value
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment