zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：硬件管理

Browse Source
This commit is contained in:
dzc committed 2025-01-11 15:53:42 +08:00
1 parent 5f757796c8
commit 087d49c6ac
7 files changed
+654 -604
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/utils/formatMoney.ts
+11 -11
View File
@@ -1,21 +1,21 @@
/**
* 显示价格把分转换到元
* @param price
* @returns
* @param price
* @returns
*/
export function displayPrice(price: any, suffix: string = "元") {
if (typeof price === 'undefined') return '0.0' + suffix
const parsedNumber = typeof price === 'string' ? parseFloat(price) : price
return (parsedNumber / 100.0).toFixed(1) + suffix
export function displayPrice(price: any, suffix: string = "元", fixed = 1) {
if (typeof price === "undefined") return "0.0" + suffix
const parsedNumber = typeof price === "string" ? parseFloat(price) : price
return (parsedNumber / 100.0).toFixed(fixed) + suffix
}
/**
* 把显示价格改为分
* @param price
* @returns
* @param price
* @returns
*/
export const storePrice = (num: number | string | undefined) => {
if (typeof num === 'undefined') return 0
const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
if (typeof num === "undefined") return 0
const parsedNumber = typeof num === "string" ? parseFloat(num) : num
return Math.round(parsedNumber * 100)
}
}
src/views/admin/system/user/face-manage.vue
+115 -110
View File
@@ -1,56 +1,61 @@
<template>
<div class="system-user-dialog-container">
<el-dialog :close-on-click-modal="false" title="人脸管理" draggable v-model="dialogVisible">
<el-button icon="folder-add" type="primary" @click="addFace">
新增
</el-button>
<div class="h-4" />
<el-table v-loading="state.loading" :data="state.dataList" row-key="userId" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle">
<el-table-column prop="username" align="center" label="用户名" />
<el-table-column prop="date" align="center" label="人脸">
<template #default="{ row }">
<preview-image :src="row.faceImg" />
</template>
</el-table-column>
<el-table-column prop="address" align="center" label="操作">
<template #default="{ row }">
<el-button link type="primary" @click="editFace(row)">
<Icon icon="ep:edit" />修改
</el-button>
<el-button link type="danger" @click="delFace(row)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="submitForm" type="primary">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</el-dialog>
<el-dialog v-model="uploadDialogVisible" :close-on-click-modal="false" :title="faceUploadTitle" width="30%"
@close="uploadDialogClone">
<el-form v-loading="formLoading" ref="formRef" :model="formData" :rules="formRules" label-width="80px">
<el-form-item label="人脸" prop="uploadFace">
<upload-img v-model:image-url="formData.uploadFace" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitFace" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="uploadDialogVisible = false">取 消</el-button>
</template>
</el-dialog>
</div>
<div class="system-user-dialog-container">
<el-dialog :close-on-click-modal="false" title="人脸管理" draggable v-model="dialogVisible">
<el-button icon="folder-add" type="primary" @click="addFace"> 新增 </el-button>
<div class="h-4" />
<el-table
v-loading="state.loading"
:data="state.dataList"
row-key="userId"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column prop="username" align="center" label="用户名" />
<el-table-column prop="date" align="center" label="人脸">
<template #default="{ row }">
<preview-image :src="row.faceImg" />
</template>
</el-table-column>
<el-table-column prop="address" align="center" label="操作">
<template #default="{ row }">
<el-button link type="primary" @click="editFace(row)"> <Icon icon="ep:edit" />修改 </el-button>
<el-button link type="danger" @click="delFace(row)"> 删除 </el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="submitForm" type="primary">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</el-dialog>
<el-dialog
v-model="uploadDialogVisible"
:close-on-click-modal="false"
:title="faceUploadTitle"
width="30%"
@close="uploadDialogClone"
>
<el-form v-loading="formLoading" ref="formRef" :model="formData" :rules="formRules" label-width="80px">
<el-form-item label="人脸" prop="uploadFace">
<upload-img v-model:image-url="formData.uploadFace" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitFace" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="uploadDialogVisible = false">取 消</el-button>
</template>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="face-manage">
import { BasicTableProps, useTable } from '/@/hooks/table';
import { BasicTableProps, useTable } from "/@/hooks/table"
import * as userFaceApi from "/@/api/admin/userFace"
import { useMessage } from '/@/hooks/message';
import { useMessage } from "/@/hooks/message"
// 定义刷新表格emit
const emit = defineEmits(['refresh']);
const emit = defineEmits(["refresh"])
// 定义变量内容
const formRef = ref()
@@ -64,101 +69,101 @@ const formLoading = ref(false)
const faceTableLoading = ref(false)
const formData = ref<any>({
id: undefined,
uploadFace: undefined,
id: undefined,
uploadFace: undefined,
})
const detailId = ref<any>(null)
// 定义表格查询、后台调用的API
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {
deptId: '',
username: '',
phone: '',
},
pageList: userFaceApi.pageJoin,
});
queryForm: {
deptId: "",
username: "",
phone: "",
},
pageList: userFaceApi.pageJoin,
})
const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
const formRules = reactive({
uploadFace: [{ required: true, message: '请上传人脸', trigger: 'blur' }],
uploadFace: [{ required: true, message: "请上传人脸", trigger: "blur" }],
})
const submitForm = async () => {
dialogVisible.value = false
emit('refresh')
dialogVisible.value = false
emit("refresh")
}
const addFace = (row: any) => {
faceUploadTitle.value = "上传人脸"
formData.value.uploadFace = ""
uploadDialogVisible.value = true
faceUploadTitle.value = "上传人脸"
formData.value.uploadFace = ""
uploadDialogVisible.value = true
}
const editFace = (row: any) => {
faceUploadTitle.value = "修改人脸"
formData.value.id = row.id
formData.value.uploadFace = row.faceImg
uploadDialogVisible.value = true
faceUploadTitle.value = "修改人脸"
formData.value.id = row.id
formData.value.uploadFace = row.faceImg
uploadDialogVisible.value = true
}
const delFace = async (row: any) => {
try {
await useMessage().delConfirm('是否删除人脸?')
userFaceApi.delObjs(row.id)
useMessage().success("删除成功")
getDataList()
} catch (error) {
console.log(error);
}
try {
await useMessage().delConfirm("是否删除人脸?")
userFaceApi.delObjs([row.id])
useMessage().success("删除成功")
getDataList()
} catch (error) {
console.log(error)
}
}
const openDialog = async (id: number) => {
if (!id) return;
dialogVisible.value = true
resetForm()
detailId.value = id
getDataList()
if (!id) return
dialogVisible.value = true
resetForm()
detailId.value = id
getDataList()
}
const submitFace = async () => {
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
formLoading.value = true
const pa: any = {
userId: detailId.value,
faceImg: formData.value.uploadFace,
}
if (faceUploadTitle.value == "修改人脸") {
pa.id = formData.value.id
}
try {
const fc = faceUploadTitle.value == "上传人脸" ? userFaceApi.addObj : userFaceApi.putObj
await fc(pa)
useMessage().success("操作成功")
uploadDialogClone()
getDataList()
} catch (error) {
console.log(error);
} finally {
formLoading.value = false
}
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
formLoading.value = true
const pa: any = {
userId: detailId.value,
faceImg: formData.value.uploadFace,
}
if (faceUploadTitle.value == "修改人脸") {
pa.id = formData.value.id
}
try {
const fc = faceUploadTitle.value == "上传人脸" ? userFaceApi.addObj : userFaceApi.putObj
await fc(pa)
useMessage().success("操作成功")
uploadDialogClone()
getDataList()
} catch (error) {
console.log(error)
} finally {
formLoading.value = false
}
}
const uploadDialogClone = () => {
uploadDialogVisible.value = false
resetForm()
uploadDialogVisible.value = false
resetForm()
}
const resetForm = () => {
formData.value = {
id: undefined,
uploadFace: undefined,
}
formRef.value?.resetFields()
formData.value = {
id: undefined,
uploadFace: undefined,
}
formRef.value?.resetFields()
}
defineExpose({ openDialog })
</script>
defineExpose({ openDialog })
</script>
src/views/hard/hard-manager/face-form.vue
+80 -83
View File
@@ -1,114 +1,111 @@
<template>
<el-dialog title="人脸sdk设置" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px"
v-loading="loading">
<el-row :gutter="24">
<el-dialog title="人脸sdk设置" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="人脸appId" prop="faceAppId">
<el-input v-model="form.faceAppId" placeholder="请输入人脸appId" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="人脸appId" prop="faceAppId">
<el-input v-model="form.faceAppId" placeholder="请输入人脸appId" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="人脸sdkKey" prop="faceSdkKey">
<el-input v-model="form.faceSdkKey" placeholder="请输入人脸sdkKey" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="人脸sdkKey" prop="faceSdkKey">
<el-input v-model="form.faceSdkKey" placeholder="请输入人脸sdkKey" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="人脸activeKey" prop="faceActiveKey">
<el-input v-model="form.faceActiveKey" placeholder="请输入人脸activeKey" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
<el-col :span="24" class="mb20">
<el-form-item label="人脸activeKey" prop="faceActiveKey">
<el-input v-model="form.faceActiveKey" placeholder="请输入人脸activeKey" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="face-form">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/hard/hard-manager'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/hard/hard-manager"
import { rule } from "/@/utils/validate"
const emit = defineEmits(["refresh"])
// 定义变量内容
const dataFormRef = ref();
const dataFormRef = ref()
const visible = ref(false)
const loading = ref(false)
// 提交表单数据
const form = reactive<any>({
id: undefined,
faceAppId: undefined,
faceSdkKey: undefined,
faceActiveKey: undefined,
});
id: undefined,
faceAppId: undefined,
faceSdkKey: undefined,
faceActiveKey: undefined,
})
// 定义校验规则
const dataRules = ref({
faceAppId: [{ required: true, message: '请输入人脸appId', trigger: 'blur' }],
faceSdkKey: [{ required: true, message: '请输入人脸sdkKey', trigger: 'blur' }],
faceActiveKey: [{ required: true, message: '请输入人脸activeKey', trigger: 'blur' }],
faceAppId: [{ required: true, message: "请输入人脸appId", trigger: "blur" }],
faceSdkKey: [{ required: true, message: "请输入人脸sdkKey", trigger: "blur" }],
faceActiveKey: [{ required: true, message: "请输入人脸activeKey", trigger: "blur" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
visible.value = true
form.id = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields()
})
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
};
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
form.id ? await putObj(form) : await addObj(form)
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 初始化表单数据
const gethardManagerData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 获取数据
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data)
})
.finally(() => {
loading.value = false
})
}
// 暴露变量
defineExpose({
openDialog
});
</script>
openDialog,
})
</script>
src/views/hard/hard-manager/form.vue
+81 -82
View File
@@ -1,115 +1,114 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="设备名" prop="name">
<el-input v-model="form.name" placeholder="请输入设备名" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="设备名" prop="name">
<el-input v-model="form.name" placeholder="请输入设备名" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" placeholder="请选择商户" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-mch v-model="form.merchantId" placeholder="请选择商户" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="设备类型" prop="type">
<dict-select v-model="form.type" dict-code="hard_type" clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
<el-col :span="24" class="mb20">
<el-form-item label="设备类型" prop="type">
<dict-select v-model="form.type" dict-code="hard_type" clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="HardManagerDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/hard/hard-manager'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/hard/hard-manager"
import { rule } from "/@/utils/validate"
const emit = defineEmits(["refresh"])
// 定义变量内容
const dataFormRef = ref();
const dataFormRef = ref()
const visible = ref(false)
const loading = ref(false)
// 定义字典
// 提交表单数据
const form = reactive({
id: '',
merchantId: '',
deptId: '',
name: '',
type: '',
});
id: "",
merchantId: "",
deptId: "",
name: "",
type: "",
})
// 定义校验规则
const dataRules = ref({
name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
merchantId: [{ required: true, message: '商户不能为空', trigger: 'change' }],
type: [{ required: true, message: '设备类型不能为空', trigger: 'change' }],
name: [{ required: true, message: "设备名不能为空", trigger: "blur" }],
merchantId: [{ required: true, message: "商户不能为空", trigger: "change" }],
type: [{ required: true, message: "设备类型不能为空", trigger: "change" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
visible.value = true
form.id = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields()
})
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
};
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
form.id ? await putObj(form) : await addObj(form)
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 初始化表单数据
const gethardManagerData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 获取数据
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data)
})
.finally(() => {
loading.value = false
})
}
// 暴露变量
defineExpose({
openDialog
});
</script>
openDialog,
})
</script>
src/views/hard/hard-manager/index.vue
+164 -133
View File
@@ -1,104 +1,141 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24">
<el-col :span="4">
<el-form-item class="w100" label="设备名" prop="name">
<el-input v-model="state.queryForm.name" placeholder="设备名" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="设备类型" prop="type">
<dict-select v-model="state.queryForm.type" dict-code="hard_type" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="商户" prop="merchantIds">
<select-mch v-model="state.queryForm.merchantIds" />
</el-form-item>
</el-col>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
}}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
</el-form-item>
</el-row>
</el-form>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'hard_hardManager_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardManager_del'"
@click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'hard_hardManager_export'" @exportExcel="exportExcel"
class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="name" label="设备名" />
<el-table-column prop="type" label="设备类型">
<template #default="{ row }">
<dict-tag :options="hard_type" :value="row.type" />
</template>
</el-table-column>
<el-table-column prop="merchantName" label="商户" />
<el-table-column prop="deptName" label="部门" />
<el-table-column prop="uniqueCode" label="设备唯一编号" />
<el-table-column prop="mainTopic" width="200" label="topic" />
<el-table-column prop="isTakeFood" width="200" label="是否为当前商户的取餐机器">
<template #default="{ row }">
<el-switch v-if="row.type == 1" :loading="switchTakeFoodLoading" active-text="是" inactive-text="否"
active-value="1" inactive-value="0" v-model="row.isTakeFood" @change="changeTakeFood($event, row)" />
<div v-else>只有食堂需要设置</div>
</template>
</el-table-column>
<el-table-column prop="createTime" width="200" label="创建时间" />
<el-table-column label="操作" fixed="right" width="400">
<template #default="{ row }">
<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardManager_edit'"
@click="formDialogRef.openDialog(row.id)">编辑</el-button>
<el-button icon="TrendCharts" link type="primary" @click="mqformDialogRef.openDialog(row.id)">
mq设置
</el-button>
<el-button icon="SetUp" link type="primary" @click="faceFormDialogRef.openDialog(row.id)">
人脸sdk设置
</el-button>
<el-button icon="delete" text type="primary" v-auth="'hard_hardManager_del'"
@click="handleDelete([row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24">
<el-col :span="4">
<el-form-item class="w100" label="设备名" prop="name">
<el-input v-model="state.queryForm.name" placeholder="设备名" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="设备类型" prop="type">
<dict-select v-model="state.queryForm.type" dict-code="hard_type" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="商户" prop="merchantIds">
<select-mch v-model="state.queryForm.merchantIds" />
</el-form-item>
</el-col>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
</el-form-item>
</el-row>
</el-form>
<el-row>
<div class="mb8" style="width: 100%">
<el-button
icon="folder-add"
type="primary"
class="ml10"
@click="formDialogRef.openDialog()"
v-auth="'hard_hardManager_add'"
>
新 增
</el-button>
<el-button
plain
:disabled="multiple"
icon="Delete"
type="primary"
v-auth="'hard_hardManager_del'"
@click="handleDelete(selectObjs)"
>
删除
</el-button>
<right-toolbar
v-model:showSearch="showSearch"
:export="'hard_hardManager_export'"
@exportExcel="exportExcel"
class="ml10 mr20"
style="float: right"
@queryTable="getDataList"
></right-toolbar>
</div>
</el-row>
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="name" width="200" label="设备名" />
<el-table-column prop="type" width="100" label="设备类型">
<template #default="{ row }">
<dict-tag :options="hard_type" :value="row.type" />
</template>
</el-table-column>
<el-table-column prop="merchantName" width="100" label="商户" />
<el-table-column prop="deptName" width="100" label="部门" />
<el-table-column prop="uniqueCode" width="200" label="设备唯一编号" />
<el-table-column prop="mainTopic" width="350" label="topic" />
<el-table-column prop="isTakeFood" width="200" label="是否为当前商户的取餐机器">
<template #default="{ row }">
<el-switch
v-if="row.type == 1"
:loading="switchTakeFoodLoading"
active-text="是"
inactive-text="否"
active-value="1"
inactive-value="0"
v-model="row.isTakeFood"
@change="changeTakeFood($event, row)"
/>
<div v-else>只有超市需要设置</div>
</template>
</el-table-column>
<el-table-column prop="createTime" width="200" label="创建时间" />
<el-table-column label="操作" fixed="right" width="400">
<template #default="{ row }">
<el-button
icon="edit-pen"
text
type="primary"
v-auth="'hard_hardManager_edit'"
@click="formDialogRef.openDialog(row.id)"
>编辑</el-button
>
<el-button icon="TrendCharts" link type="primary" @click="mqformDialogRef.openDialog(row.id)">
mq设置
</el-button>
<el-button icon="SetUp" link type="primary" @click="faceFormDialogRef.openDialog(row.id)">
人脸sdk设置
</el-button>
<el-button icon="delete" text type="primary" v-auth="'hard_hardManager_del'" @click="handleDelete([row.id])"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<face-form-dialog ref="faceFormDialogRef" @refresh="getDataList(false)" />
<mq-form-dialog ref="mqformDialogRef" @refresh="getDataList(false)" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<face-form-dialog ref="faceFormDialogRef" @refresh="getDataList(false)" />
<mq-form-dialog ref="mqformDialogRef" @refresh="getDataList(false)" />
</div>
</template>
<script setup lang="ts" name="systemHardManager">
import { BasicTableProps, useTable } from "/@/hooks/table";
import * as hardManageApi from '/@/api/hard/hard-manager'
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { BasicTableProps, useTable } from "/@/hooks/table"
import * as hardManageApi from "/@/api/hard/hard-manager"
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
const FaceFormDialog = defineAsyncComponent(() => import('./face-form.vue'));
const MqFormDialog = defineAsyncComponent(() => import('./mq-form.vue'));
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const FaceFormDialog = defineAsyncComponent(() => import("./face-form.vue"))
const MqFormDialog = defineAsyncComponent(() => import("./mq-form.vue"))
// 定义查询字典
const { hard_type } = useDict('hard_type')
const { hard_type } = useDict("hard_type")
// 定义变量内容
const formDialogRef = ref()
const faceFormDialogRef = ref()
@@ -112,64 +149,58 @@ const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: hardManageApi.pageJoin
queryForm: {},
pageList: hardManageApi.pageJoin,
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
const changeTakeFood = async (e: any, row: any) => {
switchTakeFoodLoading.value = true
try {
await hardManageApi.putObj({ id: row.id, isTakeFood: e })
getDataList()
} finally {
switchTakeFoodLoading.value = false
}
switchTakeFoodLoading.value = true
try {
await hardManageApi.putObj({ id: row.id, isTakeFood: e })
getDataList()
} finally {
switchTakeFoodLoading.value = false
}
}
// 导出excel
const exportExcel = () => {
downBlobFile('/hard/hardManager/export', Object.assign(state.queryForm, { ids: selectObjs }), 'hardManager.xlsx')
downBlobFile("/hard/hardManager/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardManager.xlsx")
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
selectObjs.value = objs.map(({ id }) => id)
multiple.value = !objs.length
}
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await useMessageBox().confirm("此操作将永久删除")
} catch {
return
}
try {
await hardManageApi.delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
};
</script>
try {
await hardManageApi.delObjs(ids)
getDataList()
useMessage().success("删除成功")
} catch (err: any) {
useMessage().error(err.msg)
}
}
</script>
src/views/hard/hard-manager/mq-form.vue
+107 -109
View File
@@ -1,144 +1,142 @@
<template>
<el-dialog title="mq设置" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px"
v-loading="loading">
<el-row :gutter="24">
<el-dialog title="mq设置" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="连接id" prop="mqClientId">
<el-input disabled v-model="form.mqClientId" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="连接id" prop="mqClientId">
<el-input disabled v-model="form.mqClientId" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mac地址" prop="macAddress">
<el-input disabled v-model="form.macAddress" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mac地址" prop="macAddress">
<el-input disabled v-model="form.macAddress" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="topic" prop="mainTopic">
<el-input disabled v-model="form.mainTopic" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="topic" prop="mainTopic">
<el-input disabled v-model="form.mainTopic" placeholder="待同步" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq地址" prop="mqSocketAddress">
<el-input v-model="form.mqSocketAddress" placeholder="请输入mq地址" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq地址" prop="mqSocketAddress">
<el-input v-model="form.mqSocketAddress" placeholder="请输入mq地址" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq端口" prop="mqSocketPort">
<el-input v-model="form.mqSocketPort" placeholder="请输入mq端口" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq端口" prop="mqSocketPort">
<el-input v-model="form.mqSocketPort" placeholder="请输入mq端口" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq用户名" prop="mqUsername">
<el-input disabled v-model="form.mqUsername" placeholder="请输入mq用户名" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq用户名" prop="mqUsername">
<el-input disabled v-model="form.mqUsername" placeholder="请输入mq用户名" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="mq密码" prop="mqPassword">
<el-input v-model="form.mqPassword" placeholder="请输入mq密码" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
<el-col :span="24" class="mb20">
<el-form-item label="mq密码" prop="mqPassword">
<el-input v-model="form.mqPassword" placeholder="请输入mq密码" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="mq-form">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/hard/hard-manager'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/hard/hard-manager"
import { rule } from "/@/utils/validate"
const emit = defineEmits(["refresh"])
// 定义变量内容
const dataFormRef = ref();
const dataFormRef = ref()
const visible = ref(false)
const loading = ref(false)
// 提交表单数据
const form = reactive<any>({
id: undefined,
name: undefined,
type: undefined,
merchantId: undefined,
mqClientId: undefined,
macAddress: undefined,
mainTopic: undefined,
mqSocketAddress: undefined,
mqSocketPort: undefined,
mqUsername: undefined,
mqPassword: undefined,
mqSyncCount: undefined
});
id: undefined,
name: undefined,
type: undefined,
merchantId: undefined,
mqClientId: undefined,
macAddress: undefined,
mainTopic: undefined,
mqSocketAddress: undefined,
mqSocketPort: undefined,
mqUsername: undefined,
mqPassword: undefined,
mqSyncCount: undefined,
})
// 定义校验规则
const dataRules = ref({
mqSocketAddress: [{ required: true, message: 'mq地址', trigger: 'blur' }],
mqSocketPort: [{ required: true, message: 'mq端口', trigger: 'blur' }],
mqSocketAddress: [{ required: true, message: "mq地址", trigger: "blur" }],
mqSocketPort: [{ required: true, message: "mq端口", trigger: "blur" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
visible.value = true
form.id = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields()
})
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
};
// 获取hardManager信息
if (id) {
form.id = id
gethardManagerData(id)
}
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
form.id ? await putObj(form) : await addObj(form)
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 初始化表单数据
const gethardManagerData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 获取数据
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data)
})
.finally(() => {
loading.value = false
})
}
// 暴露变量
defineExpose({
openDialog
});
</script>
openDialog,
})
</script>
src/views/wallet/wallet-setting/components/extra-price/index.vue
+96 -76
View File
@@ -1,99 +1,119 @@
<template>
<div class="w100">
<div class="layout-padding-auto layout-padding-view">
<div class="flex justify-center flex-col">
<div>
<el-form ref="dataFormRef" label-width="120px" :model="form" :rules="dataRules" formDialogRef
v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="每一餐的上限" prop="payAmountEnable">
<el-switch active-value="1" inactive-value="0" v-model="form.payAmountEnable"
active-text="开启" inactive-text="关闭" inline-prompt />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="每一餐的上限" prop="payAmountMealLimit">
<el-input style="width: 300px;" type="number" v-model="form.payAmountMealLimit"
placeholder="请输入上限金额">
<template #append>元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="倍数" prop="payAmountMealTimes">
<el-input style="width: 300px;" type="number" v-model="form.payAmountMealTimes"
placeholder="请输入倍数">
<template #append>倍</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="flex items-center">
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</div>
</div>
</div>
</div>
</div>
<div class="w100">
<div class="layout-padding-auto layout-padding-view">
<div class="flex justify-center flex-col">
<div>
<el-form
ref="dataFormRef"
label-width="120px"
:model="form"
:rules="dataRules"
formDialogRef
v-loading="loading"
>
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="每一餐的上限" prop="payAmountEnable">
<el-switch
active-value="1"
inactive-value="0"
v-model="form.payAmountEnable"
active-text="开启"
inactive-text="关闭"
inline-prompt
/>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="每一餐的上限" prop="payAmountMealLimit">
<el-input
style="width: 300px"
type="number"
v-model="form.payAmountMealLimit"
placeholder="请输入上限金额"
>
<template #append>元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="倍数" prop="payAmountMealTimes">
<el-input
style="width: 300px"
type="number"
v-model="form.payAmountMealTimes"
placeholder="请输入倍数"
>
<template #append>倍</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="flex items-center">
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts" name="extra-price">
import { storePrice } from "/@/utils/formatMoney"
import { storePrice, displayPrice } from "/@/utils/formatMoney"
import { useMessage } from "/@/hooks/message"
import { getObj, putObj } from "/@/api/wallet/wallet-setting"
// 定义变量内容
const dataFormRef = ref();
const dataFormRef = ref()
const loading = ref(false)
// 提交表单数据
const form = reactive({
id: undefined,
payAmountEnable: undefined,
payAmountMealLimit: undefined,
payAmountMealTimes: undefined,
});
id: undefined,
payAmountEnable: undefined,
payAmountMealLimit: undefined,
payAmountMealTimes: undefined,
})
// 定义校验规则
const dataRules = ref({
payAmountEnable: [{ required: true, message: '请选择是否开启每一餐的上限', trigger: 'change' }],
payAmountMealLimit: [{ required: true, message: '请输入上限金额', trigger: 'blur' }],
payAmountMealTimes: [{ required: true, message: '请输入倍数', trigger: 'blur' }],
payAmountEnable: [{ required: true, message: "请选择是否开启每一餐的上限", trigger: "change" }],
payAmountMealLimit: [{ required: true, message: "请输入上限金额", trigger: "blur" }],
payAmountMealTimes: [{ required: true, message: "请输入倍数", trigger: "blur" }],
})
onMounted(() => {
getwalletRechargePackageData('1')
getwalletRechargePackageData("1")
})
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
loading.value = true;
const pa = {
...form,
payPrice: storePrice(form.payAmountMealLimit),
}
await putObj(pa)
useMessage().success('修改成功');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
try {
loading.value = true
const pa = {
...form,
payAmountMealLimit: storePrice(form.payAmountMealLimit),
}
await putObj(pa)
useMessage().success("修改成功")
} catch (err: any) {
useMessage().error(err.msg)
} finally {
loading.value = false
}
}
// 初始化表单数据
const getwalletRechargePackageData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
</script>
// 获取数据
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data, { payAmountMealLimit: displayPrice(res.data.payAmountMealLimit, "", 0) })
})
.finally(() => {
loading.value = false
})
}
</script>