Commit 4a27e317 by lichengming

修改了数据录入设备列表

parent f5c18216
...@@ -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
......
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