From 25a7e88099b329ec2081d1d4e1f0bd73d1c25a11 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期一, 08 八月 2022 18:06:59 +0800
Subject: [PATCH] 页面修改
---
src/views/facilityManagement/keyEquipment/index.vue | 2
src/components/equipmentDailog/DailogS.vue | 431 +++++++++++++++++++++++++++--------------------------
2 files changed, 224 insertions(+), 209 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index ff4fe8f..749925a 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -40,7 +40,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="联系人" size="default">
- <el-input v-model="form.connectPersonId" placeholder="请选择">
+ <el-input v-model="form.connectPersonName" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser(0)"></el-button>
</template>
@@ -51,7 +51,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="录入人" size="default">
- <el-input v-model="form.inputPersonId" placeholder="请选择">
+ <el-input v-model="form.inputPersonName" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser(1)"></el-button>
</template>
@@ -60,7 +60,7 @@
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="责任人" size="default">
- <el-input v-model="form.responsibilityPersonId" placeholder="请选择">
+ <el-input v-model="form.responsibilityPersonName" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openUser(2)"></el-button>
</template>
@@ -148,8 +148,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
- <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small">修改</el-button>
- <el-button link type="primary" @click="deleteA(scope.row)" size="small">删除</el-button>
+ <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteA(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -166,8 +166,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
- <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small">修改</el-button>
- <el-button link type="primary" @click="deleteB(scope.row)" size="small">删除</el-button>
+ <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteB(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -185,14 +185,13 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
- <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small">修改</el-button>
- <el-button link type="primary" @click="deleteC(scope.row)" size="small">删除</el-button>
+ <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteC(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="检查标准设置" name="fourth"
- >
+ <el-tab-pane label="检查标准设置" name="fourth">
<el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
<el-table :data="form.checkStandardeDetailList" style="width: 100%">
<el-table-column align="center" type="indexNum" label="序号" width="75" />
@@ -204,8 +203,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
- <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small">修改</el-button>
- <el-button link type="primary" @click="deleteD(scope.row)" size="small">删除</el-button>
+ <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteD(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -249,7 +248,9 @@
</el-dialog>
<categoryDailog ref="categoryShow"></categoryDailog>
<RegionsDialog ref="planShow" @SearchUser="onUser"></RegionsDialog>
- <DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser>
+ <DailogSearchUser ref="UserOneShow" @SearchUser="userId"></DailogSearchUser>
+<!-- <DailogSearchUser ref="UserTwoShow" @SearchUser="userId"></DailogSearchUser>-->
+<!-- <DailogSearchUser ref="UserThreeShow" @SearchUser="userId"></DailogSearchUser>-->
<maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
<detectDailog ref="detectShow" @onDelect="delect"></detectDailog>
<repairDailog ref="repairShow" @onRepair="Repair"></repairDailog>
@@ -258,7 +259,7 @@
<script lang="ts">
import { defineComponent, ref } from 'vue';
import { Search, Plus, FullScreen } from '@element-plus/icons-vue';
-import {timeDate} from '/@/assets/index.ts'
+import { timeDate } from '/@/assets/index.ts';
import categoryDailog from './categoryDailog.vue';
import RegionsDialog from '../../views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/regionsDialog.vue';
import maintenanceDailog from './maintenanceDailog.vue';
@@ -269,7 +270,7 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
-import {goalManagementApi} from "/@/api/goalManagement";
+import { goalManagementApi } from '/@/api/goalManagement';
export default defineComponent({
components: { categoryDailog, RegionsDialog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup(props, { emit }) {
@@ -280,7 +281,7 @@
treatment: '',
inputPersonId: '',
-
+ inputPersonName:'',
departmentId: '',
delRepaireDetailList: [],
@@ -288,148 +289,170 @@
delTestDetailList: [],
takecareDetailList: [],
- checkDetailList: [],
+ checkDetailList: [],
- responsibilityPersonId: '',
+ responsibilityPersonId: '',
+ responsibilityPersonName:'',
+ delTakecareStardardeDetailList: [],
- delTakecareStardardeDetailList: [],
+ connectPersonId: '',
+ connectPersonName:'',
- connectPersonId: '',
+ scenePic: '',
- scenePic: '',
+ partType: '',
- partType: '',
+ toDangerous: '',
- toDangerous: '',
+ dangerousElement: '',
- dangerousElement: '',
-
- takecareStardardeDetailList: [
+ takecareStardardeDetailList: [
{
filePath: '',
},
],
- testDetailList: [],
- checkCycle: '',
- repaireDetailList: [],
- delCheckStandardeDetailList: [],
+ testDetailList: [],
+ checkCycle: '',
+ repaireDetailList: [],
+ delCheckStandardeDetailList: [],
- leadingPersonName: '',
+ leadingPersonName: '',
- name: '',
+ name: '',
delTakecareDetailList: [],
- position: '',
+ position: '',
- emergencePlanId: '',
+ emergencePlanId: '',
- checkStandardeDetailList: [],
- infoTpe: '',
- delCheckStandardeDetails: '',
+ checkStandardeDetailList: [],
+ infoTpe: '',
+ delCheckStandardeDetails: '',
- delTakecareStardardeDetails: '',
+ delTakecareStardardeDetails: '',
- delTakecareDetails: '',
+ delTakecareDetails: '',
- delRepaireDetails: '',
+ delRepaireDetails: '',
- delTestDetails: '',
+ delTestDetails: '',
});
- const titles = ref();
- const disabled = ref(false);
- const Dailogtype = ref(false);
+ const titles = ref();
+ const disabled = ref(false);
+ const Dailogtype = ref(false);
const openDailog = (title: string, type: boolean, id: number, num: any) => {
dialogVisible.value = true;
- department();
+ department();
Dailogtype.value = type;
- if (num == 0) {
- titles.value = `${title}仪表信息`;
- form.value.infoTpe = num;
- } else if (num == 1) {
- titles.value = `${title}设备设施`;
- form.value.infoTpe = num;
- } else if (num == 2) {
- titles.value = `${title}设备设施`;
- form.value.infoTpe = num;
- }
+ if (num == 0) {
+ titles.value = `${title}仪表信息`;
+ form.value.infoTpe = num;
+ } else if (num == 1) {
+ titles.value = `${title}设备设施`;
+ form.value.infoTpe = num;
+ } else if (num == 2) {
+ titles.value = `${title}设备设施`;
+ form.value.infoTpe = num;
+ }
- disabled.value = title == '查看' ? true : false;
- if (title == '查看' || title == '修改')
- facilityManagementApi()
- .getkeypointEquipmentInfoDetail(id)
- .then((res) => {
- if (res.data.code == 200) {
- form.value = res.data.data;
- } else {
- ElMessage.error(res.data.msg);
- }
- });
+ disabled.value = title == '查看' ? true : false;
+ if (title == '查看' || title == '修改')
+ facilityManagementApi()
+ .getkeypointEquipmentInfoDetail(id)
+ .then((res) => {
+ if (res.data.code == 200) {
+ form.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
};
- // 提交
- const submitForm = () => {
- form.value.delTakecareDetails =deleteAId.value.toString()
- form.value.delTestDetails =deleteBId.value.toString()
- form.value.delRepaireDetails =deleteCId.value.toString()
- form.value.delCheckStandardeDetails =deleteDId.value.toString()
- dialogVisible.value = false;
- facilityManagementApi()
- .getkeypointEquipmentInfoAddOrUpdate(form.value)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- message: res.data.msg,
- type: 'success',
- });
- emit('navAddorUpdata');
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- // form.value = null;
- };
- // 取消
- const resetForm = () => {
- dialogVisible.value = false;
- };
+ // 提交
+ const submitForm = () => {
+ form.value.delTakecareDetails = deleteAId.value.toString();
+ form.value.delTestDetails = deleteBId.value.toString();
+ form.value.delRepaireDetails = deleteCId.value.toString();
+ form.value.delCheckStandardeDetails = deleteDId.value.toString();
+ dialogVisible.value = false;
+ facilityManagementApi()
+ .getkeypointEquipmentInfoAddOrUpdate(form.value)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ emit('navAddorUpdata');
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ // form.value = null;
+ };
+ // 取消
+ const resetForm = () => {
+ dialogVisible.value = false;
+ };
const activeName = ref('first');
- const index = ref<any>();
- const categoryShow = ref();
- const opencategory = () => {
- categoryShow.value.openDailog();
- };
+ const index = ref<any>();
+ const categoryShow = ref();
+ const opencategory = () => {
+ categoryShow.value.openDailog();
+ };
- // 应急预案弹窗
+ // 应急预案弹窗
const planShow = ref();
const openPlan = () => {
planShow.value.openDailog();
};
- const onUser = (e:any) => {
- form.value.emergencePlanId=e.id
- };
+ const onUser = (e: any) => {
+ form.value.emergencePlanId = e.id;
+ };
- const UserShow = ref();
- const openUser = (type: any) => {
- UserShow.value.openDailog(type);
+ const UserOneShow = ref();
+ // const UserTwoShow = ref();
+ // const UserThreeShow = ref();
+ const openUser = (type: number) => {
+ // if (type == 0) {
+ // UserOneShow.value.openDailog();
+ // } else if (type == 1) {
+ // UserTwoShow.value.openDailog();
+ // } else if (type == 2) {
+ // UserThreeShow.value.openDailog();
+ // }
+ UserOneShow.value.openDailog();
+ };
+ const userId = ( type: number,val: any) => {
+ if (type == 0) {
+ form.value.connectPersonId = val.uid;
+ form.value.connectPersonName = val.realName;
+ } else if (type == 1) {
+ form.value.inputPersonId = val.uid;
+ form.value.inputPersonName = val.username;
+ } else if (type == 2) {
+ form.value.responsibilityPersonId = val.id;
+ form.value.responsibilityPersonName = val.username;
+ }
};
const maintenanceShow = ref();
const openMaintenance = (title: string, data: any) => {
- index.value = form.value.takecareDetailList.indexOf(data);
+ index.value = form.value.takecareDetailList.indexOf(data);
maintenanceShow.value.openDailog(title, data);
};
const detectShow = ref();
const openDetect = (title: string, data: any) => {
- index.value = form.value.testDetailList.indexOf(data);
+ index.value = form.value.testDetailList.indexOf(data);
detectShow.value.openDailog(title, data);
};
const repairShow = ref();
const openRepair = (title: string, data: any) => {
- index.value = form.value.repaireDetailList.indexOf(data);
+ index.value = form.value.repaireDetailList.indexOf(data);
repairShow.value.openDailog(title, data);
};
const standardShow = ref();
const openStandard = (title: string, data: any) => {
- index.value = form.value.checkStandardeDetailList.indexOf(data);
+ index.value = form.value.checkStandardeDetailList.indexOf(data);
standardShow.value.openDailog(title, data);
};
// 上传
@@ -462,56 +485,56 @@
() => false
);
};
- const deleteAId = ref([]);
- const deleteBId = ref([]);
- const deleteCId = ref([]);
- const deleteDId = ref([]);
- // 删除
- const deleteA = (tag: any) => {
- form.value.takecareDetailList.splice(form.value.takecareDetailList.indexOf(tag), 1);
- deleteAId.value.push(tag.id);
- };
- const deleteB = (tag: any) => {
- form.value.testDetailList.splice(form.value.testDetailList.indexOf(tag), 1);
- deleteBId.value.push(tag.id);
- };
- const deleteC = (tag: any) => {
- form.value.repaireDetailList.splice(form.value.repaireDetailList.indexOf(tag), 1);
- deleteCId.value.push(tag.id);
- };
- const deleteD = (tag: any) => {
- form.value.checkStandardeDetailList.splice(form.value.checkStandardeDetailList.indexOf(tag), 1);
- deleteDId.value.push(tag.id);
- };
- // 回传
- const main = (val: any) => {
- if (index.value == -1) {
- form.value.takecareDetailList.push(val);
- } else {
- form.value.takecareDetailList[index.value] = val;
- }
- };
- const delect = (val: any) => {
- if (index.value == -1) {
- form.value.testDetailList.push(val);
- } else {
- form.value.testDetailList[index.value] = val;
- }
- };
- const Repair= (val:any)=>{
- if (index.value == -1) {
- form.value.repaireDetailList.push(val);
- } else {
- form.value.repaireDetailList[index.value] = val;
- }
- }
- const Stand=(val:any)=>{
- if (index.value == -1) {
- form.value.checkStandardeDetailList.push(val);
- } else {
- form.value.checkStandardeDetailList[index.value] = val;
- }
- }
+ const deleteAId = ref([]);
+ const deleteBId = ref([]);
+ const deleteCId = ref([]);
+ const deleteDId = ref([]);
+ // 删除
+ const deleteA = (tag: any) => {
+ form.value.takecareDetailList.splice(form.value.takecareDetailList.indexOf(tag), 1);
+ deleteAId.value.push(tag.id);
+ };
+ const deleteB = (tag: any) => {
+ form.value.testDetailList.splice(form.value.testDetailList.indexOf(tag), 1);
+ deleteBId.value.push(tag.id);
+ };
+ const deleteC = (tag: any) => {
+ form.value.repaireDetailList.splice(form.value.repaireDetailList.indexOf(tag), 1);
+ deleteCId.value.push(tag.id);
+ };
+ const deleteD = (tag: any) => {
+ form.value.checkStandardeDetailList.splice(form.value.checkStandardeDetailList.indexOf(tag), 1);
+ deleteDId.value.push(tag.id);
+ };
+ // 回传
+ const main = (val: any) => {
+ if (index.value == -1) {
+ form.value.takecareDetailList.push(val);
+ } else {
+ form.value.takecareDetailList[index.value] = val;
+ }
+ };
+ const delect = (val: any) => {
+ if (index.value == -1) {
+ form.value.testDetailList.push(val);
+ } else {
+ form.value.testDetailList[index.value] = val;
+ }
+ };
+ const Repair = (val: any) => {
+ if (index.value == -1) {
+ form.value.repaireDetailList.push(val);
+ } else {
+ form.value.repaireDetailList[index.value] = val;
+ }
+ };
+ const Stand = (val: any) => {
+ if (index.value == -1) {
+ form.value.checkStandardeDetailList.push(val);
+ } else {
+ form.value.checkStandardeDetailList[index.value] = val;
+ }
+ };
//图片提交
const imageUrl = ref('');
@@ -531,34 +554,24 @@
return true;
};
- const userId = (val: any, type: number) => {
- console.log(val, type);
- if (type == 0) {
- form.value.connectPersonId = val.uid;
- } else if (type == 1) {
- form.value.inputPersonId = val.uid;
- } else if (type == 2){
- form.value.responsibilityPersonId = val.uid;
- }
- };
- //部门树
- const department = () => {
- goalManagementApi()
- .getTreedepartment()
- .then((res) => {
- if (res.data.code == 200) {
- data.value = res.data.data;
- } else {
- ElMessage.error(res.data.msg);
- }
- });
- };
- const propse = {
- label: 'depName',
- children: 'children',
- value: 'depId',
- };
- const data = ref();
+ //部门树
+ const department = () => {
+ goalManagementApi()
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
+ };
+ const propse = {
+ label: 'depName',
+ children: 'children',
+ value: 'depId',
+ };
+ const data = ref();
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -569,26 +582,28 @@
}
};
return {
- propse,
- data,
+ propse,
+ data,
submitForm,
dialogVisible,
Dailogtype,
form,
openDailog,
Search,
- main,
- delect,
- Repair,
- Stand,
- index,
+ main,
+ delect,
+ Repair,
+ Stand,
+ index,
activeName,
categoryShow,
opencategory,
planShow,
- onUser,
+ onUser,
openPlan,
- UserShow,
+ UserOneShow,
+ // UserTwoShow,
+ // UserThreeShow,
openUser,
maintenanceShow,
openMaintenance,
@@ -597,14 +612,14 @@
repairShow,
openRepair,
standardShow,
- userId,
+ userId,
openStandard,
fileList,
handleRemove,
handlePreview,
handleExceed,
- disabled,
- titles,
+ disabled,
+ titles,
beforeRemove,
imageUrl,
handleAvatarSuccess,
@@ -614,15 +629,15 @@
toggleFullscreen,
FullScreen,
resetForm,
- deleteAId,
- deleteBId,
- deleteCId,
- deleteDId,
- deleteA,
- deleteB,
- deleteC,
- deleteD,
- timeDate,
+ deleteAId,
+ deleteBId,
+ deleteCId,
+ deleteDId,
+ deleteA,
+ deleteB,
+ deleteC,
+ deleteD,
+ timeDate,
};
},
});
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 52374a7..7e987d6 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>
--
Gitblit v1.9.2