From 2d561150b91a9789d31678af14dd4840bbb56576 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期三, 29 三月 2023 16:37:27 +0800 Subject: [PATCH] 设备、场所、部门接口 --- src/views/basic/equipment/index.vue | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/views/basic/equipment/index.vue b/src/views/basic/equipment/index.vue index b71888d..f0c84a2 100644 --- a/src/views/basic/equipment/index.vue +++ b/src/views/basic/equipment/index.vue @@ -40,16 +40,33 @@ <el-table ref="multipleTableRef" :data="equipmentState.equipmentData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }"> <el-table-column prop="deviceCode" label="设备编号"/> <el-table-column prop="deviceName" label="设备名称" /> + <el-table-column prop="deviceTypeId" label="设备类型" show-overflow-tooltip> + <template #default="scope"> + <span>{{equipmentState.equipmentTypeList.find(item =>item.id === scope.row.deviceTypeId)?.deviceType}}</span> + </template> + </el-table-column> + <el-table-column prop="deviceDesc" label="设备型号" /> <el-table-column prop="devicePower" label="设备功率"> + <template #default="scope"> + <span>{{scope.row.devicePower}}</span> + </template> + </el-table-column> + <el-table-column prop="deviceStatus" label="设备状态"> <template #default="scope"> - <span>{{`${scope.row.devicePower}${equipmentState.deviceUnitList.find(item =>item.id === scope.row.deviceUnit)?.name || ''}`}}</span> + <span>{{scope.row.deviceStatus == 1?'完好':'异常'}}</span> </template> + </el-table-column> + <el-table-column prop="deviceUnit" label="计量单位" show-overflow-tooltip> + <template #default="scope"> + <span>{{`${equipmentState.deviceUnitList.find(item =>item.id === scope.row.deviceUnit)?.name}`}}</span> + </template> </el-table-column> <el-table-column prop="specialDevice" label="是否特殊装备" show-overflow-tooltip> <template #default="scope"> <span>{{`${equipmentState.specialDeviceList.find(item =>item.id === scope.row.specialDevice)?.name}`}}</span> </template> </el-table-column> + <el-table-column prop="safeProtect" label="安全防护"/> <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column> <el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column> @@ -67,7 +84,7 @@ </div> </div> </div> - <equipment-dialog ref="equipmentDialogRef" @refresh="getEquipmentData"></equipment-dialog> + <equipment-dialog ref="equipmentDialogRef" @refresh="getEquipmentData" :equipmentTypeList="equipmentState.equipmentTypeList"></equipment-dialog> </div> </template> @@ -83,6 +100,7 @@ const equipmentState = reactive<EquipmentStateType>({ equipmentData: [], + equipmentTypeList: [], searchQuery: { pageIndex: 1, pageSize: 10, @@ -102,6 +120,13 @@ {id:3, name: '件'} ] }) + +const getAllType = async ()=>{ + const res = await equipmentApi().getAllType(); + if(res.data.code === 100){ + equipmentState.equipmentTypeList = res.data.data + } +} const getEquipmentData = async () => { let res = await equipmentApi().getEquipmentByList(equipmentState.searchQuery); @@ -169,6 +194,7 @@ onMounted(() => { getEquipmentData() + getAllType() }) </script> -- Gitblit v1.9.2