From 5711a973743510de330ce645201417b064d57718 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 03 八月 2022 17:17:57 +0800
Subject: [PATCH] 对接
---
src/views/goalManagement/safetyAssessment/index.vue | 4 +
src/views/facilityManagement/deviceType/index.vue | 48 +++++++++------
src/views/goalManagement/targetSettings/index.vue | 6 +
src/views/goalManagement/performanceAppraisal/index.vue | 12 ++-
src/views/goalManagement/TargetBook/index.vue | 6 +
src/views/goalManagement/IncentiveRecording/index.vue | 25 ++++----
src/views/facilityManagement/ProductionEquipment/index.vue | 6 +
src/views/goalManagement/Incentivestandard/index.vue | 6 +
src/views/goalManagement/targetDecompositionYear/index.vue | 6 +
src/api/facilityManagement/index.ts | 10 ++-
src/views/facilityManagement/InstrumentationInformation/index.vue | 6 +
src/api/goalManagement/index.ts | 30 ++++++----
src/views/facilityManagement/safetyEquipment/index.vue | 6 +
src/views/goalManagement/targetDecompositionMonth/index.vue | 6 +
14 files changed, 109 insertions(+), 68 deletions(-)
diff --git a/src/api/facilityManagement/index.ts b/src/api/facilityManagement/index.ts
index 4e91751..54f29a4 100644
--- a/src/api/facilityManagement/index.ts
+++ b/src/api/facilityManagement/index.ts
@@ -19,8 +19,9 @@
// 设备设施类型管理 删除
getequipmentTypeMngDelete:(params:any)=>{
return request({
- url:`/equipmentTypeMng/delete?ids=${params}`,
- method:"get"
+ url:`/equipmentTypeMng/delete`,
+ method:"post",
+ data:params
})
},
// 设备设施类型管理 查询树状数据
@@ -48,8 +49,9 @@
// 仪器仪表信息、生产设备设施、安全设备设施 删除
getequipmentInfoDelete:(params:any)=>{
return request({
- url:`/equipmentInfo/delete?ids=${params}`,
- method:"get"
+ url:`/equipmentInfo/delete`,
+ method:"post",
+ data:params
})
},
// 仪器仪表信息、生产设备设施、安全设备设施 分页查询数据
diff --git a/src/api/goalManagement/index.ts b/src/api/goalManagement/index.ts
index 59e9bc1..83745aa 100644
--- a/src/api/goalManagement/index.ts
+++ b/src/api/goalManagement/index.ts
@@ -28,8 +28,9 @@
// 目标设置删除
getTargetMngDelete: (params: any) => {
return request({
- url: `/targetMng/delete?ids=${params}`,
- method: "get",
+ url: `/targetMng/delete`,
+ method: "post",
+ data:params
})
},
// 目标指标分解-新增或者修改数据
@@ -73,8 +74,9 @@
// 目标责任书 删除
gettargetDutyfileInfoDelete: (params: any) => {
return request({
- url: `/targetDutyfileInfo/delete?ids=${params}`,
- method: "get",
+ url: `/targetDutyfileInfo/delete`,
+ method: "post",
+ data:params
})
},
// 奖惩标准设定 分页查询数据
@@ -103,8 +105,9 @@
// 奖惩标准设定 删除
getrewardPunishmentStandardDelete: (params: any) => {
return request({
- url: `/rewardPunishmentStandard/delete?ids=${params}`,
- method: "get",
+ url: `/rewardPunishmentStandard/delete`,
+ method: "post",
+ data:params
})
},
// 奖惩记录 分页查询数据
@@ -133,8 +136,9 @@
// 奖惩记录 删除
getrewardPunishmentDelete: (params: any) => {
return request({
- url: `/rewardPunishmentDetail/delete?ids=${params}`,
- method: "get",
+ url: `/rewardPunishmentDetail/delete`,
+ method: "post",
+ data:params
})
},
// 绩效考核管理 安全考核管理 分页查询数据
@@ -163,8 +167,9 @@
// 绩效考核管理 安全考核管理 删除
getexamineMngDelete: (params: any) => {
return request({
- url: `/examineMng/delete?ids=${params}`,
- method: "get",
+ url: `/examineMng/delete`,
+ method: "post",
+ data:params
})
},
// 绩效考核管理 考核标准设定 分页查询数据
@@ -193,8 +198,9 @@
// 绩效考核管理 考核标准设定 删除
getexamineTemplateDelete: (params: any) => {
return request({
- url: `/examineTemplate/delete?ids=${params}`,
- method: "get",
+ url: `/examineTemplate/delete`,
+ method: "post",
+ data:params
})
},
// 目标汇总 分页查询数据
diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index 55bcddd..e64297f 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -187,6 +187,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -194,7 +196,7 @@
})
.then(() => {
facilityManagementApi()
- .getequipmentInfoDelete(id)
+ .getequipmentInfoDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -224,7 +226,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/facilityManagement/ProductionEquipment/index.vue b/src/views/facilityManagement/ProductionEquipment/index.vue
index ad83ac6..ab8551e 100644
--- a/src/views/facilityManagement/ProductionEquipment/index.vue
+++ b/src/views/facilityManagement/ProductionEquipment/index.vue
@@ -188,6 +188,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -195,7 +197,7 @@
})
.then(() => {
facilityManagementApi()
- .getequipmentInfoDelete(id)
+ .getequipmentInfoDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -225,7 +227,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/facilityManagement/deviceType/index.vue b/src/views/facilityManagement/deviceType/index.vue
index 60afa7e..11958ec 100644
--- a/src/views/facilityManagement/deviceType/index.vue
+++ b/src/views/facilityManagement/deviceType/index.vue
@@ -10,14 +10,14 @@
</el-table-column>
<el-table-column align="center" label="巡检">
<template #default="scope">
- <span v-if="scope.row.isVisit == 0">-</span>
+ <span v-if="scope.row.isVisit == 0">-</span>
<span v-if="scope.row.isVisit == 1">是</span>
<span v-if="scope.row.isVisit == 2">否</span>
</template>
</el-table-column>
<el-table-column align="center" label="检测">
<template #default="scope">
- <span v-if="scope.row.isCheck == 0">-</span>
+ <span v-if="scope.row.isCheck == 0">-</span>
<span v-if="scope.row.isCheck == 1">是</span>
<span v-if="scope.row.isCheck == 2">否</span>
</template>
@@ -40,7 +40,7 @@
import { Plus, View, EditPen, Delete, CirclePlus } from '@element-plus/icons-vue';
import Dailog from './component/Dailog.vue';
import { facilityManagementApi } from '/@/api/facilityManagement';
-import { ElMessage } from 'element-plus';
+import { ElMessage,ElMessageBox } from 'element-plus';
export default defineComponent({
components: { Dailog },
setup() {
@@ -65,23 +65,33 @@
});
// 删除
const Deletes = (id: number) => {
- facilityManagementApi()
- .getequipmentTypeMngDelete(id)
- .then((res) => {
- if (res.data.code == 200) {
- ElMessage({
- showClose: true,
- message: res.data.msg,
- type: 'success',
+ let arr = [];
+ arr.push(id);
+ ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ facilityManagementApi()
+ .getequipmentTypeMngDelete(arr)
+ .then((res) => {
+ if (res.data.code == 200) {
+ ElMessage({
+ showClose: true,
+ message: res.data.msg,
+ type: 'success',
+ });
+ listApi();
+ } else {
+ }
});
- listApi();
- } else {
- // ElMessage({
- // showClose: true,
- // message: res.data.msg,
- // type: 'error',
- // });
- }
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: 'Delete canceled',
+ });
});
};
const add = () => {
diff --git a/src/views/facilityManagement/safetyEquipment/index.vue b/src/views/facilityManagement/safetyEquipment/index.vue
index 66fd3aa..6094bf5 100644
--- a/src/views/facilityManagement/safetyEquipment/index.vue
+++ b/src/views/facilityManagement/safetyEquipment/index.vue
@@ -188,6 +188,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -195,7 +197,7 @@
})
.then(() => {
facilityManagementApi()
- .getequipmentInfoDelete(id)
+ .getequipmentInfoDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -225,7 +227,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/goalManagement/IncentiveRecording/index.vue b/src/views/goalManagement/IncentiveRecording/index.vue
index a2c6909..4d922b1 100644
--- a/src/views/goalManagement/IncentiveRecording/index.vue
+++ b/src/views/goalManagement/IncentiveRecording/index.vue
@@ -41,8 +41,8 @@
<el-table-column property="createTime" align="center" label="奖惩日期" sortable />
<el-table-column label="奖惩类型" align="center" sortable>
<template #default="scope">
- <span v-if="scope.row.standardType==1">奖励</span>
- <span v-if="scope.row.standardType==2">惩罚</span>
+ <span v-if="scope.row.standardType == 1">奖励</span>
+ <span v-if="scope.row.standardType == 2">惩罚</span>
</template>
</el-table-column>
<el-table-column property="personId" align="center" label="被奖惩者" sortable />
@@ -143,6 +143,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -150,7 +152,7 @@
})
.then(() => {
goalManagementApi()
- .getrewardPunishmentDelete(id)
+ .getrewardPunishmentDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -180,7 +182,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -220,14 +222,13 @@
// });
});
};
- const openUser=ref()
- const openSearch=()=>{
- openUser.value.openDailog()
- }
- const userId=(val:any)=>{
- ruleForm.searchParams.personId=val.uid
-
- }
+ const openUser = ref();
+ const openSearch = () => {
+ openUser.value.openDailog();
+ };
+ const userId = (val: any) => {
+ ruleForm.searchParams.personId = val.uid;
+ };
return {
ruleForm,
userId,
diff --git a/src/views/goalManagement/Incentivestandard/index.vue b/src/views/goalManagement/Incentivestandard/index.vue
index 0629074..a8f3fed 100644
--- a/src/views/goalManagement/Incentivestandard/index.vue
+++ b/src/views/goalManagement/Incentivestandard/index.vue
@@ -144,6 +144,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -151,7 +153,7 @@
})
.then(() => {
goalManagementApi()
- .getrewardPunishmentStandardDelete(id)
+ .getrewardPunishmentStandardDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -181,7 +183,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr;
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/goalManagement/TargetBook/index.vue b/src/views/goalManagement/TargetBook/index.vue
index 96cb180..77e4cf1 100644
--- a/src/views/goalManagement/TargetBook/index.vue
+++ b/src/views/goalManagement/TargetBook/index.vue
@@ -137,6 +137,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -144,7 +146,7 @@
})
.then(() => {
goalManagementApi()
- .gettargetDutyfileInfoDelete(id)
+ .gettargetDutyfileInfoDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -174,7 +176,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index 9b38832..6d756d8 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -201,6 +201,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -208,7 +210,7 @@
})
.then(() => {
goalManagementApi()
- .getexamineMngDelete(id)
+ .getexamineMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -238,7 +240,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
@@ -342,6 +344,8 @@
};
// 删除
const onDeletes = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -349,7 +353,7 @@
})
.then(() => {
goalManagementApi()
- .getexamineTemplateDelete(id)
+ .getexamineTemplateDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -379,7 +383,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAlls.value = arr.toString();
+ deletAlls.value = arr;
if (val.length == 1) {
warnings.value = false;
dangers.value = false;
diff --git a/src/views/goalManagement/safetyAssessment/index.vue b/src/views/goalManagement/safetyAssessment/index.vue
index a932c15..4925e9b 100644
--- a/src/views/goalManagement/safetyAssessment/index.vue
+++ b/src/views/goalManagement/safetyAssessment/index.vue
@@ -127,6 +127,8 @@
};
// 删除
const onDelete = (id: number) => {
+ var arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -134,7 +136,7 @@
})
.then(() => {
goalManagementApi()
- .getTargetMngDelete(id)
+ .getTargetMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
diff --git a/src/views/goalManagement/targetDecompositionMonth/index.vue b/src/views/goalManagement/targetDecompositionMonth/index.vue
index 2828635..09e743f 100644
--- a/src/views/goalManagement/targetDecompositionMonth/index.vue
+++ b/src/views/goalManagement/targetDecompositionMonth/index.vue
@@ -142,6 +142,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -149,7 +151,7 @@
})
.then(() => {
goalManagementApi()
- .getTargetMngDelete(id)
+ .getTargetMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -179,7 +181,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/goalManagement/targetDecompositionYear/index.vue b/src/views/goalManagement/targetDecompositionYear/index.vue
index 9d282fb..b4d29b8 100644
--- a/src/views/goalManagement/targetDecompositionYear/index.vue
+++ b/src/views/goalManagement/targetDecompositionYear/index.vue
@@ -140,6 +140,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -147,7 +149,7 @@
})
.then(() => {
goalManagementApi()
- .getTargetMngDelete(id)
+ .getTargetMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -177,7 +179,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
warning.value = false;
danger.value = false;
diff --git a/src/views/goalManagement/targetSettings/index.vue b/src/views/goalManagement/targetSettings/index.vue
index 0653f49..332afd8 100644
--- a/src/views/goalManagement/targetSettings/index.vue
+++ b/src/views/goalManagement/targetSettings/index.vue
@@ -153,6 +153,8 @@
};
// 删除
const onDelete = (id: number) => {
+ let arr=[]
+ arr.push(id)
ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -160,7 +162,7 @@
})
.then(() => {
goalManagementApi()
- .getTargetMngDelete(id)
+ .getTargetMngDelete(arr)
.then((res) => {
if (res.data.code == 200) {
ElMessage({
@@ -190,7 +192,7 @@
for (let i = 0; i < valId.length; i++) {
arr.push(valId[i].id);
}
- deletAll.value = arr.toString();
+ deletAll.value = arr
if (val.length == 1) {
// warning.value = false;
danger.value = false;
--
Gitblit v1.9.2