From 93d8e06559819ce53d23bdb2cb1a454a1368019f Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Fri, 20 Jun 2025 15:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=8E=A8=E6=88=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/kitchen/environment.js | 17 +-- .../devicesManage/deviesRecord/index.vue | 12 +- .../kitchen/environment/alarmRecord/index.vue | 138 +++++------------- .../environment/environmentMonitor/index.vue | 92 +----------- .../kitchen/foodSafety/sampleManage/index.vue | 81 +--------- .../kitchen/foodSafety/sampleRecord/index.vue | 81 +--------- .../staffManage/morningCheck/index.vue | 87 +---------- .../kitchen/staffManage/violation/index.vue | 92 +----------- .../wasteManage/wasteDetails/index.vue | 116 ++++----------- .../wasteManage/wasteGarbage/index.vue | 109 +++----------- .../wasteManage/wasteSummary/index.vue | 99 +++---------- 11 files changed, 119 insertions(+), 805 deletions(-) diff --git a/src/api/kitchen/environment.js b/src/api/kitchen/environment.js index b850931f..8f4cd5e5 100644 --- a/src/api/kitchen/environment.js +++ b/src/api/kitchen/environment.js @@ -12,19 +12,4 @@ export function getKitchenDeviceSensorRecordListApi(data) { pageSize:data.pageSize } }) -} - - - -// 查询留样柜操作记录列表 -export function getKitchenSampleCabinetRecordListApi(data) { - return request({ - url: '/smart-canteen/kitchen_sample_cabinet_record/list', - method: 'post', - data: data, - params:{ - pageNum:data.pageNum, - pageSize:data.pageSize - } - }) -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/kitchen/devicesManage/deviesRecord/index.vue b/src/views/kitchen/devicesManage/deviesRecord/index.vue index 5ca3664d..954323ce 100644 --- a/src/views/kitchen/devicesManage/deviesRecord/index.vue +++ b/src/views/kitchen/devicesManage/deviesRecord/index.vue @@ -51,17 +51,7 @@ :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" - /> - - - - - -
- 确 定 - 取 消 -
- + /> diff --git a/src/views/kitchen/environment/alarmRecord/index.vue b/src/views/kitchen/environment/alarmRecord/index.vue index 1d0ad04d..14860704 100644 --- a/src/views/kitchen/environment/alarmRecord/index.vue +++ b/src/views/kitchen/environment/alarmRecord/index.vue @@ -11,13 +11,20 @@ - - + + + + + + + + + + + + + + 搜索 @@ -36,11 +43,11 @@ - - - - - + + + + + - - - - - -
- 确 定 - 取 消 -
- + /> @@ -85,32 +82,15 @@ export default { //表格数据 tableListData: [], activeName:'5', - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, - canteenName: undefined, - areaNameStr: undefined, - }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - } + pageSize: 10 + }, }; }, created() { - // this.getList(); + this.getList(); }, methods: { /** 搜索按钮操作 */ @@ -133,70 +113,24 @@ export default { let param = { "deviceCategory": this.activeName, "pageNum": this.queryParams.pageNum, - "pageSize": this.queryParams.pageSize, + "pageSize": this.queryParams.pageSize, + "deviceType": null, } - getKitchenSampleCabinetRecordListApi(param).then(response => { + if(this.activeName==1){ + param.deviceType = null; + } + if(this.activeName==5&&this.queryParams.deviceType5){ + param.deviceType = this.queryParams.deviceType5; + } + if(this.activeName==6&&this.queryParams.deviceType6){ + param.deviceType = this.queryParams.deviceType6; + } + getKitchenDeviceSensorRecordListApi(param).then(response => { this.tableListData = response.rows; this.total = Number(response.total); this.loading = false; }); - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } }; diff --git a/src/views/kitchen/environment/environmentMonitor/index.vue b/src/views/kitchen/environment/environmentMonitor/index.vue index 2d12ebcd..41af9f4f 100644 --- a/src/views/kitchen/environment/environmentMonitor/index.vue +++ b/src/views/kitchen/environment/environmentMonitor/index.vue @@ -21,15 +21,6 @@ - @@ -42,8 +33,8 @@ - - + + { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } }; diff --git a/src/views/kitchen/foodSafety/sampleManage/index.vue b/src/views/kitchen/foodSafety/sampleManage/index.vue index a088d711..8ef02b84 100644 --- a/src/views/kitchen/foodSafety/sampleManage/index.vue +++ b/src/views/kitchen/foodSafety/sampleManage/index.vue @@ -94,16 +94,6 @@ @pagination="getList" /> - - - - -
- 确 定 - 取 消 -
- - @@ -145,20 +135,9 @@ export default { canteenName: undefined, areaNameStr: undefined, }, - activeName:"1", - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - }, + activeName:"1", dialogVisible:false,//图片弹窗 - dialogImageUrl:"",//图片弹窗 + dialogImageUrl:"",//图片弹窗 }; }, created() { @@ -207,62 +186,6 @@ export default { this.total = Number(response.total); this.loading = false; }); - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); }, openImg(row) { this.dialogImageUrl = row.imageUrl; diff --git a/src/views/kitchen/foodSafety/sampleRecord/index.vue b/src/views/kitchen/foodSafety/sampleRecord/index.vue index 63845b4d..c34eeddb 100644 --- a/src/views/kitchen/foodSafety/sampleRecord/index.vue +++ b/src/views/kitchen/foodSafety/sampleRecord/index.vue @@ -45,17 +45,7 @@ :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" - /> - - - - - -
- 确 定 - 取 消 -
- + /> @@ -92,17 +82,6 @@ export default { canteenName: undefined, areaNameStr: undefined, }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - } }; }, created() { @@ -128,63 +107,7 @@ export default { this.total = Number(response.total); this.loading = false; }); - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } }; diff --git a/src/views/kitchen/staffManage/morningCheck/index.vue b/src/views/kitchen/staffManage/morningCheck/index.vue index 971fff97..defc6ea5 100644 --- a/src/views/kitchen/staffManage/morningCheck/index.vue +++ b/src/views/kitchen/staffManage/morningCheck/index.vue @@ -70,17 +70,7 @@ - - - - - - -
- 确 定 - 取 消 -
- + @@ -106,27 +96,12 @@ export default { total: 0, //表格数据 tableListData: [], - postOptions: [], - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, + postOptions: [], // 查询参数 queryParams: { pageNum: 1, pageSize: 10 }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - }, dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 }; @@ -173,63 +148,7 @@ export default { openVideo(row){ this.dialogImageUrl = row.checkVideoUrl; this.dialogVisible = true; - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } }; diff --git a/src/views/kitchen/staffManage/violation/index.vue b/src/views/kitchen/staffManage/violation/index.vue index 61a057fb..7f11fe3c 100644 --- a/src/views/kitchen/staffManage/violation/index.vue +++ b/src/views/kitchen/staffManage/violation/index.vue @@ -27,15 +27,6 @@ - @@ -67,16 +58,6 @@ - - - - - -
- 确 定 - 取 消 -
- @@ -102,10 +83,6 @@ export default { total: 0, //表格数据 tableListData: [], - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, // 查询参数 queryParams: { pageNum: 1, @@ -113,17 +90,6 @@ export default { canteenName: undefined, areaNameStr: undefined, }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - }, dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 }; @@ -160,63 +126,7 @@ export default { openImg(row) { this.dialogImageUrl = row.imgUrl; this.dialogVisible = true; - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } }; diff --git a/src/views/kitchen/wasteManage/wasteDetails/index.vue b/src/views/kitchen/wasteManage/wasteDetails/index.vue index 2b147daa..0d580f4d 100644 --- a/src/views/kitchen/wasteManage/wasteDetails/index.vue +++ b/src/views/kitchen/wasteManage/wasteDetails/index.vue @@ -1,11 +1,13 @@ - + + + - - + + + + - - - - - -
- 确 定 - 取 消 -
+ + @@ -71,10 +79,6 @@ export default { total: 0, //表格数据 tableListData: [], - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, // 查询参数 queryParams: { pageNum: 1, @@ -82,17 +86,8 @@ export default { canteenName: undefined, areaNameStr: undefined, }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - } + dialogVisible:false,//图片弹窗 + dialogImageUrl:"",//图片弹窗 }; }, created() { @@ -113,7 +108,7 @@ export default { getList() { this.loading = true; let param = { - "mealTimeType": this.queryParams.mealTimeType, + "mealtimeType": this.queryParams.mealtimeType, "pageNum": this.queryParams.pageNum, "pageSize": this.queryParams.pageSize, } @@ -123,62 +118,11 @@ export default { this.loading = false; }); }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + openImg(row) { + this.dialogImageUrl = row.fileUrl; + this.dialogVisible = true; }, + } }; diff --git a/src/views/kitchen/wasteManage/wasteGarbage/index.vue b/src/views/kitchen/wasteManage/wasteGarbage/index.vue index ca607c41..fc980e39 100644 --- a/src/views/kitchen/wasteManage/wasteGarbage/index.vue +++ b/src/views/kitchen/wasteManage/wasteGarbage/index.vue @@ -5,7 +5,9 @@ - + + + @@ -24,18 +26,20 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - + + + - - - - + + - - + + - - - - -
- 确 定 - 取 消 -
- + @@ -90,10 +86,6 @@ export default { total: 0, //表格数据 tableListData: [], - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, // 查询参数 queryParams: { pageNum: 1, @@ -101,17 +93,6 @@ export default { canteenName: undefined, areaNameStr: undefined, }, - // 表单参数 - form: {}, - // 表单校验 - rules: { - // canteenName: [ - // { required: true, message: "字典名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "字典类型不能为空", trigger: "blur" } - // ] - }, dialogVisible:false,//图片弹窗 dialogImageUrl:"",//图片弹窗 }; @@ -143,62 +124,6 @@ export default { this.total = Number(response.total); this.loading = false; }); - }, - /** 新增按钮操作 */ - handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; - }, - /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - // const dictId = row.dictId || this.ids - // getType(dictId).then(response => { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); }, openImg(row) { this.dialogImageUrl = row.scenePicture; diff --git a/src/views/kitchen/wasteManage/wasteSummary/index.vue b/src/views/kitchen/wasteManage/wasteSummary/index.vue index 8e884df9..ffe7634a 100644 --- a/src/views/kitchen/wasteManage/wasteSummary/index.vue +++ b/src/views/kitchen/wasteManage/wasteSummary/index.vue @@ -1,11 +1,13 @@ - + + + - - + + { - // this.form = response.data; - this.open = true; - this.title = "修改"; - // }); - }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, - /** 提交按钮 */ - submitForm: function() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.dictId != undefined) { - // updateType(this.form).then(response => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.getList(); - // }); - } else { - // addType(this.form).then(response => { - // this.$modal.msgSuccess("新增成功"); - // this.open = false; - // this.getList(); - // }); - } - } - }); - }, - /** 删除按钮操作 */ - handleDelete(row) { - const dictIds = row.dictId || this.ids; - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return delType(dictIds); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } } };