From a3ff86d0726ce9bdbb7fa7167e01a3037137e7d7 Mon Sep 17 00:00:00 2001
From: 13937891274 <kxc0822>
Date: 星期三, 10 八月 2022 15:47:52 +0800
Subject: [PATCH] 对接
---
src/views/facilityManagement/keyEquipment/index.vue | 25 ++++++------
src/components/equipmentDailog/DailogS.vue | 41 ++++++++++++--------
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/src/components/equipmentDailog/DailogS.vue b/src/components/equipmentDailog/DailogS.vue
index b3008e1..78eae39 100644
--- a/src/components/equipmentDailog/DailogS.vue
+++ b/src/components/equipmentDailog/DailogS.vue
@@ -132,13 +132,13 @@
</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.memo" 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" size="default" @click="openMaintenance('新增', '')">新增</el-button>
+ <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="保养负责人" />
@@ -146,15 +146,15 @@
<el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
<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" :disabled="disabled">查看</el-button>
+ <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
+ <el-button link type="primary" @click="deleteA(scope.row)" size="small" :disabled="disabled">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检测" name="second">
- <el-button type="primary" size="default" @click="openDetect('新增', '')">新增</el-button>
+ <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-column align="center" prop="testDate" :formatter="timeDate" label="检测日期" />
@@ -164,15 +164,15 @@
<el-table-column align="center" prop="testStatus" label="检测状态" />
<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" :disabled="disabled">查看</el-button>
+ <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
+ <el-button link type="primary" @click="deleteB(scope.row)" size="small" :disabled="disabled">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="third">
- <el-button type="primary" size="default" @click="openRepair('新增', '')">新增</el-button>
+ <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="维修状态" />
@@ -183,15 +183,15 @@
<el-table-column align="center" prop="repairEndDate" :formatter="timeDate" label="维修结束日期" />
<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" :disabled="disabled">查看</el-button>
+ <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
+ <el-button link type="primary" @click="deleteC(scope.row)" size="small" :disabled="disabled">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="检查标准设置" name="fourth">
- <el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
+ <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="checkContent" label="检查内容" />
@@ -201,9 +201,9 @@
<el-table-column align="center" prop="rate" label="频次" />
<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" :disabled="disabled">查看</el-button>
+ <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
+ <el-button link type="primary" @click="deleteD(scope.row)" size="small" :disabled="disabled">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -303,6 +303,7 @@
toDangerous: '',
dangerousElement: '',
+ memo:'',
takecareStardardeDetailList: [
{
@@ -339,10 +340,12 @@
});
const ruleFormRef = ref<FormInstance>();
const titles = ref();
+ const titleT = ref();
const disabled = ref(false);
const Dailogtype = ref(false);
const openDailog = (title: string, type: boolean, id: number, num: any) => {
dialogVisible.value = true;
+ titleT.value = title;
department();
Dailogtype.value = type;
if (num == 0) {
@@ -375,6 +378,9 @@
form.value.delRepaireDetails = deleteCId.value.toString();
form.value.delCheckStandardeDetails = deleteDId.value.toString();
dialogVisible.value = false;
+ if (titleT.value == '新建') {
+ delete form.value.id;
+ }
facilityManagementApi()
.getkeypointEquipmentInfoAddOrUpdate(form.value)
.then((res) => {
@@ -642,6 +648,7 @@
deleteC,
deleteD,
timeDate,
+ titleT,
};
},
});
diff --git a/src/views/facilityManagement/keyEquipment/index.vue b/src/views/facilityManagement/keyEquipment/index.vue
index 3627137..d6cb0cb 100644
--- a/src/views/facilityManagement/keyEquipment/index.vue
+++ b/src/views/facilityManagement/keyEquipment/index.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="4">
<el-form-item size="default">
- <el-input v-model="ruleForm.searchParams.qName" placeholder="装置/部位名称" />
+ <el-input v-model="ruleForm.qName" placeholder="装置/部位名称" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -27,7 +27,7 @@
<div class="btns">
<div>
<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="warning" type="warning" plain :icon="EditPen">修改</el-button>-->
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
<div>
@@ -83,7 +83,7 @@
</template>
</el-table-column>
<el-table-column property="equipmentTypeId" align="center" label="类型/类别外键" sortable />
- <el-table-column property="qName" align="center" label="装置/部位名称" sortable />
+ <el-table-column property="name" align="center" label="装置/部位名称" sortable />
<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 />
@@ -142,18 +142,19 @@
pageIndex: 1,
searchParams: {
// equipmentTypeId: '', ////类型/类别外键
- qName: '', ////装置/部位名称
+ // qName: '', ////装置/部位名称
// departmentId: '',////所属部门
// position: '', ////具体位置
// leadingPersonName: '', ////负责人姓名
// connectPersonId: '',////装置部位分类
// infoTpe: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
- typeId:''
+ equipmentTypeId:''
},
});
// 重置
const resetForm = () => {
- ruleForm.searchParams.qName = '';
+ ruleForm.qName = '';
+ ruleForm.searchParams.equipmentTypeId = '';
listApi();
};
const listApi = () => {
@@ -223,7 +224,7 @@
};
const handleNodeClick = (data: Tree) => {
console.log(data)
- ruleForm.searchParams.typeId = data.id;
+ ruleForm.searchParams.equipmentTypeId = data.id;
listApi();
};
@@ -263,7 +264,7 @@
});
};
// 批量删除
- const warning = ref(true);
+ // const warning = ref(true);
const danger = ref(true);
const deletAll = ref();
const handleSelectionChange = (val: any) => {
@@ -274,13 +275,13 @@
}
deletAll.value = arr;
if (val.length == 1) {
- warning.value = false;
+ // warning.value = false;
danger.value = false;
} else if (val.length == 0) {
- warning.value = true;
+ // warning.value = true;
danger.value = true;
} else {
- warning.value = true;
+ // warning.value = true;
danger.value = false;
}
};
@@ -360,7 +361,7 @@
currentPage4,
pageSize4,
onDelete,
- warning,
+ // warning,
handleSelectionChange,
onDeleteAll,
handleNodeClick,
--
Gitblit v1.9.2