From c64c8f43ec1a3d88feb1f915fd488040b6358e7d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 09 八月 2022 19:04:12 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/facilityManagement/keyEquipment/index.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 720e823..3627137 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -26,7 +26,7 @@
<el-col :span="20">
<div class="btns">
<div>
- <el-button size="default" type="primary" :icon="Plus" @click="openD">新建</el-button>
+ <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
<el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
@@ -46,14 +46,14 @@
<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="takecareDate" 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>
</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="createTime" 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 />
<el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
@@ -61,7 +61,7 @@
<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="testDate" 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="testMemo" align="center" label="检测内容" sortable />
<el-table-column property="testResult" align="center" label="检测结果" sortable />
@@ -75,8 +75,8 @@
<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="repairStartDate" align="center" label="维修开始日期" sortable />
- <el-table-column property="repairEndDate" 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>
</el-tab-pane>
</el-tabs>
@@ -87,7 +87,12 @@
<el-table-column property="departmentId" label="所属部门" align="center" sortable show-overflow-tooltip />
<el-table-column property="position" label="具体位置" align="center" sortable show-overflow-tooltip />
<el-table-column property="leadingPersonName" label="负责人姓名" align="center" sortable show-overflow-tooltip />
- <el-table-column property="connectPersonId" label="装置部位分类" align="center" sortable show-overflow-tooltip />
+ <el-table-column property="connectPersonId" label="装置部位分类" align="center" sortable show-overflow-tooltip>
+ <template #default="scope">
+ <span v-if="scope.row.type == 1">关键装置</span>
+ <span v-if="scope.row.type == 2">重点部位</span>
+ </template>
+ </el-table-column>
<el-table-column label="操作" align="center" width="250">
<template #default="scope">
<el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看</el-button>
@@ -121,6 +126,7 @@
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { EditPen, Plus, Delete, Download, Refresh, Upload, View } from '@element-plus/icons-vue';
import { facilityManagementApi } from '/@/api/facilityManagement';
+import {timeDate} from '/@/assets/index.ts'
interface Tree {
label: string;
children?: Tree[];
@@ -135,13 +141,14 @@
pageSize: 10,
pageIndex: 1,
searchParams: {
- equipmentTypeId: '', ////类型/类别外键
+ // equipmentTypeId: '', ////类型/类别外键
qName: '', ////装置/部位名称
// departmentId: '',////所属部门
// position: '', ////具体位置
// leadingPersonName: '', ////负责人姓名
// connectPersonId: '',////装置部位分类
- infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ // infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ typeId:''
},
});
// 重置
@@ -216,7 +223,7 @@
};
const handleNodeClick = (data: Tree) => {
console.log(data)
- ruleForm.searchParams.qName = data.typeName;
+ ruleForm.searchParams.typeId = data.id;
listApi();
};
@@ -357,6 +364,7 @@
handleSelectionChange,
onDeleteAll,
handleNodeClick,
+ timeDate,
};
},
});
--
Gitblit v1.9.2