From 8fa7c89cc1dbde33485260b674c1145d4e352366 Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期三, 10 八月 2022 18:52:53 +0800
Subject: [PATCH] 应急系统修改
---
src/components/equipmentDailog/DailogS.vue | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index 78eae39..01fcf6e 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :fullscreen="full" v-model="dialogVisible" draggable :title="titles" width="60%" @close="resetForm(ruleFormRef)">
+ <el-dialog :fullscreen="full" v-model="dialogVisible" draggable :title="titles" width="60%" @close="resetForm(ruleFormRef)" >
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-form :model="form" ref="ruleFormRef" label-width="130px" :rules="rules" :disabled="disabled">
<el-row>
@@ -141,9 +141,9 @@
<el-button type="primary" size="default" @click="openMaintenance('新增', '')" :disabled="disabled">新增</el-button>
<el-table :data="form.takecareDetailList" style="width: 100%">
<el-table-column align="center" prop="takecareMemo" label="保养情况" />
- <el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
+ <el-table-column align="center" prop="leadingPersonName" label="保养负责人" />
<el-table-column align="center" prop="takecareDate" :formatter="timeDate" label="保养日期" />
- <el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
+ <el-table-column align="center" prop="leadingPersonDepartmentName" label="保养负责人单位" />
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small" :disabled="disabled">查看</el-button>
@@ -155,12 +155,17 @@
</el-tab-pane>
<el-tab-pane label="设备检测" name="second">
<el-button type="primary" size="default" @click="openDetect('新增', '')" :disabled="disabled">新增</el-button>
- <el-table :data="form.testDetailList" style="width: 100%">
- <el-table-column align="center" prop="testPersonId" label="检测人" />
+ <el-table :data="form.checkDetailList" style="width: 100%">
+ <el-table-column align="center" prop="testPersonName" label="检测人" />
<el-table-column align="center" prop="testDate" :formatter="timeDate" label="检测日期" />
- <el-table-column align="center" prop="testPersonDepartmentId" label="检测人单位" />
+ <el-table-column align="center" prop="testPersonDepartmentName" label="检测人单位" />
<el-table-column align="center" prop="testMemo" label="检测内容" />
- <el-table-column align="center" prop="testResult" label="检测结果" />
+ <el-table-column align="center" prop="testResult" 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 align="center" prop="testStatus" label="检测状态" />
<el-table-column align="center" label="操作">
<template #default="scope">
@@ -175,10 +180,15 @@
<el-button type="primary" size="default" @click="openRepair('新增', '')" :disabled="disabled">新增</el-button>
<el-table :data="form.repaireDetailList" style="width: 100%">
<el-table-column align="center" prop="exceptionInfo" label="设施异常项" />
- <el-table-column align="center" prop="repairStatus" label="维修状态" />
+ <el-table-column align="center" prop="repairStatus" 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 align="center" prop="repairMemo" label="维修情况" />
- <el-table-column align="center" prop="repairPersonId" label="维修负责人" />
- <el-table-column align="center" prop="repairPersonDepartmentId" label="维修负责人单位" />
+ <el-table-column align="center" prop="repairPersonName" label="维修负责人" />
+ <el-table-column align="center" prop="repairPersonDepartmentName" label="维修负责人单位" />
<el-table-column align="center" prop="repairStartDate" :formatter="timeDate" label="维修开始日期" />
<el-table-column align="center" prop="repairEndDate" :formatter="timeDate" label="维修结束日期" />
<el-table-column align="center" label="操作">
@@ -193,7 +203,7 @@
<el-tab-pane label="检查标准设置" name="fourth">
<el-button type="primary" size="default" @click="openStandard('新增', '')" :disabled="disabled">新增</el-button>
<el-table :data="form.checkStandardeDetailList" style="width: 100%">
- <el-table-column align="center" type="indexNum" label="序号" width="75" />
+ <el-table-column align="center" prop="indexNum" label="序号" width="75" />
<el-table-column align="center" prop="checkContent" label="检查内容" />
<el-table-column align="center" prop="checkTarget" label="检查指标" />
<el-table-column align="center" prop="unit" label="单位" />
@@ -282,16 +292,16 @@
inputPersonName: '',
departmentId: '',
- delRepaireDetailList: [],
+ // delRepaireDetailList: [],
- delTestDetailList: [],
+ // delTestDetailList: [],
takecareDetailList: [],
checkDetailList: [],
responsibilityPersonId: '',
responsibilityPersonName: '',
- delTakecareStardardeDetailList: [],
+ // delTakecareStardardeDetailList: [],
connectPersonId: '',
connectPersonName: '',
@@ -313,13 +323,13 @@
testDetailList: [],
checkCycle: '',
repaireDetailList: [],
- delCheckStandardeDetailList: [],
+ // delCheckStandardeDetailList: [],
leadingPersonName: '',
name: '',
- delTakecareDetailList: [],
+ // delTakecareDetailList: [],
position: '',
@@ -380,6 +390,7 @@
dialogVisible.value = false;
if (titleT.value == '新建') {
delete form.value.id;
+ delete form.value.infoTpe
}
facilityManagementApi()
.getkeypointEquipmentInfoAddOrUpdate(form.value)
@@ -397,8 +408,11 @@
// form.value = null;
};
// 取消
- const resetForm = () => {
+ const resetForm = (formEl: FormInstance | undefined) => {
+ if (!formEl) return;
+ formEl.resetFields();
dialogVisible.value = false;
+ form.value={}
};
const activeName = ref('first');
const index = ref<any>();
@@ -419,7 +433,7 @@
const UserShow = ref();
const openUser = (type: any) => {
- UserShow.value.openDailog(type);
+ UserShow.value.openDailog(type);
};
const userId = (val: any, type: number) => {
if (type == 1) {
--
Gitblit v1.9.2