From a63579a26e93dcd4a4f3ef25f84a90dcf2f665aa Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期一, 01 八月 2022 18:22:04 +0800
Subject: [PATCH] 事故快报中修改事故部门只显示id的问题
---
src/components/equipmentDailog/DailogS.vue | 247 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 170 insertions(+), 77 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index a1d4f24..6da1e53 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -1,10 +1,11 @@
<template>
- <el-dialog v-model="dialogVisible" title="新建仪器仪表" width="60%">
- <el-form :model="form" label-width="130px">
+ <el-dialog :fullscreen="full" v-model="isShowDialog" :title="titles" width="60%">
+ <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
+ <el-form :model="form" label-width="130px" :disabled="disabled">
<el-row>
<el-col :span="11">
- <el-form-item label="类型/类别外键">
- <el-input v-model="form.name" placeholder="请选择">
+ <el-form-item label="类型/类别外键" size="default">
+ <el-input v-model="form.equipmentTypeId" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="opencategory"></el-button>
</template>
@@ -12,36 +13,36 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="装置/部位名称">
+ <el-form-item label="装置/部位名称" size="default">
<el-input v-model="form.name" placeholder="请选择" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="所属部门">
- <el-select v-model="form.region" placeholder="请选择" style="width: 100%">
+ <el-form-item label="所属部门" size="default">
+ <el-select v-model="form.departmentId" placeholder="请选择" style="width: 100%">
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="具体位置">
- <el-input v-model="form.name" placeholder="请填写具体位置" />
+ <el-form-item label="具体位置" size="default">
+ <el-input v-model="form.position" placeholder="请填写具体位置" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="负责人姓名">
- <el-input v-model="form.name" placeholder="请填写负责人姓名" />
+ <el-form-item label="负责人姓名" size="default">
+ <el-input v-model="form.leadingPersonName" placeholder="请填写负责人姓名" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="联系人">
- <el-input v-model="form.name" placeholder="请选择">
+ <el-form-item label="联系人" size="default">
+ <el-input v-model="form.connectPersonId" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser"></el-button>
</template>
@@ -51,8 +52,8 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="录入人">
- <el-input v-model="form.name" placeholder="请选择">
+ <el-form-item label="录入人" size="default">
+ <el-input v-model="form.inputPersonId" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser"></el-button>
</template>
@@ -60,8 +61,8 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="责任人">
- <el-input v-model="form.name" placeholder="请选择">
+ <el-form-item label="责任人" size="default">
+ <el-input v-model="form.responsibilityPersonId" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser"></el-button>
</template>
@@ -71,23 +72,23 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="装置部位分类">
- <el-select v-model="form.region" placeholder="请选择" style="width: 100%">
+ <el-form-item label="装置部位分类" size="default">
+ <el-select v-model="form.partType" placeholder="请选择" style="width: 100%">
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="检查周期">
- <el-input v-model="form.name" placeholder="请选择检查周期" />
+ <el-form-item label="检查周期" size="default">
+ <el-input v-model="form.checkCycle" placeholder="请选择检查周期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="相关应急预案">
- <el-input v-model="form.name" placeholder="请选择">
+ <el-form-item label="相关应急预案" size="default">
+ <el-input v-model="form.emergencePlanId" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openPlan"></el-button>
</template>
@@ -95,22 +96,22 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="主要危险有害因素">
- <el-input v-model="form.name" placeholder="请选择" />
+ <el-form-item label="主要危险有害因素" size="default">
+ <el-input v-model="form.dangerousElement" placeholder="请选择" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="易导致风险">
- <el-input v-model="form.name" placeholder="请选择易导致风险" />
+ <el-form-item label="易导致风险" size="default">
+ <el-input v-model="form.toDangerous" placeholder="请选择易导致风险" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="应急处置措施">
- <el-input v-model="form.name" placeholder="请选择应急处置措施" />
+ <el-form-item label="应急处置措施" size="default">
+ <el-input v-model="form.treatment" placeholder="请选择应急处置措施" />
</el-form-item>
</el-col>
</el-row>
@@ -119,6 +120,7 @@
<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"
@@ -133,19 +135,19 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="备注信息"> <el-input v-model="form.name" placeholder="请选择应急处置措施" /> </el-form-item>
+ <el-form-item label="备注信息" size="default"> <el-input v-model="form.name" placeholder="请选择应急处置措施" /> </el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs v-model="activeName" class="demo-tabs">
<el-tab-pane label="设备保养" name="first">
- <el-button type="primary" @click="openMaintenance">新增</el-button>
+ <el-button type="primary" size="default" @click="openMaintenance">新增</el-button>
<el-table :data="tableData" style="width: 100%">
- <el-table-column align="center" prop="date" label="保养情况" />
- <el-table-column align="center" prop="name" label="保养负责人" />
- <el-table-column align="center" prop="address" label="保养日期" />
- <el-table-column align="center" prop="address" label="保养负责人单位" />
- <el-table-column align="center" prop="address" label="操作">
+ <el-table-column align="center" prop="takecareMemo" label="保养情况" />
+ <el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
+ <el-table-column align="center" prop="takecareDate" label="保养日期" />
+ <el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
+ <el-table-column align="center" label="操作">
<template #default>
<el-button link type="primary" size="small">查看</el-button>
</template>
@@ -153,15 +155,15 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检测" name="second">
- <el-button type="primary" @click="openDetect">新增</el-button>
+ <el-button type="primary" size="default" @click="openDetect">新增</el-button>
<el-table :data="tableData" style="width: 100%">
- <el-table-column align="center" prop="date" label="检测人" />
- <el-table-column align="center" prop="name" label="检测日期" />
- <el-table-column align="center" prop="address" label="检测人单位" />
- <el-table-column align="center" prop="address" label="检测内容" />
- <el-table-column align="center" prop="address" label="检测结果" />
- <el-table-column align="center" prop="address" label="检测状态" />
- <el-table-column align="center" prop="address" label="操作">
+ <el-table-column align="center" prop="testPersonId" label="检测人" />
+ <el-table-column align="center" prop="testDate" label="检测日期" />
+ <el-table-column align="center" prop="testPersonDepartmentId" label="检测人单位" />
+ <el-table-column align="center" prop="testMemo" label="检测内容" />
+ <el-table-column align="center" prop="testResult" label="检测结果" />
+ <el-table-column align="center" prop="testStatus" label="检测状态" />
+ <el-table-column align="center" label="操作">
<template #default>
<el-button link type="primary" size="small">查看</el-button>
</template>
@@ -169,32 +171,32 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="third">
- <el-button type="primary" @click="openRepair">新增</el-button>
+ <el-button type="primary" size="default" @click="openRepair">新增</el-button>
<el-table :data="tableData" style="width: 100%">
- <el-table-column align="center" prop="date" label="设施异常项" />
- <el-table-column align="center" prop="name" label="维修状态" />
- <el-table-column align="center" prop="address" label="维修情况" />
- <el-table-column align="center" prop="address" label="维修负责人" />
- <el-table-column align="center" prop="address" label="维修负责人单位" />
- <el-table-column align="center" prop="address" label="维修开始日期" />
- <el-table-column align="center" prop="address" label="维修结束日期" />
- <el-table-column align="center" prop="address" label="操作">
+ <el-table-column align="center" prop="exceptionInfo" label="设施异常项" />
+ <el-table-column align="center" prop="repairStatus" label="维修状态" />
+ <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="repairStartDate" label="维修开始日期" />
+ <el-table-column align="center" prop="repairEndDate" label="维修结束日期" />
+ <el-table-column align="center" label="操作">
<template #default>
<el-button link type="primary" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="检查标准设置" name="fourth">
- <el-button type="primary" @click="openStandard">新增</el-button>
+ <el-tab-pane label="检查标准设置" name="fourth">checkContent
+ <el-button type="primary" size="default" @click="openStandard">新增</el-button>
<el-table :data="tableData" style="width: 100%">
- <el-table-column align="center" type="index" label="序号" width="75" />
- <el-table-column align="center" prop="name" label="检查内容" />
- <el-table-column align="center" prop="address" label="检查指标" />
- <el-table-column align="center" prop="address" label="单位" />
- <el-table-column align="center" prop="address" label="巡检部位" />
- <el-table-column align="center" prop="address" label="频次" />
- <el-table-column align="center" prop="address" label="操作">
+ <el-table-column align="center" type="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="单位" />
+ <el-table-column align="center" prop="checkPart" label="巡检部位" />
+ <el-table-column align="center" prop="rate" label="频次" />
+ <el-table-column align="center" label="操作">
<template #default>
<el-button link type="primary" size="small">查看</el-button>
</template>
@@ -233,8 +235,8 @@
</el-tabs>
<template #footer>
<span class="dialog-footer">
- <el-button @click="dialogVisible = false">关闭</el-button>
- <el-button type="primary" @click="dialogVisible = false">确定</el-button>
+ <el-button @click="resetForm(ruleFormRef)">关闭</el-button>
+ <el-button type="primary" v-if="disabled == true ? false : true" @click="submitForm(titles, ruleFormRef)">确定</el-button>
</span>
</template>
</el-dialog>
@@ -248,7 +250,7 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive } from 'vue';
-import { Search,Plus } from '@element-plus/icons-vue';
+import { Search,Plus,FullScreen, FormInstance, } from '@element-plus/icons-vue';
import categoryDailog from './categoryDailog.vue';
import planDailog from './planDailog.vue';
import maintenanceDailog from './maintenanceDailog.vue';
@@ -258,26 +260,103 @@
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import type { UploadProps, UploadUserFile } from 'element-plus';
+import {releaseDrillPlanApi} from "/@/api/emergencyDrillPlan";
+import {facilityManagementApi} from "/@/api/facilityManagement";
export default defineComponent({
components: { categoryDailog, planDailog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup() {
- const dialogVisible = ref(false);
+ const isShowDialog = ref(false);
const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+ equipmentTypeId: '',
+ treatment: '',
+ inputPersonId: '',
+ departmentId: '',
+ delRepaireDetailList: [],
+ delTestDetailList: [],
+ takecareDetailList: [{
+ leadingPersonId:'',
+ takecareDate:'',
+ leadingPersonDepartmentId:'',
+ equipmentId: '',
+ takecareMemo: '',
+ }],
+ checkDetailList:[],
+ responsibilityPersonId: '',
+ delTakecareStardardeDetailList: [],
+ connectPersonId:'',
+ scenePic:'',
+ partType:'',
+ toDangerous:'',
+ dangerousElement:'',
+ takecareStardardeDetailList: [
+ {
+ filePath: '',
+ }
+ ],
+ testDetailList:[{
+ testMemo:'',
+ testPersonDepartmentId:'',
+ testPersonId:'',
+ testStatus:'',
+ testResult:'',
+ testDate:'',
+ }],
+ checkCycle: '',
+ repaireDetailList:[{
+ repairStatus:'',
+ repairPersonDepartmentId:'',
+ repairMemo:'',
+ infoTpe:'',
+ repairPersonId:'',
+ repairEndDate:'',
+ repairStartDate:'',
+ exceptionInfo:'',
+ }],
+ delCheckStandardeDetailList:[],
+ leadingPersonName: '',
+ name: '',
+ delTakecareDetailList:[],
+ position:'',
+ emergencePlanId: '',
+ checkStandardeDetailList: [{
+ checkContent:'',
+ checkTarget:'',
+ unit:'',
+ checkPart:'',
+ rate:'',
+ indexNum:'',
+ }],
+ delCheckStandardeDetails: '',
+ delTakecareStardardeDetails: '',
+ delTakecareDetails: '',
+ delRepaireDetails: '',
+ delTestDetails: '',
});
const Dailogtype = ref(false);
const openDailog = (type: boolean) => {
- dialogVisible.value = true;
+ isShowDialog.value = true;
Dailogtype.value = type;
};
+ const ruleFormRef = ref<FormInstance>()
const activeName = ref('first');
+ const titles = ref();
+ const disabled = ref();
+ // 打开弹窗
+ const openDialog = (title: string, id: number, type: boolean) => {
+ isShowDialog.value = true;
+ titles.value = title;
+ disabled.value = type;
+ if (title == '查看仪器仪表' || title == '修改仪器仪表') {
+ facilityManagementApi()
+ .getkeypointEquipmentInfoDetail(id)
+ .then((res) => {
+ if (res.data.code == 200) {
+ form.value = res.data.data;
+ }
+ });
+ }
+ };
+
const tableData = [
{
date: '2016-05-03',
@@ -375,8 +454,17 @@
}
return true;
};
+ //全屏
+ const full = ref(false);
+ const toggleFullscreen = () => {
+ if (full.value == false) {
+ full.value = true;
+ }else{
+ full.value = false;
+ }
+ };
return {
- dialogVisible,
+ isShowDialog,
Dailogtype,
form,
openDailog,
@@ -405,7 +493,12 @@
imageUrl,
handleAvatarSuccess,
beforeAvatarUpload,
- Plus
+ Plus,
+ full,
+ toggleFullscreen,
+ FullScreen,
+ ruleFormRef,
+ openDialog,
};
},
});
--
Gitblit v1.9.2