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 | 14 +++++--
src/views/contingencyManagement/panManagement/index.vue | 2 +
src/views/contingencyManagement/panManagement/component/openAdd.vue | 42 +++++++++++++++------
src/components/equipmentDailog/DailogS.vue | 54 ++++++++++++++++-----------
4 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index 829e3d5..b3008e1 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -5,16 +5,16 @@
<el-row>
<el-col :span="11">
<el-form-item label="类型/类别外键" size="default" prop="equipmentTypeId">
- <el-input v-model="form.equipmentTypeId" placeholder="请选择">
+ <el-input v-model="form.equipmentTypeName" placeholder="请选择">
<template #append>
- <el-button :icon="Search" @click="opencategory" disabled></el-button>
+ <el-button :icon="Search" @click="opencategory"></el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="装置/部位名称" size="default">
- <el-input v-model="form.name" placeholder="请选择" />
+ <el-input v-model="form.name" placeholder="请填写装置/部位名称" />
</el-form-item>
</el-col>
</el-row>
@@ -72,21 +72,21 @@
<el-col :span="11">
<el-form-item label="装置部位分类" size="default">
<el-select v-model="form.partType" placeholder="请选择" style="width: 100%">
- <el-option label="关键装置" value="关键装置" />
- <el-option label="重点部位" value="重点部位" />
+ <el-option label="关键装置" value="1" />
+ <el-option label="重点部位" value="2" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="检查周期" size="default">
- <el-input v-model="form.checkCycle" placeholder="请选择检查周期" />
+ <el-input v-model="form.checkCycle" placeholder="请填写检查周期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="相关应急预案" size="default">
- <el-input v-model="form.emergencePlanId" placeholder="请选择">
+ <el-input v-model="form.emergencePlanName" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openPlan"></el-button>
</template>
@@ -95,21 +95,20 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="主要危险有害因素" size="default">
- <el-input v-model="form.dangerousElement" placeholder="请选择" />
+ <el-input v-model="form.dangerousElement" placeholder="请填写主要危险有害因素" />
</el-form-item>
</el-col>
</el-row>
-
<el-row>
<el-col :span="11">
<el-form-item label="易导致风险" size="default">
- <el-input v-model="form.toDangerous" placeholder="请选择易导致风险" />
+ <el-input v-model="form.toDangerous" placeholder="请填写易导致风险" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="应急处置措施" size="default">
- <el-input v-model="form.treatment" placeholder="请选择应急处置措施" />
+ <el-input v-model="form.treatment" placeholder="请填写应急处置措施" />
</el-form-item>
</el-col>
</el-row>
@@ -133,7 +132,7 @@
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="备注信息" size="default"> <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>
@@ -246,7 +245,7 @@
</span>
</template>
</el-dialog>
- <categoryDailog ref="categoryShow"></categoryDailog>
+ <categoryDailog ref="categoryShow" @typeId="Tid"></categoryDailog>
<RegionsDialog ref="planShow" @SearchUser="onUser"></RegionsDialog>
<DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser>
<maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
@@ -269,13 +268,14 @@
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
+import {deepClone} from '/@/utils/other'
export default defineComponent({
components: { categoryDailog, RegionsDialog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup(props, { emit }) {
const dialogVisible = ref(false);
const form = ref({
equipmentTypeId: 1,
-
+ equipmentTypeName:"",
treatment: '',
inputPersonId: '',
@@ -322,7 +322,8 @@
position: '',
- emergencePlanId: '',
+ emergencePlanId: '',
+ emergencePlanName:'',
checkStandardeDetailList: [],
infoTpe: '',
@@ -407,6 +408,7 @@
};
const onUser = (e: any) => {
form.value.emergencePlanId = e.id;
+ form.value.emergencePlanName=e.name
};
const UserShow = ref();
@@ -425,6 +427,10 @@
form.value.responsibilityPersonName = val.realName;
}
};
+ const Tid=(data:any)=>{
+ form.value.equipmentTypeId=data.id
+ form.value.equipmentTypeName=data.typeName
+ }
const maintenanceShow = ref();
const openMaintenance = (title: string, data: any) => {
index.value = form.value.takecareDetailList.indexOf(data);
@@ -497,28 +503,32 @@
deleteDId.value.push(tag.id);
};
// 回传
- const main = (val: any) => {
+ const main = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.takecareDetailList.push(val);
} else {
form.value.takecareDetailList[index.value] = val;
}
};
- const delect = (val: any) => {
+ const delect = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.testDetailList.push(val);
} else {
form.value.testDetailList[index.value] = val;
}
};
- const Repair = (val: any) => {
+ const Repair = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.repaireDetailList.push(val);
} else {
form.value.repaireDetailList[index.value] = val;
}
};
- const Stand = (val: any) => {
+ const Stand = (data: any) => {
+ let val=deepClone(data)
if (index.value == -1) {
form.value.checkStandardeDetailList.push(val);
} else {
@@ -526,9 +536,8 @@
}
};
const rules = reactive<FormRules>({
- equipmentTypeId: {
-
- }
+ equipmentTypeId: [],
+ equipmentTypeName:[],
})
//图片提交
const imageUrl = ref('');
@@ -622,6 +631,7 @@
full,
toggleFullscreen,
FullScreen,
+ Tid,
resetForm,
deleteAId,
deleteBId,
diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue
index c1cf6c0..d6ba777 100644
--- a/src/views/contingencyManagement/panManagement/component/openAdd.vue
+++ b/src/views/contingencyManagement/panManagement/component/openAdd.vue
@@ -15,12 +15,14 @@
v-model="ruleForm.responsibleDepartment"
:data="newTreeList"
class="w100"
- :props="propse"
clearable
+ :props="propse"
multiple
:render-after-expand="false"
- show-checkbox
+ check-strictly
+ check-on-click-node
placeholder="请选择"
+ @change="changeDepartment"
/>
<el-divider />
</el-form-item>
@@ -127,7 +129,8 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
- <el-button size="default" type="primary" v-if="disabled == true ? false : true" @click="submitForm(titles, ruleFormRef)">确定</el-button>
+ <el-button size="default" type="primary" v-if="disabled == true ? false : true"
+ @click="submitForm(titles, ruleFormRef)">确定</el-button>
</span>
</template>
</el-dialog>
@@ -193,12 +196,17 @@
.seeEmergencyTeam(id)
.then((res) => {
if (res.data.code == 200) {
- ruleForm.value = res.data.data;
- let arr = [];
- for (let i = 0; i < ruleForm.value.teamList.length; i++) {
- arr.push(ruleForm.value.teamList[i].teamName);
- }
- ruleForm.value.teamName = arr.toString();
+ ruleForm.value = res.data.data;
+ let arr = [];
+ ruleForm.value.responsibleDepartment = []
+ for (let i = 0; i < ruleForm.value.teamList.length; i++) {
+ arr.push(ruleForm.value.teamList[i].teamName);
+ }
+ for (let i = 0; i < ruleForm.value.deptList.length; i++) {
+ ruleForm.value.responsibleDepartment.push(ruleForm.value.deptList[i].departmentId);
+ }
+ console.log(ruleForm.value.responsibleDepartment)
+ ruleForm.value.teamName = arr.toString();
}
});
}
@@ -245,6 +253,16 @@
onMounted(() => {
department();
});
+ const changeDepartment = (e) => {
+ var temList = []
+ for(var a = 0;a<e.length;a++){
+ temList.push({
+ departmentId:e[a]
+ })
+ }
+ ruleForm.value.deptList = temList
+ console.log(ruleForm)
+ }
//定义树形下拉框
const responsibleDepartment = ref();
const data = ref();
@@ -350,8 +368,7 @@
for (let i = 0; i < val.length; i++) {
arr.push(val[i].teamName);
ruleForm.value.teamList.push({
- userUid: val[i].uid,
- teamName: val[i].teamName,
+ teamId: val[i].id,
});
}
ruleForm.value.teamName = arr.toString();
@@ -410,7 +427,8 @@
ruleForm,
resetForm,
onUser,
- newTreeList
+ newTreeList,
+ changeDepartment
};
},
});
diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue
index 5667b4b..b2f1627 100644
--- a/src/views/contingencyManagement/panManagement/index.vue
+++ b/src/views/contingencyManagement/panManagement/index.vue
@@ -439,10 +439,12 @@
// 分页改变
const onHandleSizeChange = (val: number) => {
listQuery.pageSize = val;
+ onSubmit();
};
// 分页未改变
const onHandleCurrentChange = (val: number) => {
listQuery.pageIndex = val;
+ onSubmit();
};
// const router=useRouter()
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 7e987d6..3627137 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -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>
@@ -136,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:''
},
});
// 重置
@@ -217,7 +223,7 @@
};
const handleNodeClick = (data: Tree) => {
console.log(data)
- ruleForm.searchParams.qName = data.typeName;
+ ruleForm.searchParams.typeId = data.id;
listApi();
};
--
Gitblit v1.9.2