Merge branch 'master' of https://gitea.zianxin.com/zax/xrhome-pc
This commit is contained in:
dzc committed
commit
81569b0d8d
14 files changed
+627
-253
No files matched your search
@@ -21,5 +21,5 @@ VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
|
||||
|
||||
# 默认账户密码
|
||||
VITE_APP_DEFAULT_LOGIN_TENANT = 资安信
|
||||
VITE_APP_DEFAULT_LOGIN_USERNAME = admin
|
||||
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123
|
||||
# VITE_APP_DEFAULT_LOGIN_USERNAME = admin
|
||||
# VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123
|
||||
@@ -26,7 +26,7 @@ export interface Sku {
|
||||
salesCount?: number // 商品销量
|
||||
cabinetChannel?: string // 货道或柜门编号
|
||||
cabinetType?: string // 通道类型
|
||||
purchaseBizType?:string
|
||||
purchaseBizType?: string
|
||||
}
|
||||
|
||||
export interface GiveCouponTemplate {
|
||||
@@ -68,13 +68,15 @@ export interface Spu {
|
||||
// 获得 Spu 列表
|
||||
export const getSpuPage = (params: PageParam) => {
|
||||
// /product/spu/page
|
||||
return request.get({ url: '/product/spu/pageWithCreator',params:{
|
||||
...params
|
||||
}})
|
||||
return request.get({
|
||||
url: '/product/spu/pageWithCreator', params: {
|
||||
...params
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 获得 Spu 列表 tabsCount
|
||||
export const getTabsCount = (types?: number) => {
|
||||
export const getTabsCount = (types: number = 0) => {
|
||||
return request.get({ url: `/product/spu/get-count?types=${types}` })
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
// 贩卖机测试日志 VO
|
||||
export interface DeviceLogVO {
|
||||
id: number // 日志主键
|
||||
deviceId: string // 设备IMEI
|
||||
cabinetChannel: string // 当前使用的货道或柜门编号
|
||||
deviceStatus: number // 出货状态
|
||||
content: string // 内容
|
||||
}
|
||||
|
||||
// 贩卖机测试日志 API
|
||||
export const DeviceLogApi = {
|
||||
// 查询贩卖机测试日志分页
|
||||
getDeviceLogPage: async (params: any) => {
|
||||
return await request.get({ url: `/product/device-log/page`, params })
|
||||
},
|
||||
|
||||
// 查询贩卖机测试日志详情
|
||||
getDeviceLog: async (id: number) => {
|
||||
return await request.get({ url: `/product/device-log/get?id=` + id })
|
||||
},
|
||||
|
||||
// 新增贩卖机测试日志
|
||||
createDeviceLog: async (data: DeviceLogVO) => {
|
||||
return await request.post({ url: `/product/device-log/create`, data })
|
||||
},
|
||||
|
||||
// 修改贩卖机测试日志
|
||||
updateDeviceLog: async (data: DeviceLogVO) => {
|
||||
return await request.put({ url: `/product/device-log/update`, data })
|
||||
},
|
||||
|
||||
// 删除贩卖机测试日志
|
||||
deleteDeviceLog: async (id: number) => {
|
||||
return await request.delete({ url: `/product/device-log/delete?id=` + id })
|
||||
},
|
||||
|
||||
// 导出贩卖机测试日志 Excel
|
||||
exportDeviceLog: async (params) => {
|
||||
return await request.download({ url: `/product/device-log/export-excel`, params })
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,11 +1,11 @@
|
||||
import type { App } from 'vue'
|
||||
import type { RouteRecordRaw } from 'vue-router'
|
||||
import { createRouter, createWebHistory } from 'vue-router'
|
||||
import { createRouter, createWebHashHistory } from 'vue-router'
|
||||
import remainingRouter from './modules/remaining'
|
||||
|
||||
// 创建路由实例
|
||||
const router = createRouter({
|
||||
history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
|
||||
history: createWebHashHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
|
||||
strict: true,
|
||||
routes: remainingRouter as RouteRecordRaw[],
|
||||
scrollBehavior: () => ({ left: 0, top: 0 })
|
||||
|
||||
@@ -200,8 +200,8 @@ const loginData = reactive({
|
||||
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
|
||||
loginForm: {
|
||||
tenantName: '芋道源码',
|
||||
username: 'admin',
|
||||
password: 'admin123',
|
||||
username: '',
|
||||
password: '',
|
||||
captchaVerification: '',
|
||||
rememberMe: false
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="表编号，自增" align="center" prop="id" />
|
||||
<el-table-column label="编号" align="center" prop="id" />
|
||||
<el-table-column label="设备名称" align="center" prop="name" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="访问商品地址" align="center" prop="productUrl" />
|
||||
@@ -102,6 +102,7 @@ const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await DeviceApi.getDevicePage(queryParams)
|
||||
console.log("售货机",data)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
@@ -159,4 +160,4 @@ const handleExport = async () => {
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
</script>
|
||||
@@ -13,10 +13,10 @@
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input v-model="formData.deviceId" placeholder="请输入设备IMEI" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前使用的货道或柜门编号" prop="cabinetChannel">
|
||||
<el-input v-model="formData.cabinetChannel" placeholder="请输入当前使用的货道或柜门编号" />
|
||||
<el-form-item label="货道号" prop="cabinetChannel">
|
||||
<el-input v-model="formData.cabinetChannel" placeholder="请输入货道号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最大货物数" prop="maxNum">
|
||||
<el-form-item label="最大数量" prop="maxNum">
|
||||
<el-input v-model="formData.maxNum" placeholder="请输入最大货物数" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货道行号" prop="channelLine">
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="当前使用的货道或柜门编号" prop="cabinetChannel">
|
||||
<el-form-item label="货道号" prop="cabinetChannel">
|
||||
<el-input
|
||||
v-model="queryParams.cabinetChannel"
|
||||
placeholder="请输入当前使用的货道或柜门编号"
|
||||
placeholder="请输入货道号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="最大货物数" prop="maxNum">
|
||||
<el-form-item label="最大数量" prop="maxNum">
|
||||
<el-input
|
||||
v-model="queryParams.maxNum"
|
||||
placeholder="请输入最大货物数"
|
||||
@@ -91,10 +91,10 @@
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="表编号，自增" align="center" prop="id" />
|
||||
<el-table-column label="编号" align="center" prop="id" />
|
||||
<el-table-column label="名称" align="center" prop="name" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="当前使用的货道或柜门编号" align="center" prop="cabinetChannel" />
|
||||
<el-table-column label="当前货道" align="center" prop="cabinetChannel" />
|
||||
<el-table-column label="最大货物数" align="center" prop="maxNum" />
|
||||
<el-table-column label="货道行号" align="center" prop="channelLine" />
|
||||
<el-table-column
|
||||
|
||||
@@ -28,7 +28,10 @@
|
||||
<el-form-item v-if="false" label="访问商品地址" prop="productUrl">
|
||||
<el-input v-model="formData.productUrl" placeholder="请输入访问商品地址" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="false" label="文件地址" prop="fileUrl">
|
||||
<el-form-item v-if="true" label="商品地址" prop="productUrl">
|
||||
<el-input v-model="formData.productUrl" placeholder="请输入访问商品地址" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="true" label="文件地址" prop="fileUrl">
|
||||
<el-input v-model="formData.fileUrl" placeholder="请输入文件地址" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
+227
-226
@@ -1,226 +1,227 @@
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
|
||||
<el-form-item label="设备名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input
|
||||
v-model="queryParams.deviceId" placeholder="请输入设备IMEI" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="访问商品地址" prop="productUrl">
|
||||
<el-input
|
||||
v-model="queryParams.productUrl" placeholder="请输入访问商品地址" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="文件地址" prop="fileUrl">
|
||||
<el-input
|
||||
v-model="queryParams.fileUrl" placeholder="请输入文件地址" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"
|
||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery">
|
||||
<Icon icon="ep:search" class="mr-5px" /> 搜索
|
||||
</el-button>
|
||||
<el-button @click="resetQuery">
|
||||
<Icon icon="ep:refresh" class="mr-5px" /> 重置
|
||||
</el-button>
|
||||
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['product:device:create']">
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success" plain @click="handleExport" :loading="exportLoading"
|
||||
v-hasPermi="['product:device:export']">
|
||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="表编号，自增" align="center" prop="id" />
|
||||
<el-table-column label="设备名称" align="center" prop="name" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="访问商品地址" width="250" align="center" prop="productUrl" />
|
||||
<el-table-column label="广告" align="center" prop="fileUrl">
|
||||
<template #default="{ row }">
|
||||
<el-image :src="row.fileUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.fileUrl)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="小程序二维码" width="150" align="center" prop="productUrl">
|
||||
<template #default="{ row }">
|
||||
<el-image :src="row.productUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.productUrl)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
|
||||
<el-table-column label="操作" align="center" min-width="200px">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="refreshWechatCode(row)">
|
||||
刷新小程序二维码
|
||||
</el-button>
|
||||
<el-button type="primary" size="small" @click="openForm('update', row.id)" v-hasPermi="['product:device:update']">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button type="danger" size="small" @click="handleDelete(row.id)" v-hasPermi="['product:device:delete']">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<DeviceForm ref="formRef" @success="handleFormSuccess" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { DeviceApi, DeviceVO } from '@/api/product/device'
|
||||
import DeviceForm from './DeviceForm.vue'
|
||||
import { createImageViewer } from '@/components/ImageViewer'
|
||||
|
||||
/** 贩卖机信息 列表 */
|
||||
defineOptions({ name: 'Device' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<DeviceVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
name: undefined,
|
||||
deviceId: undefined,
|
||||
productUrl: undefined,
|
||||
fileUrl: undefined,
|
||||
createTime: [],
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await DeviceApi.getDevicePage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
console.log("getList:", data);
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
// 查看图片
|
||||
const imagePreview = (imgUrl: string) => {
|
||||
createImageViewer({
|
||||
zIndex: 9999999,
|
||||
urlList: [imgUrl]
|
||||
})
|
||||
}
|
||||
|
||||
const refreshWechatCode = async (row: any) => {
|
||||
const loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: '刷新中...',
|
||||
background: 'rgba(0, 0, 0, 0.7)',
|
||||
})
|
||||
try {
|
||||
const data = await DeviceApi.refreshWechantCode({ id: row.id })
|
||||
if (!data) throw new Error()
|
||||
getList()
|
||||
loading.close()
|
||||
message.success("刷新小程序二维码成功")
|
||||
} catch (error: any) {
|
||||
loading.close()
|
||||
console.log("refreshWechatCodeL:", error);
|
||||
}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
// 删除的二次确认
|
||||
await message.delConfirm()
|
||||
// 发起删除
|
||||
await DeviceApi.deleteDevice(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
// 刷新列表
|
||||
await getList()
|
||||
} catch { }
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
// 导出的二次确认
|
||||
await message.exportConfirm()
|
||||
// 发起导出
|
||||
exportLoading.value = true
|
||||
const data = await DeviceApi.exportDevice(queryParams)
|
||||
download.excel(data, '贩卖机信息.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
|
||||
/** 处理表单操作成功 */
|
||||
const handleFormSuccess = (eventData: { type: string; data: DeviceVO }) => {
|
||||
if (eventData.type === 'create') {
|
||||
// 新增成功，直接将新数据添加到列表顶部
|
||||
list.value.unshift(eventData.data)
|
||||
total.value += 1
|
||||
} else {
|
||||
// 更新成功，找到对应项并替换整个对象（包括广告）
|
||||
const index = list.value.findIndex(item => item.id === eventData.data.id)
|
||||
if (index !== -1) {
|
||||
// 使用 Vue 的响应式替换，确保广告图片能立即更新
|
||||
list.value.splice(index, 1, eventData.data)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
|
||||
<el-form-item label="设备名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input
|
||||
v-model="queryParams.deviceId" placeholder="请输入设备IMEI" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="访问商品地址" prop="productUrl">
|
||||
<el-input
|
||||
v-model="queryParams.productUrl" placeholder="请输入访问商品地址" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="文件地址" prop="fileUrl">
|
||||
<el-input
|
||||
v-model="queryParams.fileUrl" placeholder="请输入文件地址" clearable @keyup.enter="handleQuery"
|
||||
class="!w-240px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"
|
||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery">
|
||||
<Icon icon="ep:search" class="mr-5px" /> 搜索
|
||||
</el-button>
|
||||
<el-button @click="resetQuery">
|
||||
<Icon icon="ep:refresh" class="mr-5px" /> 重置
|
||||
</el-button>
|
||||
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['product:device:create']">
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success" plain @click="handleExport" :loading="exportLoading"
|
||||
v-hasPermi="['product:device:export']">
|
||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="编号" align="center" prop="id" />
|
||||
<el-table-column label="设备名称" align="center" prop="name" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="访问商品地址" width="250" align="center" prop="productUrl" />
|
||||
<el-table-column label="广告" align="center" prop="fileUrl">
|
||||
<template #default="{ row }">
|
||||
<el-image :src="row.fileUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.fileUrl)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="小程序二维码" width="150" align="center" prop="productUrl">
|
||||
<template #default="{ row }">
|
||||
<el-image :src="row.productUrl" class="mr-10px h-30px w-30px" @click="imagePreview(row.productUrl)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
|
||||
<el-table-column label="操作" align="center" min-width="200px">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="refreshWechatCode(row)">
|
||||
刷新小程序二维码
|
||||
</el-button>
|
||||
<el-button type="primary" size="small" @click="openForm('update', row.id)" v-hasPermi="['product:device:update']">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button type="danger" size="small" @click="handleDelete(row.id)" v-hasPermi="['product:device:delete']">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<DeviceForm ref="formRef" @success="handleFormSuccess" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { DeviceApi, DeviceVO } from '@/api/product/device'
|
||||
import DeviceForm from './DeviceForm.vue'
|
||||
import { createImageViewer } from '@/components/ImageViewer'
|
||||
import { ElLoading } from 'element-plus'
|
||||
|
||||
/** 贩卖机信息 列表 */
|
||||
defineOptions({ name: 'Device' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<DeviceVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
name: undefined,
|
||||
deviceId: undefined,
|
||||
productUrl: undefined,
|
||||
fileUrl: undefined,
|
||||
createTime: [],
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await DeviceApi.getDevicePage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
console.log("getList:", data);
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
// 查看图片
|
||||
const imagePreview = (imgUrl: string) => {
|
||||
createImageViewer({
|
||||
zIndex: 9999999,
|
||||
urlList: [imgUrl]
|
||||
})
|
||||
}
|
||||
|
||||
const refreshWechatCode = async (row: any) => {
|
||||
const loading = ElLoading.service({
|
||||
lock: true,
|
||||
text: '刷新中...',
|
||||
background: 'rgba(0, 0, 0, 0.7)',
|
||||
})
|
||||
try {
|
||||
const data = await DeviceApi.refreshWechantCode({ id: row.id })
|
||||
if (!data) throw new Error()
|
||||
getList()
|
||||
loading.close()
|
||||
message.success("刷新小程序二维码成功")
|
||||
} catch (error: any) {
|
||||
loading.close()
|
||||
console.log("refreshWechatCodeL:", error);
|
||||
}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
// 删除的二次确认
|
||||
await message.delConfirm()
|
||||
// 发起删除
|
||||
await DeviceApi.deleteDevice(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
// 刷新列表
|
||||
await getList()
|
||||
} catch { }
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
// 导出的二次确认
|
||||
await message.exportConfirm()
|
||||
// 发起导出
|
||||
exportLoading.value = true
|
||||
const data = await DeviceApi.exportDevice(queryParams)
|
||||
download.excel(data, '贩卖机信息.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
|
||||
/** 处理表单操作成功 */
|
||||
const handleFormSuccess = (eventData: { type: string; data: DeviceVO }) => {
|
||||
if (eventData.type === 'create') {
|
||||
// 新增成功，直接将新数据添加到列表顶部
|
||||
list.value.unshift(eventData.data)
|
||||
total.value += 1
|
||||
} else {
|
||||
// 更新成功，找到对应项并替换整个对象（包括广告）
|
||||
const index = list.value.findIndex(item => item.id === eventData.data.id)
|
||||
if (index !== -1) {
|
||||
// 使用 Vue 的响应式替换，确保广告图片能立即更新
|
||||
list.value.splice(index, 1, eventData.data)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,111 @@
|
||||
<template>
|
||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input v-model="formData.deviceId" placeholder="请输入设备IMEI" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货道" prop="cabinetChannel">
|
||||
<el-input v-model="formData.cabinetChannel" placeholder="请输入货道号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="出货状态" prop="deviceStatus">
|
||||
<el-radio-group v-model="formData.deviceStatus">
|
||||
<el-radio value="1">请选择字典生成</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="内容" prop="content">
|
||||
<Editor v-model="formData.content" height="150px" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { DeviceLogApi, DeviceLogVO } from '@/api/product/devicelog'
|
||||
|
||||
/** 贩卖机测试日志 表单 */
|
||||
defineOptions({ name: 'DeviceLogForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
deviceId: undefined,
|
||||
cabinetChannel: undefined,
|
||||
deviceStatus: undefined,
|
||||
content: undefined
|
||||
})
|
||||
const formRules = reactive({
|
||||
deviceId: [{ required: true, message: '设备IMEI不能为空', trigger: 'blur' }],
|
||||
cabinetChannel: [{ required: true, message: '货道', trigger: 'blur' }],
|
||||
content: [{ required: true, message: '内容不能为空', trigger: 'blur' }]
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
dialogTitle.value = t('action.' + type)
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改时，设置数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await DeviceLogApi.getDeviceLog(id)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
||||
|
||||
/** 提交表单 */
|
||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
||||
const submitForm = async () => {
|
||||
// 校验表单
|
||||
await formRef.value.validate()
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as DeviceLogVO
|
||||
if (formType.value === 'create') {
|
||||
await DeviceLogApi.createDeviceLog(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
} else {
|
||||
await DeviceLogApi.updateDeviceLog(data)
|
||||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success')
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
deviceId: undefined,
|
||||
cabinetChannel: undefined,
|
||||
deviceStatus: undefined,
|
||||
content: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,213 @@
|
||||
<template>
|
||||
<ContentWrap>
|
||||
<!-- 搜索工作栏 -->
|
||||
<el-form
|
||||
class="-mb-15px"
|
||||
:model="queryParams"
|
||||
ref="queryFormRef"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input
|
||||
v-model="queryParams.deviceId"
|
||||
placeholder="请输入设备IMEI"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货道" prop="cabinetChannel">
|
||||
<el-input
|
||||
v-model="queryParams.cabinetChannel"
|
||||
placeholder="请输入货道号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="出货状态" prop="deviceStatus">
|
||||
<el-select
|
||||
v-model="queryParams.deviceStatus"
|
||||
placeholder="请选择出货状态"
|
||||
clearable
|
||||
class="!w-240px"
|
||||
>
|
||||
|
||||
<el-option label="请选择字典生成" value="" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="queryParams.createTime"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
||||
class="!w-220px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
@click="openForm('create')"
|
||||
v-hasPermi="['product:device-log:create']"
|
||||
>
|
||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
@click="handleExport"
|
||||
:loading="exportLoading"
|
||||
v-hasPermi="['product:device-log:export']"
|
||||
>
|
||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 列表 -->
|
||||
<ContentWrap>
|
||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
||||
<el-table-column label="日志主键" align="center" prop="id" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="货道号" align="center" prop="cabinetChannel" />
|
||||
<el-table-column label="出货状态" align="center" prop="deviceStatus" />
|
||||
<el-table-column label="内容" align="center" prop="content" />
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="操作" align="center" min-width="120px">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
@click="openForm('update', scope.row.id)"
|
||||
v-hasPermi="['product:device-log:update']"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
@click="handleDelete(scope.row.id)"
|
||||
v-hasPermi="['product:device-log:delete']"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<Pagination
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNo"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</ContentWrap>
|
||||
|
||||
<!-- 表单弹窗：添加/修改 -->
|
||||
<DeviceLogForm ref="formRef" @success="getList" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { DeviceLogApi, DeviceLogVO } from '@/api/product/devicelog'
|
||||
import DeviceLogForm from './DeviceLogForm.vue'
|
||||
|
||||
/** 贩卖机测试日志 列表 */
|
||||
defineOptions({ name: 'ProductDeviceLog' })
|
||||
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<DeviceLogVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
deviceId: undefined,
|
||||
cabinetChannel: undefined,
|
||||
deviceStatus: undefined,
|
||||
content: undefined,
|
||||
createTime: []
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await DeviceLogApi.getDeviceLogPage(queryParams)
|
||||
list.value = data.list
|
||||
total.value = data.total
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
// 删除的二次确认
|
||||
await message.delConfirm()
|
||||
// 发起删除
|
||||
await DeviceLogApi.deleteDeviceLog(id)
|
||||
message.success(t('common.delSuccess'))
|
||||
// 刷新列表
|
||||
await getList()
|
||||
} catch {}
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
// 导出的二次确认
|
||||
await message.exportConfirm()
|
||||
// 发起导出
|
||||
exportLoading.value = true
|
||||
const data = await DeviceLogApi.exportDeviceLog(queryParams)
|
||||
download.excel(data, '贩卖机测试日志.xls')
|
||||
} catch {
|
||||
} finally {
|
||||
exportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
@@ -13,8 +13,8 @@
|
||||
<el-form-item label="订单号" prop="orderId">
|
||||
<el-input v-model="formData.orderId" placeholder="请输入订单号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="订单流水号" prop="orderNo">
|
||||
<el-input v-model="formData.orderNo" placeholder="请输入订单流水号" />
|
||||
<el-form-item label="订单流水" prop="orderNo">
|
||||
<el-input v-model="formData.orderNo" placeholder="请输入订单流水" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备IMEI" prop="deviceId">
|
||||
<el-input v-model="formData.deviceId" placeholder="请输入设备IMEI" />
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
class="!w-240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="订单流水号" prop="orderNo">
|
||||
<el-form-item label="订单流水" prop="orderNo">
|
||||
<el-input
|
||||
v-model="queryParams.orderNo"
|
||||
placeholder="请输入订单流水号"
|
||||
placeholder="请输入订单流水"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
class="!w-240px"
|
||||
@@ -95,7 +95,7 @@
|
||||
<el-table-column label="日志主键" align="center" prop="id" />
|
||||
<el-table-column label="用户编号" align="center" prop="userId" />
|
||||
<el-table-column label="订单号" align="center" prop="orderId" />
|
||||
<el-table-column label="订单流水号" align="center" prop="orderNo" />
|
||||
<el-table-column label="订单流水" align="center" prop="orderNo" />
|
||||
<el-table-column label="设备IMEI" align="center" prop="deviceId" />
|
||||
<el-table-column label="出货状态" align="center" prop="deviceStatus" />
|
||||
<el-table-column label="内容" align="center" prop="content" />
|
||||
|
||||
Reference in new issue
Block a user