From 6509ce4d7796dd5ec7361fcca96a01b2f54eff14 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 10 八月 2022 17:50:39 +0800
Subject: [PATCH] 对接
---
src/views/facilityManagement/InstrumentationInformation/index.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index ef5d1c7..ee2b75e 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -37,7 +37,7 @@
</div>
</div>
<div style="padding-left: 10px">
- <el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
<template #default="scope">
@@ -45,14 +45,14 @@
<el-tab-pane label="设备保养" name="first">
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
<el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
- <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
+ <el-table-column property="leadingPersonName" align="center" label="保养负责人" sortable />
<el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
- <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
+ <el-table-column property="leadingPersonDepartmentName" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
- <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
+ <el-table-column property="leadingPersonName" align="center" label="检查人" sortable />
<el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
@@ -60,21 +60,31 @@
></el-tab-pane>
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
- <el-table-column property="testPersonId" align="center" label="检测人" sortable />
+ <el-table-column property="testPersonName" align="center" label="检测人" sortable />
<el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
- <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
+ <el-table-column property="testPersonDepartmentName" align="center" label="检测人单位" sortable />
<el-table-column property="testMemo" align="center" label="检测内容" sortable />
- <el-table-column property="testResult" align="center" label="检测结果" sortable />
+ <el-table-column align="center" label="检测结果">
+ <template #default="scope">
+ <span v-if="scope.row.testResult == 1">成功</span>
+ <span v-if="scope.row.testResult == 2">失败</span>
+ </template>
+ </el-table-column>
<el-table-column property="testStatus" align="center" label="检测状态" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="fourth">
<el-table ref="multipleTableRef" :data="scope.row.repaireDetailList" style="width: 100%">
<el-table-column property="exceptionInfo" align="center" label="设施异常项" sortable />
- <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
+ <el-table-column align="center" label="维修状态">
+ <template #default="scope">
+ <span v-if="scope.row.repairStatus == 1">维修中</span>
+ <span v-if="scope.row.repairStatus == 2">已修好</span>
+ </template>
+ </el-table-column>
<el-table-column property="repairMemo" align="center" label="维修情况" sortable />
- <el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
- <el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
+ <el-table-column property="repairPersonName" align="center" label="维修负责人" sortable />
+ <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
<el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
<el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
</el-table>
@@ -136,6 +146,7 @@
searchParams: {
qName: '', ////名称
positionNum: '', ////位号
+ equipmentTypeId: '',
infoType: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
},
});
@@ -188,8 +199,8 @@
};
// 删除
const onDelete = (id: number) => {
- let arr=[]
- arr.push(id)
+ let arr = [];
+ arr.push(id);
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -227,7 +238,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr
+ deletAll.value = arr;
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -300,6 +311,7 @@
};
const handleNodeClick = (data: Tree) => {
ruleForm.searchParams.positionNum = data.sortNum;
+ ruleForm.searchParams.equipmentTypeId = data.id;
listApi();
};
const data = ref([]);
--
Gitblit v1.9.2