From 1761aaa0d023dd9c70e9511b3c0bc21053e47a21 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 28 May 2025 17:34:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/index.js | 45 +++++++------------ src/api/superStore/device.js | 17 +++---- src/views/device/{doubleScreen => }/index.vue | 28 ++++++------ src/views/superstore/doubleScreen/index.vue | 25 +++++------ 4 files changed, 49 insertions(+), 66 deletions(-) rename src/views/device/{doubleScreen => }/index.vue (97%) diff --git a/src/api/device/index.js b/src/api/device/index.js index cf3dbe81..1f0f4db2 100644 --- a/src/api/device/index.js +++ b/src/api/device/index.js @@ -4,7 +4,7 @@ import request from '@/utils/request' // 分页查询设备信息 export function getDeviceListPageApi(data) { return request({ - url: '/smart-canteen/doubleScreenMachine/getDoubleScreenMachineList', + url: '/smart-canteen/device_info/list', method: 'get', headers: { "merchant-id":"378915229716713472", @@ -17,7 +17,7 @@ export function getDeviceListPageApi(data) { // 新增设备 export function addDeviceApi(data) { return request({ - url: '/smart-canteen/doubleScreenMachine/insert', + url: '/smart-canteen/device_info/add', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -29,7 +29,7 @@ export function addDeviceApi(data) { // 修改设备信息 export function updateDeviceApi(data) { return request({ - url: '/smart-canteen/doubleScreenMachine/update', + url: '/smart-canteen/device_info/edit', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -38,37 +38,24 @@ export function updateDeviceApi(data) { }) } -// // 删除设备信息 -// export function deleteDeviceApi(data) { -// return request({ -// url: '/smart-canteen/doubleScreenMachine/delete', -// method: 'post', -// headers: { -// "merchant-id":"378915229716713472", -// }, -// data: data -// }) -// } - -export function deleteDeviceApi(deviceId){ - const formData = new FormData() - formData.append('deviceId', deviceId) - return request({ - url: '/smart-canteen/doubleScreenMachine/delete', - method: 'post', - data: formData, - headers: { - "merchant-id":"378915229716713472", - }, - header:'multipart/form-data' - }) +// 删除设备信息 +export function deleteDeviceApi(data) { + return request({ + url: '/smart-canteen/device_info/del/'+data.deviceId, + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) } + // 获取指定日期菜谱计划菜品详情 export function getMenuRecipeDetailApi(data) { return request({ - url: '/smart-canteen/menu_recipe/getDetailByDate', + url: '/smart-canteen/cook_recipe/getRecipeDetailByDate', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -82,7 +69,7 @@ export function getMenuRecipeDetailApi(data) { // 上传APK export function uploadApkApi(data) { return request({ - url: '/smart-canteen/doubleScreenMachine/uploadApk', + url: '/smart-canteen/device_app_version/uploadApk', method: 'post', headers: { "merchant-id":"378915229716713472", diff --git a/src/api/superStore/device.js b/src/api/superStore/device.js index 6ff91182..5bdd1f69 100644 --- a/src/api/superStore/device.js +++ b/src/api/superStore/device.js @@ -15,7 +15,7 @@ export function getSupermarketByAreaApi(data) { // 分页查询设备信息 export function getDeviceListPageApi(data) { return request({ - url: '/smart-canteen/supermarket_device/list', + url: '/smart-canteen/device_info/list', method: 'get', headers: { "merchant-id":"378915229716713472", @@ -28,7 +28,7 @@ export function getDeviceListPageApi(data) { // 新增设备 export function addDeviceApi(data) { return request({ - url: '/smart-canteen/supermarket_device/add', + url: '/smart-canteen/device_info/add', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -40,7 +40,7 @@ export function addDeviceApi(data) { // 修改设备信息 export function updateDeviceApi(data) { return request({ - url: '/smart-canteen/supermarket_device/update', + url: '/smart-canteen/device_info/edit', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -51,18 +51,15 @@ export function updateDeviceApi(data) { // 删除设备信息 - export function deleteDeviceApi(deviceId){ - const formData = new FormData() - formData.append('deviceId', deviceId) + export function deleteDeviceApi(data){ return request({ - url: '/smart-canteen/doubleScreenMachine/delete', + url: '/smart-canteen/device_info/del/'+data.deviceId, method: 'post', - data: formData, headers: { "merchant-id":"378915229716713472", }, - header:'multipart/form-data' - }) + data: data + }) } diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/index.vue similarity index 97% rename from src/views/device/doubleScreen/index.vue rename to src/views/device/index.vue index fcfb7ca5..0b204cc5 100644 --- a/src/views/device/doubleScreen/index.vue +++ b/src/views/device/index.vue @@ -64,7 +64,7 @@ - + - + @@ -159,8 +159,8 @@ - - + + @@ -399,7 +399,7 @@ areaId:null, canteenId:null, stallId:null, - deviceNum:"", + deviceNumber:"", deviceName:"", deviceSn:"", deviceIp:"", @@ -413,7 +413,7 @@ stallOptions2:[],//弹窗-档口下拉选 // 表单校验 baseFormRules: { - deviceNum: [ + deviceNumber: [ { required: true, message: "设备编号不能为空", trigger: "blur" } ], deviceName: [ @@ -422,9 +422,9 @@ deviceSn: [ { required: true, message: "设备Sn不能为空", trigger: "blur" } ], - deviceKey: [ - { required: true, message: "设备Key不能为空", trigger: "blur" } - ], + // deviceKey: [ + // { required: true, message: "设备Key不能为空", trigger: "blur" } + // ], areaId: [ { required: true, message: "所属区域不能为空", trigger: "blur" } ], @@ -579,8 +579,8 @@ "areaId":this.queryParams.areaId, "canteenId":this.queryParams.canteenId, "stallId":this.queryParams.stallId, - "keyWord":this.queryParams.keyWord, - "deviceType":20 + "searchValue":this.queryParams.keyWord, + "deviceType":1 } console.log("param",param) // let str = base64.encode(JSON.stringify(param)) @@ -602,7 +602,7 @@ areaId:null, canteenId:null, stallId:null, - deviceNum:"", + deviceNumber:"", deviceName:"", deviceSn:"", deviceIp:"", @@ -677,7 +677,7 @@ console.log(this.baseForm) this.$refs["baseForm"].validate(valid => { if (valid) { - this.baseForm.deviceType=20 + this.baseForm.deviceType=1 // this.baseForm.metadata=this.metadata if (this.baseForm.deviceId != undefined) { updateDeviceApi(this.baseForm).then(response => { @@ -699,7 +699,7 @@ handleDelete(row) { // const dictIds = row.dictId || this.ids; this.$modal.confirm('是否确认删除数据项？').then(function() { - return deleteDeviceApi(row.deviceId); + return deleteDeviceApi({deviceId:row.deviceId}); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/superstore/doubleScreen/index.vue b/src/views/superstore/doubleScreen/index.vue index 770edace..662dba2c 100644 --- a/src/views/superstore/doubleScreen/index.vue +++ b/src/views/superstore/doubleScreen/index.vue @@ -51,7 +51,7 @@ {{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}} - + @@ -111,8 +111,8 @@ - - + + @@ -265,7 +265,7 @@ stallOptions2:[],//弹窗-档口下拉选 // 表单校验 baseFormRules: { - deviceNum: [ + deviceNumber: [ { required: true, message: "设备编号不能为空", trigger: "blur" } ], deviceName: [ @@ -274,9 +274,9 @@ deviceSn: [ { required: true, message: "设备Sn不能为空", trigger: "blur" } ], - deviceKey: [ - { required: true, message: "设备Key不能为空", trigger: "blur" } - ], + // deviceKey: [ + // { required: true, message: "设备Key不能为空", trigger: "blur" } + // ], areaId: [ { required: true, message: "所属区域不能为空", trigger: "blur" } ], @@ -328,8 +328,8 @@ "pageSize":this.queryParams.pageSize, "areaId":this.queryParams.areaId, "canteenId":this.queryParams.canteenId, - "keyWord":this.queryParams.keyWord, - "deviceType":53 + "searchValue":this.queryParams.keyWord, + "deviceType":2 } getDeviceListPageApi(param).then(response => { this.tableListData = response.rows; @@ -409,7 +409,7 @@ "areaId": this.baseForm.areaId, "canteenId": this.baseForm.canteenId, }] - this.baseForm.deviceType=53 + this.baseForm.deviceType=2 if (this.baseForm.deviceId != undefined) { updateDeviceApi(this.baseForm).then(response => { this.$modal.msgSuccess("修改成功"); @@ -427,10 +427,9 @@ }); }, /** 删除按钮操作 */ - handleDelete(row) { - // const dictIds = row.dictId || this.ids; + handleDelete(row) { this.$modal.confirm('是否确认删除数据项？').then(function() { - return deleteDeviceApi(row.deviceId); + return deleteDeviceApi({deviceId:row.deviceId}); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功");