Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
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
wangweidong
patzn-cloud-web-back-soil
Commits
90552ef1
Commit
90552ef1
authored
Mar 23, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了开土制备标签信息
parent
3f50a436
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
3 deletions
+27
-3
Preparation.vue
pages/soil-sample-manage/sample-preparation/Preparation.vue
+24
-0
AreaSample.vue
pages/soil-statistics/area-sample/AreaSample.vue
+1
-1
ProjectItem.vue
pages/soil-statistics/project-item/ProjectItem.vue
+2
-2
No files found.
pages/soil-sample-manage/sample-preparation/Preparation.vue
View file @
90552ef1
...
...
@@ -558,6 +558,30 @@ export default {
undefined
!==
row
.
sampleCode
?
row
.
sampleCode
:
''
)
result
=
result
.
replace
(
/
\$
sampleDepth
\$
/g
,
undefined
!==
row
.
sampleDepth
?
row
.
sampleDepth
:
''
)
result
=
result
.
replace
(
/
\$
siteNo
\$
/g
,
undefined
!==
row
.
siteNo
?
row
.
siteNo
:
''
)
result
=
result
.
replace
(
/
\$
boreholeName
\$
/g
,
undefined
!==
row
.
boreholeName
?
row
.
boreholeName
:
''
)
result
=
result
.
replace
(
/
\$
itemNames
\$
/g
,
undefined
!==
row
.
itemNames
?
row
.
itemNames
:
''
)
result
=
result
.
replace
(
/
\$
itemNamesShort
\$
/g
,
undefined
!==
row
.
itemNamesShort
?
row
.
itemNamesShort
:
''
)
result
=
result
.
replace
(
/
\$
samplePack
\$
/g
,
undefined
!==
row
.
samplePack
?
row
.
samplePack
:
''
)
result
=
result
.
replace
(
/
\$
groupId
\$
/g
,
undefined
!==
row
.
groupId
?
row
.
groupId
:
''
)
...
...
pages/soil-statistics/area-sample/AreaSample.vue
View file @
90552ef1
...
...
@@ -84,7 +84,7 @@ export default {
testerId
:
''
,
pageColumns
:
[
{
title
:
'钻孔位置'
,
key
:
'boreholeLocation'
,
width
:
110
},
{
title
:
'样品数量'
,
key
:
'
endTotal
'
,
width
:
110
}
{
title
:
'样品数量'
,
key
:
'
num
'
,
width
:
110
}
],
groupData
:
[],
getPage
:
{},
...
...
pages/soil-statistics/project-item/ProjectItem.vue
View file @
90552ef1
...
...
@@ -90,8 +90,8 @@ export default {
pageColumns
:
[
{
title
:
'工程类型'
,
key
:
'projectType'
,
detail
:
true
,
width
:
140
},
{
title
:
'工程名称'
,
key
:
'projectName'
,
width
:
100
},
{
title
:
'检测项目'
,
key
:
'item'
,
width
:
110
},
{
title
:
'数量'
,
key
:
'
count
'
,
width
:
110
}
{
title
:
'检测项目'
,
key
:
'item
Names
'
,
width
:
110
},
{
title
:
'数量'
,
key
:
'
num
'
,
width
:
110
}
],
groupData
:
[],
getPage
:
{},
...
...
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