bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理

This commit is contained in:
zzyuan 2025-05-28 17:34:55 +08:00
parent 11ddf2a511
commit 1761aaa0d0
4 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/api/device/index.js
View File

@ -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",

17
src/api/superStore/device.js
View File

@ -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
})
}

28
src/views/device/doubleScreen/index.vue → src/views/device/index.vue
View File

@ -64,7 +64,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tableListData" height="800">
<el-table-column label="设备编号" align="center" prop="deviceNum" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="设备编号" align="center" prop="deviceNumber" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="180" fixed="left"/>
<el-table-column label="当前菜谱" align="center" prop="recipeName" :show-overflow-tooltip="true" width="180">
<!-- <template slot-scope="scope">
@ -117,7 +117,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title+'双屏消费机'" :visible.sync="open" width="700px" append-to-body>
<el-dialog :title="title+'设备'" :visible.sync="open" width="700px" append-to-body>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<!-- 基础设置 -->
<el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;">
@ -159,8 +159,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="deviceNum">
<el-input v-model="baseForm.deviceNum" placeholder="请输入设备编号" maxlength="30" clearable/>
<el-form-item label="设备编号" prop="deviceNumber">
<el-input v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -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("删除成功");

25
src/views/superstore/doubleScreen/index.vue
View File

@ -51,7 +51,7 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="设备编号" align="center" prop="deviceNum" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="设备编号" align="center" prop="deviceNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="设备Sn码" align="center" prop="deviceSn" :show-overflow-tooltip="true"/>
<el-table-column label="设备Mac码" align="center" prop="deviceMac" :show-overflow-tooltip="true"/>
@ -111,8 +111,8 @@
<el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="设备编号" prop="deviceNum">
<el-input v-model="baseForm.deviceNum" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
<el-form-item label="设备编号" prop="deviceNumber">
<el-input v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -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("删除成功");