diff --git a/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue new file mode 100644 index 0000000..8dc8b98 --- /dev/null +++ b/src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue @@ -0,0 +1,519 @@ + + + + + diff --git a/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue new file mode 100644 index 0000000..d7c650f --- /dev/null +++ b/src/views/abnormalityAlarm/AGValarm/historicalAGV.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/src/views/abnormalityAlarm/AGValarm/index.vue b/src/views/abnormalityAlarm/AGValarm/index.vue new file mode 100644 index 0000000..59d8ea1 --- /dev/null +++ b/src/views/abnormalityAlarm/AGValarm/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue index 4d5c4fb..8dc8b98 100644 --- a/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue +++ b/src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue @@ -221,6 +221,32 @@ + + + + + + + + 不置顶 + 置顶 + + + + + +
+ 确 定 + 取 消 +
+ + - + {{ formQuery.machineryCode }} - + {{ formQuery.machineryName }} - + {{ formQuery.machineryTypeName }} - + {{ formQuery.warnType }} - + {{ formQuery.message }} - + {{ formQuery.warnTime }} @@ -299,26 +325,7 @@ export default { // 总条数 total: 0, // 设备点检保养项目表格数据 - dvsubjectList: [ - { - machineryCode: 1, - abnormal: 1, - status: "", - top: 0, - }, - { - machineryCode: 2, - abnormal: 1, - status: "", - top: 0, - }, - { - machineryCode: 3, - abnormal: 1, - status: "", - top: 0, - }, - ], + dvsubjectList: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -329,7 +336,6 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - status: 1, }, // 表单参数 form: { @@ -339,6 +345,8 @@ export default { }, // 查看 formQuery: {}, + //置顶弹框 + openTop: false, statusArr: [ { @@ -362,6 +370,7 @@ export default { status: [ { required: true, message: "是否解决不能为空", trigger: "blur" }, ], + top: [{ required: true, message: "是否置顶不能为空", trigger: "blur" }], }, }; }, @@ -374,7 +383,7 @@ export default { this.loading = true; list(this.queryParams).then((response) => { console.log(response); - // this.dvsubjectList = response.rows; + this.dvsubjectList = response.rows; this.total = response.total; this.loading = false; }); @@ -389,12 +398,17 @@ export default { this.openQuery = false; this.reset(); }, + + // 取消按钮 + openopenTop() { + this.openTop = false; + this.reset(); + }, // 表单重置 reset() { this.form = { abnormal: 1, status: "", - top: 0, }; this.autoGenFlag = true; this.resetForm("form"); @@ -435,35 +449,56 @@ export default { }, /** 提交按钮 */ submitForm() { - // this.$refs["form"].validate((valid) => { - // if (valid) { - // edit(this.form).then((response) => { - // if (response.code === 200) { - // this.$notify({ - // title: "处理成功", - // message: response.msg, - // type: "success", - // }); - // this.open = false; - // this.getList(); - // } - // }); - // } - // }); + this.$refs["form"].validate((valid) => { + if (valid) { + edit(this.form).then((response) => { + if (response.code === 200) { + this.$notify({ + title: "处理成功", + message: response.msg, + type: "success", + }); + this.open = false; + this.getList(); + } + }); + } + }); }, /** 置顶操作 */ handleDelete(row) { console.log(row); + this.reset(); + this.openTop = true; + }, + + /** 置顶提交按钮 */ + handleForm() { + this.$refs["form"].validate((valid) => { + if (valid) { + edit(this.form).then((response) => { + if (response.code === 200) { + this.$notify({ + title: "处理成功", + message: response.msg, + type: "success", + }); + this.open = false; + this.getList(); + } + }); + } + }); }, /** 导出按钮操作 */ handleExport() { - // this.download( - // "/cad/code/export", - // { - // ...this.queryParams, - // }, - // `calplan_${new Date().getTime()}.xlsx` - // ); + this.download( + "/cad/code/export", + { + ...this.queryParams, + }, + `calplan_${new Date().getTime()}.xlsx` + ); }, }, }; diff --git a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue index 0d53ab4..d7c650f 100644 --- a/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue +++ b/src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue @@ -233,26 +233,7 @@ export default { // 总条数 total: 0, // 设备点检保养项目表格数据 - dvsubjectList: [ - { - machineryCode: 1, - abnormal: 1, - status: "", - top: 0, - }, - { - machineryCode: 2, - abnormal: 1, - status: "", - top: 0, - }, - { - machineryCode: 3, - abnormal: 1, - status: "", - top: 0, - }, - ], + dvsubjectList: [], // 弹出层标题 title: "", // 查看 @@ -305,7 +286,7 @@ export default { this.loading = true; list(this.queryParams).then((response) => { console.log(response); - // this.dvsubjectList = response.rows; + this.dvsubjectList = response.rows; this.total = response.total; this.loading = false; }); @@ -358,13 +339,13 @@ export default { }, /** 导出按钮操作 */ handleExport() { - // this.download( - // "/cad/code/export", - // { - // ...this.queryParams, - // }, - // `calplan_${new Date().getTime()}.xlsx` - // ); + this.download( + "/cad/code/export", + { + ...this.queryParams, + }, + `calplan_${new Date().getTime()}.xlsx` + ); }, }, }; diff --git a/src/views/abnormalityAlarm/robotic/historicalAlarm.vue b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue new file mode 100644 index 0000000..d7c650f --- /dev/null +++ b/src/views/abnormalityAlarm/robotic/historicalAlarm.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/src/views/abnormalityAlarm/robotic/index.vue b/src/views/abnormalityAlarm/robotic/index.vue new file mode 100644 index 0000000..acc6f00 --- /dev/null +++ b/src/views/abnormalityAlarm/robotic/index.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/abnormalityAlarm/robotic/roboticAlarm.vue b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue new file mode 100644 index 0000000..8dc8b98 --- /dev/null +++ b/src/views/abnormalityAlarm/robotic/roboticAlarm.vue @@ -0,0 +1,519 @@ + + + + +