Merge remote-tracking branch 'origin/master' into master
| | |
| | | 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 |
| | |
| | | this.listQuery.filter.elementB = data.value; |
| | | safetyInspectionItemList(this.listQuery).then((res) => { |
| | | this.list = res.data.result.records; |
| | | console.log(123,this.list) |
| | | }); |
| | | } |
| | | }, |
| | |
| | | }) |
| | | .then(() => { |
| | | safetySelfInspectionFinish({ id: this.id }).then((res) => { |
| | | console.log(123, res); |
| | | if (res.data.code === "200") { |
| | | this.$notify({ |
| | | title: "成功", |
| | |
| | | arr[i].child.points = arr[i].child.point; |
| | | } |
| | | this.lists = arr; |
| | | console.log("tag", arr); |
| | | }); |
| | | }, |
| | | checkSameDataA(resData) { |
| | |
| | | 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++) { |
| | |
| | | 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) |
| | |
| | | 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; |
| | |
| | | } |
| | | }); |
| | | } else if (this.id == "编辑") { |
| | | console.log('编辑',this.form) |
| | | safetySelfInspectionMod(this.form).then((res) => { |
| | | this.dialogVisible = false; |
| | | this.$notify({ |