From 223944ea3408666f2bcbc016854853ba27915548 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 18 五月 2022 15:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 2 --
src/views/safetyproduction/gojudging.vue | 3 ---
src/views/safetyproduction/new.vue | 3 ---
src/views/safetyproduction/checklist.vue | 1 -
4 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 89a65cd..e25e617 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -209,13 +209,11 @@
methods: {
alarmMajorEquipmentErt(){
majorEquipmentErt().then(res=>{
- console.log(res)
this.equipmentName=res.data.result
})
},
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
- console.log(res);
if (res.data.code == 200) {
this.list = res.data.result.records;
this.recordTotal = res.data.result.total
diff --git a/src/views/safetyproduction/checklist.vue b/src/views/safetyproduction/checklist.vue
index f89104c..50966ff 100644
--- a/src/views/safetyproduction/checklist.vue
+++ b/src/views/safetyproduction/checklist.vue
@@ -412,7 +412,6 @@
this.listQuery.filter.elementB = data.value;
safetyInspectionItemList(this.listQuery).then((res) => {
this.list = res.data.result.records;
- console.log(123,this.list)
});
}
},
diff --git a/src/views/safetyproduction/gojudging.vue b/src/views/safetyproduction/gojudging.vue
index c561318..67f708e 100644
--- a/src/views/safetyproduction/gojudging.vue
+++ b/src/views/safetyproduction/gojudging.vue
@@ -178,7 +178,6 @@
})
.then(() => {
safetySelfInspectionFinish({ id: this.id }).then((res) => {
- console.log(123, res);
if (res.data.code === "200") {
this.$notify({
title: "成功",
@@ -213,7 +212,6 @@
arr[i].child.points = arr[i].child.point;
}
this.lists = arr;
- console.log("tag", arr);
});
},
checkSameDataA(resData) {
@@ -246,7 +244,6 @@
dataInfo[elementBName].child.push(item);
});
let list = Object.values(dataInfo); // list 转换成功的数据
- // console.log("数据",list)
for (var i = 0; i < list.length; i++) {
var pot = list[i].points;
for (var j = 0; j < list[i].child.length; j++) {
diff --git a/src/views/safetyproduction/new.vue b/src/views/safetyproduction/new.vue
index cb0e53c..f0c84be 100644
--- a/src/views/safetyproduction/new.vue
+++ b/src/views/safetyproduction/new.vue
@@ -234,7 +234,6 @@
safetyInspectionItemId: "",
}
arr[i].child[j].deductionList= arr[i].child[j].selfDeductionList
- console.log(arr[i].child[j])
capB.safetySelfInspectionId=arr[i].child[j].safetySelfInspectionId
capB.safetyInspectionItemId=arr[i].child[j].safetyInspectionItemId
cser.push(capB)
@@ -393,7 +392,6 @@
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.id == "添加") {
- console.log("添加",this.form)
safetySelfInspectionAdd(this.form).then((res) => {
if (res.data.code == 200) {
this.dialogVisible = false;
@@ -409,7 +407,6 @@
}
});
} else if (this.id == "编辑") {
- console.log('编辑',this.form)
safetySelfInspectionMod(this.form).then((res) => {
this.dialogVisible = false;
this.$notify({
--
Gitblit v1.9.2