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
8c3d3bbc
Commit
8c3d3bbc
authored
Dec 19, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了试样检测查看指标
parent
cc9c10ec
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
16 deletions
+11
-16
soil-sample.js
api/soil/soil-sample.js
+1
-8
soil-test.js
api/soil/soil-test.js
+1
-0
ImportItem.vue
...oil-sample-manage/sample-preparation-check/ImportItem.vue
+1
-1
ImportItem.vue
pages/soil-sample-manage/sample-preparation/ImportItem.vue
+2
-1
WaitReceive.vue
...nage/sample-receive/entrust-sample-manage/WaitReceive.vue
+2
-2
IndexManage.vue
pages/soil-test-manage/test-input/IndexManage.vue
+4
-4
No files found.
api/soil/soil-sample.js
View file @
8c3d3bbc
...
...
@@ -153,14 +153,7 @@ export default {
pageLocationSample
:
data
=>
http
.
post
(
'soil/v1/sample/page_location_sample'
,
data
).
then
(
res
=>
res
),
importExperiments
:
data
=>
http
.
post
(
'soil/v1/experiment/import_experiments?aptitudeIds='
+
data
.
aptitudeIds
+
'&ids='
+
data
.
ids
)
.
then
(
res
=>
res
),
http
.
post
(
'soil/v1/experiment/import_experiments'
,
data
).
then
(
res
=>
res
),
pageSecondary
:
data
=>
http
.
post
(
'soil/v1/prepare/page_secondary'
,
data
).
then
(
res
=>
res
),
pageSecondaryHis
:
data
=>
...
...
api/soil/soil-test.js
View file @
8c3d3bbc
...
...
@@ -93,6 +93,7 @@ export default {
itemEdit
:
data
=>
http
.
put
(
'soil/v1/item/'
+
data
.
id
,
data
.
obj
).
then
(
res
=>
res
),
itemGetById
:
data
=>
http
.
get
(
'soil/v1/item/'
+
data
).
then
(
res
=>
res
),
itemDelete
:
data
=>
http
.
delete
(
'soil/v1/item/?ids='
+
data
).
then
(
res
=>
res
),
endExp
:
data
=>
http
.
post
(
'soil/v1/experiment/end_exp?ids='
+
data
).
then
(
res
=>
res
),
endExpIds
:
data
=>
...
...
pages/soil-sample-manage/sample-preparation-check/ImportItem.vue
View file @
8c3d3bbc
...
...
@@ -104,7 +104,7 @@ export default {
},
_ok
:
async
function
()
{
const
result
=
await
soilSample
.
importExperiments
({
aptitudeIds
:
this
.
addIds
,
aptitudeIds
:
this
.
addIds
.
join
(
','
)
,
ids
:
this
.
sampleId
})
if
(
result
)
{
...
...
pages/soil-sample-manage/sample-preparation/ImportItem.vue
View file @
8c3d3bbc
...
...
@@ -103,8 +103,9 @@ export default {
}
},
_ok
:
async
function
()
{
console
.
log
(
'导入检测项目'
)
const
result
=
await
soilSample
.
importExperiments
({
aptitudeIds
:
this
.
addIds
,
aptitudeIds
:
this
.
addIds
.
join
(
','
)
,
ids
:
this
.
sampleId
})
if
(
result
)
{
...
...
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue
View file @
8c3d3bbc
...
...
@@ -361,8 +361,8 @@ export default {
},
_importItemOk
:
async
function
(
ids
)
{
const
result
=
await
soilSample
.
importExperiments
({
aptitudeIds
:
ids
,
ids
:
this
.
selectIds
aptitudeIds
:
ids
.
join
(
','
)
,
ids
:
this
.
selectIds
.
join
(
','
)
})
if
(
result
)
{
this
.
$Message
.
success
(
'导入成功'
)
...
...
pages/soil-test-manage/test-input/IndexManage.vue
View file @
8c3d3bbc
...
...
@@ -34,7 +34,7 @@
</template>
<
script
>
import
{
soil
Aptitude
,
soil
Test
}
from
'../../../api'
import
{
soilTest
}
from
'../../../api'
import
IndexManageEdit
from
'./IndexManageEdit'
export
default
{
...
...
@@ -139,7 +139,7 @@ export default {
_deleteByIds
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
// this.$msgTip('warning')
this
.
$
m
essage
.
warning
(
'请至少选择一条记录'
)
this
.
$
M
essage
.
warning
(
'请至少选择一条记录'
)
}
else
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
...
...
@@ -151,9 +151,9 @@ export default {
}
},
_delOk
:
async
function
(
ids
)
{
const
result
=
await
soil
Aptitude
.
expItemDeleteByIds
(
ids
)
const
result
=
await
soil
Test
.
itemDelete
(
ids
)
if
(
result
)
{
this
.
$
m
essage
.
success
(
'删除成功'
)
this
.
$
M
essage
.
success
(
'删除成功'
)
this
.
_page
()
}
}
...
...
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