From 7df64634d3d7b292713eebfa008c40b3f5f9f65f Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 20 九月 2022 15:57:03 +0800
Subject: [PATCH] 修改
---
src/components/equipmentDailog/DailogS.vue | 98 +++++++++++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 44 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index 78eae39..06a9715 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>
@@ -72,8 +72,8 @@
<el-col :span="11">
<el-form-item label="装置部位分类" size="default">
<el-select v-model="form.partType" placeholder="请选择" style="width: 100%">
- <el-option label="关键装置" value="1" />
- <el-option label="重点部位" value="2" />
+ <el-option label="关键装置" :value="1" />
+ <el-option label="重点部位" :value="2" />
</el-select>
</el-form-item>
</el-col>
@@ -116,17 +116,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="现场图片">
- <el-upload
- v-model="form.scenePic"
- class="avatar-uploader"
- action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
- :show-file-list="false"
- :on-success="handleAvatarSuccess"
- :before-upload="beforeAvatarUpload"
- >
- <img v-if="imageUrl" :src="imageUrl" class="avatar" />
- <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
- </el-upload>
+ <uploaderImg :fileList="fileList"
+ :systemName="'EQUIPMENT'" @successUploader="successUploader"></uploaderImg>
</el-form-item>
</el-col>
</el-row>
@@ -141,9 +132,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 +146,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 +171,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 +194,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="单位" />
@@ -269,8 +270,10 @@
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
import {deepClone} from '/@/utils/other'
+import uploaderImg from '/@/components/uploaderImg/index.vue';
export default defineComponent({
- components: { categoryDailog, RegionsDialog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
+ components: { categoryDailog,Plus, RegionsDialog, DailogSearchUser, maintenanceDailog,
+ detectDailog, repairDailog, standardDailog,uploaderImg },
setup(props, { emit }) {
const dialogVisible = ref(false);
const form = ref({
@@ -282,16 +285,16 @@
inputPersonName: '',
departmentId: '',
- delRepaireDetailList: [],
+ // delRepaireDetailList: [],
- delTestDetailList: [],
+ // delTestDetailList: [],
takecareDetailList: [],
checkDetailList: [],
responsibilityPersonId: '',
responsibilityPersonName: '',
- delTakecareStardardeDetailList: [],
+ // delTakecareStardardeDetailList: [],
connectPersonId: '',
connectPersonName: '',
@@ -313,13 +316,13 @@
testDetailList: [],
checkCycle: '',
repaireDetailList: [],
- delCheckStandardeDetailList: [],
+ // delCheckStandardeDetailList: [],
leadingPersonName: '',
name: '',
- delTakecareDetailList: [],
+ // delTakecareDetailList: [],
position: '',
@@ -380,6 +383,7 @@
dialogVisible.value = false;
if (titleT.value == '新建') {
delete form.value.id;
+ delete form.value.infoTpe
}
facilityManagementApi()
.getkeypointEquipmentInfoAddOrUpdate(form.value)
@@ -397,8 +401,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 +426,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) {
@@ -458,17 +465,20 @@
standardShow.value.openDailog(title, data);
};
// 上传
- const fileList = ref<UploadUserFile[]>([
- {
- name: 'element-plus-logo.svg',
- url: 'https://element-plus.org/images/element-plus-logo.svg',
- },
- {
- name: 'element-plus-logo2.svg',
- url: 'https://element-plus.org/images/element-plus-logo.svg',
- },
- ]);
-
+ const fileList = ref([]);
+ const successUploader = (list) =>{
+ fileList.value = list
+ const formFileList = []
+ for(var a = 0;a<fileList.value.length;a++){
+ formFileList.push(
+ {
+ fileName:fileList.value[a].fileName,
+ fileUrl:''
+ }
+ )
+ }
+ form.value.fileList = formFileList
+ }
const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
console.log(file, uploadFiles);
};
@@ -684,4 +694,4 @@
height: 178px;
text-align: center;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2