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
4a27e317
Commit
4a27e317
authored
Oct 28, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了数据录入设备列表
parent
f5c18216
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
3 deletions
+39
-3
SampleRightList.vue
...il-test-manage/test-input/sample-tabs/SampleRightList.vue
+39
-3
No files found.
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
View file @
4a27e317
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
<SelectOriTempRecord
ref=
"recordModal"
@
on-result-change=
"_page"
></SelectOriTempRecord>
<SelectOriTempRecord
ref=
"recordModal"
@
on-result-change=
"_page"
></SelectOriTempRecord>
<SelEquip
ref=
"selEquip"
@
on-result-change=
"_equipResult"
></SelEquip>
<SelEquip
ref=
"selEquip"
@
on-result-change=
"_equipResult"
></SelEquip>
<IndexManage
ref=
"indexModal"
@
on-result-change=
"_page"
></IndexManage>
<IndexManage
ref=
"indexModal"
@
on-result-change=
"_page"
></IndexManage>
<EquipManage
ref=
"equipModal"
@
on-result-change=
"_page"
></EquipManage>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -60,8 +61,15 @@ import AssignPerson from '../../../../components/user-info-single/AssignPerson'
...
@@ -60,8 +61,15 @@ import AssignPerson from '../../../../components/user-info-single/AssignPerson'
import
SelectOriTempRecord
from
'../SelectOriTempRecord'
import
SelectOriTempRecord
from
'../SelectOriTempRecord'
import
SelEquip
from
'../../../../components/select-equip/SelEquip'
import
SelEquip
from
'../../../../components/select-equip/SelEquip'
import
IndexManage
from
'../IndexManage'
import
IndexManage
from
'../IndexManage'
import
EquipManage
from
'../EquipManage'
export
default
{
export
default
{
components
:
{
AssignPerson
,
SelectOriTempRecord
,
SelEquip
,
IndexManage
},
components
:
{
AssignPerson
,
SelectOriTempRecord
,
SelEquip
,
IndexManage
,
EquipManage
},
data
()
{
data
()
{
return
{
return
{
// 定义表格名称----英文
// 定义表格名称----英文
...
@@ -105,7 +113,8 @@ export default {
...
@@ -105,7 +113,8 @@ export default {
],
],
iconMsg
:
[
iconMsg
:
[
{
type
:
'ios-book'
,
id
:
''
,
name
:
'查看原始记录'
},
{
type
:
'ios-book'
,
id
:
''
,
name
:
'查看原始记录'
},
{
type
:
'md-apps'
,
id
:
''
,
name
:
'查看指标'
}
{
type
:
'md-apps'
,
id
:
''
,
name
:
'查看指标'
},
{
type
:
'ios-flask'
,
id
:
''
,
name
:
'设备列表'
}
],
],
getPage
:
{},
getPage
:
{},
pageColumns
:
[
pageColumns
:
[
...
@@ -254,8 +263,29 @@ export default {
...
@@ -254,8 +263,29 @@ export default {
})
})
}
}
},
},
_equipResult
(
res
)
{
_equipResult
:
async
function
(
res
)
{
console
.
log
(
res
)
console
.
log
(
res
)
const
tempData
=
{}
tempData
.
equipList
=
[]
res
.
map
((
item
,
index
)
=>
{
tempData
.
equipList
.
push
({
equipId
:
item
.
id
,
equipName
:
item
.
name
,
acquisitionCommand
:
item
.
acquisitionCommand
,
brand
:
item
.
brand
,
collectionAddress
:
item
.
acquisitionAddress
,
collectionType
:
item
.
acquisitionType
,
equipNum
:
item
.
labNum
,
ipAddress
:
item
.
ipAddress
,
labNum
:
item
.
classId
,
spec
:
item
.
spec
})
})
tempData
.
expIds
=
this
.
selectIds
const
result
=
await
soilTest
.
addExpEquip
(
tempData
)
if
(
result
)
{
this
.
$Message
.
success
(
'添加成功'
)
}
},
},
// 调整分组
// 调整分组
_userGroupResult
(
data
)
{
_userGroupResult
(
data
)
{
...
@@ -457,12 +487,18 @@ export default {
...
@@ -457,12 +487,18 @@ export default {
case
'查看指标'
:
case
'查看指标'
:
this
.
_indexManage
(
data
)
this
.
_indexManage
(
data
)
break
break
case
'设备列表'
:
this
.
_equipManage
(
data
)
break
}
}
})
})
},
},
_indexManage
(
data
)
{
_indexManage
(
data
)
{
this
.
$refs
.
indexModal
.
_open
(
data
)
this
.
$refs
.
indexModal
.
_open
(
data
)
},
},
_equipManage
(
data
)
{
this
.
$refs
.
equipModal
.
_open
(
data
)
},
_viewRecord
(
originalRecordId
)
{
_viewRecord
(
originalRecordId
)
{
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
// eslint-disable-next-line no-undef
// eslint-disable-next-line no-undef
...
...
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