|
@@ -47,15 +47,13 @@
|
|
|
align="center"
|
|
align="center"
|
|
|
label="实验室类型"
|
|
label="实验室类型"
|
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
|
- :formatter="formatRoomType"
|
|
|
|
|
- ></el-table-column>
|
|
|
|
|
|
|
+ :formatter="formatRoomType"></el-table-column>
|
|
|
<el-table-column prop="Building"
|
|
<el-table-column prop="Building"
|
|
|
min-width="10px"
|
|
min-width="10px"
|
|
|
align="center"
|
|
align="center"
|
|
|
label="楼宇"
|
|
label="楼宇"
|
|
|
show-overflow-tooltip
|
|
show-overflow-tooltip
|
|
|
- :formatter="formatBuilding"
|
|
|
|
|
- ></el-table-column>
|
|
|
|
|
|
|
+ :formatter="formatBuilding"></el-table-column>
|
|
|
<el-table-column prop="PositionInformation"
|
|
<el-table-column prop="PositionInformation"
|
|
|
min-width="10px"
|
|
min-width="10px"
|
|
|
align="center"
|
|
align="center"
|
|
@@ -108,14 +106,12 @@
|
|
|
@closeAddDialog="handleCloseAdd"
|
|
@closeAddDialog="handleCloseAdd"
|
|
|
@initdata="searchroomdata"
|
|
@initdata="searchroomdata"
|
|
|
:typeList="typeList"
|
|
:typeList="typeList"
|
|
|
- :buildingList="buildingList"
|
|
|
|
|
- ></addroom>
|
|
|
|
|
|
|
+ :buildingList="buildingList"></addroom>
|
|
|
<editroom ref="editroom"
|
|
<editroom ref="editroom"
|
|
|
@closeEditDialog="handleCloseEdit"
|
|
@closeEditDialog="handleCloseEdit"
|
|
|
@initdata="searchroomdata"
|
|
@initdata="searchroomdata"
|
|
|
:typeList="typeList"
|
|
:typeList="typeList"
|
|
|
- :buildingList="buildingList"
|
|
|
|
|
- ></editroom>
|
|
|
|
|
|
|
+ :buildingList="buildingList"></editroom>
|
|
|
<role-user :role="role"
|
|
<role-user :role="role"
|
|
|
v-model="roleUserDialogVisible" />
|
|
v-model="roleUserDialogVisible" />
|
|
|
<template slot="footer">
|
|
<template slot="footer">
|
|
@@ -160,7 +156,7 @@ export default {
|
|
|
RoomType: '',
|
|
RoomType: '',
|
|
|
RoomDescribe: '',
|
|
RoomDescribe: '',
|
|
|
PositionInformation: '',
|
|
PositionInformation: '',
|
|
|
- buildingList:[], // 楼宇
|
|
|
|
|
|
|
+ buildingList: [], // 楼宇
|
|
|
name: '',
|
|
name: '',
|
|
|
totalsize: 0,
|
|
totalsize: 0,
|
|
|
currpage: 1,
|
|
currpage: 1,
|
|
@@ -194,21 +190,21 @@ export default {
|
|
|
// 获取所有实验室类型
|
|
// 获取所有实验室类型
|
|
|
getRoomTypeList () {
|
|
getRoomTypeList () {
|
|
|
itemDetailApi.getItemDetailByItemCode({ ItemCode: 'RoomType' })
|
|
itemDetailApi.getItemDetailByItemCode({ ItemCode: 'RoomType' })
|
|
|
- .then(res => {
|
|
|
|
|
- this.typeList = res
|
|
|
|
|
- })
|
|
|
|
|
- .catch(err => {
|
|
|
|
|
- console.error(err)
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ .then(res => {
|
|
|
|
|
+ this.typeList = res
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(err => {
|
|
|
|
|
+ console.error(err)
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
- formatRoomType(row, column) {
|
|
|
|
|
|
|
+ formatRoomType (row, column) {
|
|
|
for (var i = 0; i < this.typeList.length; i++) {
|
|
for (var i = 0; i < this.typeList.length; i++) {
|
|
|
if (parseInt(this.typeList[i].ItemValue) === parseInt(row.RoomType)) {
|
|
if (parseInt(this.typeList[i].ItemValue) === parseInt(row.RoomType)) {
|
|
|
return this.typeList[i].ItemName
|
|
return this.typeList[i].ItemName
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- formatBuilding(row, column) {
|
|
|
|
|
|
|
+ formatBuilding (row, column) {
|
|
|
for (var i = 0; i < this.buildingList.length; i++) {
|
|
for (var i = 0; i < this.buildingList.length; i++) {
|
|
|
if (parseInt(this.buildingList[i].ItemValue) === parseInt(row.Building)) {
|
|
if (parseInt(this.buildingList[i].ItemValue) === parseInt(row.Building)) {
|
|
|
return this.buildingList[i].ItemName
|
|
return this.buildingList[i].ItemName
|
|
@@ -218,12 +214,12 @@ export default {
|
|
|
// 获取位置列表
|
|
// 获取位置列表
|
|
|
getBuildingList () {
|
|
getBuildingList () {
|
|
|
itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Local' })
|
|
itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Local' })
|
|
|
- .then(res => {
|
|
|
|
|
- this.buildingList = res
|
|
|
|
|
- })
|
|
|
|
|
- .catch(err => {
|
|
|
|
|
- console.error(err)
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ .then(res => {
|
|
|
|
|
+ this.buildingList = res
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(err => {
|
|
|
|
|
+ console.error(err)
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
// 添加 实验室
|
|
// 添加 实验室
|
|
|
maintainlogadd () {
|
|
maintainlogadd () {
|