kkk-ops 3 weeks ago
commit a229aefdff

@ -83,7 +83,7 @@ export const MoldBrandApi = {
},
getMoldPageWithoutPaging: async () => {
return await request.get({ url: `/erp/mold-brand/mold/page` })
return await request.get({ url: `/erp/mold-brand/mold/list` })
},
// 新增模具
createMold: async (data) => {

@ -45,6 +45,10 @@ export const DeviceLedgerApi = {
return await request.get({ url: `/mes/device-ledger/page`, params })
},
getDeviceLedgerList: async (params: any) => {
return await request.get({ url: `/mes/device-ledger/list`, params })
},
// 查询设备类型详情
getDeviceLedger: async (id: number) => {
return await request.get({ url: `/mes/device-ledger/get?id=` + id })

@ -43,5 +43,10 @@ export const TaskManagementApi = {
exportTaskManagement: async (params: any) => {
return await request.download({ url: `/mes/task-management/export-excel`, params })
},
updateTaskManagementEnabled: async (id: number | string, enabled: string) => {
const data = { id, enabled }
return await request.put({ url: `/mes/task-management/update-enabled`, data })
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

File diff suppressed because it is too large Load Diff

@ -151,6 +151,228 @@ export const barOptions: EChartsOption = {
]
}
export const deviceRepairLineOptions: EChartsOption = {
title: {
text: '设备维修数量统计',
left: 'center'
},
tooltip: {
trigger: 'axis'
},
grid: {
left: 40,
right: 20,
bottom: 30,
top: 60,
containLabel: true
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['一月', '二月', '三月', '四月', '五月', '六月']
},
yAxis: {
type: 'value'
},
series: [
{
name: '维修数量',
type: 'line',
smooth: true,
data: [3, 5, 4, 6, 8, 7]
}
]
}
export const deviceCategoryPieOptions: EChartsOption = {
title: {
text: '设备分类统计',
left: 'center'
},
tooltip: {
trigger: 'item'
},
legend: {
orient: 'vertical',
left: 'left'
},
series: [
{
name: '设备类别',
type: 'pie',
radius: '55%',
center: ['50%', '60%'],
data: [
{ value: 12, name: '注塑机' },
{ value: 9, name: '冲床' },
{ value: 6, name: '数控机床' },
{ value: 4, name: '检测设备' },
{ value: 2, name: '其他' }
]
}
]
}
export const deviceDistributionBarOptions: EChartsOption = {
title: {
text: '设备分布统计',
left: 'center'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
grid: {
left: 40,
right: 20,
bottom: 30,
top: 60,
containLabel: true
},
xAxis: {
type: 'category',
data: ['一车间', '二车间', '三车间', '四车间', '五车间'],
axisTick: {
alignWithLabel: true
}
},
yAxis: {
type: 'value'
},
series: [
{
name: '设备数量',
type: 'bar',
data: [10, 8, 6, 5, 4]
}
]
}
export const productionOverviewMock = {
orderCount: 9,
runningOrderCount: 12,
startedOrderCount: 12,
shutdownOrderCount: 0,
plannedOutput: 109210,
completedOutput: 1260,
qualifiedRate: 1.15,
alarmRate: 0,
onTimeRate: 0
}
export const productionProgressMock = [
{
id: 'SCGD00000036',
orderNo: 'SCGD00000036',
productName: '大中型模具',
statusText: '生产中',
planStartTime: '2021-05-28 18:40:10',
planEndTime: '2021-06-05 18:40:10',
completeRate: 8.33
},
{
id: 'SCGD00000037',
orderNo: 'SCGD00000037',
productName: '大型注塑模具',
statusText: '排产中',
planStartTime: '2021-05-28 18:40:10',
planEndTime: '2021-06-10 18:40:10',
completeRate: 6.86
},
{
id: 'SCGD00000033',
orderNo: 'SCGD00000033',
productName: '模具零件加工',
statusText: '生产中',
planStartTime: '2021-04-02 17:50:12',
planEndTime: '2021-04-10 17:50:12',
completeRate: 57.58
},
{
id: 'SCGD00000040',
orderNo: 'SCGD00000040',
productName: '试模工单',
statusText: '待开工',
planStartTime: '2021-06-15 08:30:00',
planEndTime: '2021-06-20 18:00:00',
completeRate: 0
}
]
export const deviceStatusMock = {
inactive: 2,
active: 0,
total: 2
}
export const alarmStatusMock = {
serious: 0,
assignedToMe: 0,
total: 0
}
export const deviceOverviewMock = {
deviceTotal: 33,
needRepair: 0,
running: 33,
stop: 0,
utilization: 0,
alarmRate: 0
}
export const todoTasksMock = [
{
id: 'TASK0001',
name: '模具工位点检任务',
type: '点检',
priority: '高',
planTime: '2021-06-13 13:00',
owner: '设备科'
},
{
id: 'TASK0002',
name: '设备保养任务',
type: '保养',
priority: '中',
planTime: '2021-06-13 15:00',
owner: '保全班'
},
{
id: 'TASK0003',
name: '注塑机状态巡检',
type: '巡检',
priority: '中',
planTime: '2021-06-14 09:00',
owner: '设备科'
},
{
id: 'TASK0004',
name: '能耗异常分析',
type: '分析',
priority: '低',
planTime: '2021-06-14 14:00',
owner: '能源管理'
},
{
id: 'TASK0005',
name: '设备档案核对',
type: '管理',
priority: '低',
planTime: '2021-06-15 10:00',
owner: '设备管理'
},
{
id: 'TASK0006',
name: '安全隐患排查',
type: '安全',
priority: '高',
planTime: '2021-06-15 16:00',
owner: '安环部'
}
]
export const radarOption: EChartsOption = {
legend: {
data: [t('workplace.personal'), t('workplace.team')]

@ -1,7 +1,7 @@
export type WorkplaceTotal = {
project: number
access: number
todo: number
project: number
access: number
todo: number
}
export type Project = {
@ -53,3 +53,55 @@ export type MonthlySales = {
estimate: number
actual: number
}
export type ProductionOverview = {
orderCount: number
runningOrderCount: number
startedOrderCount: number
shutdownOrderCount: number
plannedOutput: number
completedOutput: number
qualifiedRate: number
alarmRate: number
onTimeRate: number
}
export type ProductionProgressItem = {
id: string
orderNo: string
productName: string
statusText: string
planStartTime: string
planEndTime: string
completeRate: number
}
export type DeviceStatusSummary = {
inactive: number
active: number
total: number
}
export type AlarmStatusSummary = {
serious: number
assignedToMe: number
total: number
}
export type DeviceOverview = {
deviceTotal: number
needRepair: number
running: number
stop: number
utilization: number
alarmRate: number
}
export type TodoTask = {
id: string
name: string
type: string
priority: string
planTime: string
owner: string
}

@ -1,26 +1,16 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['erp:mold-brand:create']"
>
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:mold-brand:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="模具编码" align="center" prop="code"/>
<el-table-column label="模具编码" align="center" prop="code" />
<el-table-column label="模具名称" align="left" prop="name" />
<!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
<el-table-column label="使用次数/次" align="center" prop="useTime" />
<el-table-column
label="入库时间"
align="center"
prop="inTime"
:formatter="dateFormatter"
/>
<el-table-column label="入库时间" align="center" prop="inTime" :formatter="dateFormatter" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
@ -29,21 +19,18 @@
<el-table-column label="使用设备" align="center" prop="machineName" />
<!-- <el-table-column label="模具图片" align="center" prop="images" /> -->
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable" >
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" fixed="right" width="150px">
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="操作" align="center" fixed="right" width="200px">
<template #default="scope">
<el-button link @click="openDetail(scope.row.id)">
详情
</el-button>
<!-- <el-button
link
type="success"
@ -53,19 +40,11 @@
维保
</el-button> -->
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:mold-brand:update']"
>
link type="primary" @click="openForm('update', scope.row.id)"
v-hasPermi="['erp:mold-brand:update']">
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['erp:mold-brand:delete']"
>
<el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:mold-brand:delete']">
删除
</el-button>
</template>
@ -73,22 +52,231 @@
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<MoldForm ref="formRef" @success="getList" />
<!-- 表单弹窗添加/修改 -->
<MoldForm ref="formRef" @success="getList" />
<el-dialog v-model="detailVisible" title="模具详情" width="80%" :destroy-on-close="true" draggable>
<div v-loading="detailLoading" class="mold-detail-body">
<el-descriptions :column="3" class="mold-detail-desc">
<el-descriptions-item label="模具编码">{{ detailData?.code ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具名称">{{ detailData?.name ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具状态">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="detailData?.status" />
</el-descriptions-item>
<el-descriptions-item label="模具型号">{{ detailData?.brandName ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具规格">{{ detailData?.moldType ?? '' }}</el-descriptions-item>
<el-descriptions-item label="工序">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="detailData?.orgType" />
</el-descriptions-item>
<el-descriptions-item label="模穴数">{{ detailData?.moldSize ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用次数/次">{{ detailData?.useTime ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用设备">{{ detailData?.machineName ?? detailData?.machineId ?? ''
}}</el-descriptions-item>
<el-descriptions-item label="入库日期">{{ formatDetailDate(detailData?.inTime) }}</el-descriptions-item>
<el-descriptions-item label="是否启用">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData?.isEnable" />
</el-descriptions-item>
<el-descriptions-item label="备注">{{ detailData?.remark ?? '' }}</el-descriptions-item>
</el-descriptions>
<div class="mold-detail-tabs">
<el-tabs v-model="detailActiveTab" class="mt-12px">
<el-tab-pane label="点检履历" name="check">
<el-empty v-if="!inspectionStepGroups.length" />
<el-steps
v-else
direction="vertical"
:active="inspectionStepGroups.length"
class="device-ledger-history-steps"
>
<el-step v-for="group in inspectionStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div
v-for="item in group.items"
:key="item.key"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.inspectionTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div
v-if="item.images?.length"
class="device-ledger-history-item-images"
>
<el-image
v-for="img in item.images"
:key="img"
:src="img"
:preview-src-list="item.images"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="保养履历" name="maintain">
<el-empty v-if="!maintainStepGroups.length" />
<el-steps
v-else
direction="vertical"
class="device-ledger-history-steps"
:active="maintainStepGroups.length"
>
<el-step v-for="group in maintainStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div
v-for="item in group.items"
:key="item.key"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.inspectionTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div
v-if="item.images?.length"
class="device-ledger-history-item-images"
>
<el-image
v-for="img in item.images"
:key="img"
:src="img"
:preview-src-list="item.images"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="维修履历" name="repair">
<el-empty v-if="!repairHistoryView.length" />
<el-table
v-else :data="repairHistoryView" :stripe="true" :show-overflow-tooltip="true"
class="mold-history-table">
<el-table-column label="维修单ID" prop="repairId" width="120" />
<el-table-column label="项目编码" prop="subjectCode" width="120" />
<el-table-column label="项目名称" prop="subjectName" min-width="160" />
<el-table-column label="项目内容" prop="subjectContent" min-width="200" />
<el-table-column label="判定标准" prop="subjectStandard" min-width="200" />
<el-table-column label="故障描述" prop="malfunction" min-width="200" />
<el-table-column label="维修描述" prop="repairDes" min-width="200" />
<el-table-column label="备注" prop="remark" min-width="200" />
<el-table-column label="创建时间" prop="createTime" width="180">
<template #default="scope">
{{ formatHistoryTime(scope.row.createTime) }}
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="detailVisible = false"> </el-button>
</div>
</template>
</el-dialog>
<!-- 表单弹窗添加/修改 -->
<MoldRecordForm ref="recordFormRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { MoldBrandApi } from '@/api/erp/mold'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { MoldBrandApi, type MoldVO } from '@/api/erp/mold'
import MoldForm from './MoldForm.vue'
import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue";
@ -135,7 +323,7 @@ watch(
queryParams.brandId = val
handleQuery()
},
{ immediate: true, deep: true }
{ immediate: true, deep: true }
)
/** 添加/修改操作 */
@ -158,13 +346,299 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
} catch { }
}
/** 添加/修改操作 */
const recordFormRef = ref()
const openRecordForm = (type: string, id?: number, brandId?:number) => {
const openRecordForm = (type: string, id?: number, brandId?: number) => {
recordFormRef.value.open(type, id, brandId)
}
const detailVisible = ref(false)
const detailLoading = ref(false)
const detailData = ref<(MoldVO & Record<string, any>) | null>(null)
const detailActiveTab = ref('check')
const formatDetailDate = (value: any) => {
if (!value) return ''
return formatDate(new Date(value), 'YYYY-MM-DD')
}
const formatHistoryTime = (value: any) => {
const raw = value ?? '-'
if (Array.isArray(raw) && raw.length >= 3) {
const [y, m, d, hh, mm, ss] = raw
const pad = (n: any) => String(n).padStart(2, '0')
if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
return `${y}-${pad(m)}-${pad(d)}`
}
return String(raw)
}
const getResultLabel = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (v === '0') return '待检测'
if (v === '1') return 'OK'
if (v === '2') return 'NG'
return '-'
}
const getResultTagType = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (v === '1') return 'success'
if (v === '2') return 'danger'
if (v === '0') return 'info'
return 'info'
}
const inspectionHistory = computed(() => {
const data: any = detailData.value
return data?.inspectionList ?? []
})
const maintainHistory = computed(() => {
const data: any = detailData.value
const list = data?.maintainList ?? []
return Array.isArray(list) ? list : []
})
type HistoryStepItem = {
key: string
name: string
result: any
method?: any
criteria?: any
images?: string[]
remark?: any
inspectionTime?: any
createTime?: any
}
type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
const parseImages = (value: any): string[] => {
if (!value) return []
if (Array.isArray(value)) return value.map(String).filter(Boolean)
const cleaned = String(value).replace(/[`'\"]/g, '').trim()
return cleaned
.split(',')
.map((v) => v.trim())
.filter(Boolean)
}
const buildStepGroups = (
rows: any[],
options: { timeField: string; nameFieldCandidates: string[]; resultFieldCandidates: string[] }
) => {
const groups = new Map<string, HistoryStepGroup>()
for (const row of rows ?? []) {
const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
const operator = String(row?.creatorName ?? row?.creator ?? '-')
const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
const name =
options.nameFieldCandidates
.map((k) => row?.[k])
.find((v) => v !== undefined && v !== null && String(v).trim() !== '') ?? '-'
const result =
options.resultFieldCandidates.map((k) => row?.[k]).find((v) => v !== undefined && v !== null) ?? undefined
const item: HistoryStepItem = {
key: String(row?.id ?? `${groupKey}__${String(name)}`),
name: String(name),
result,
method: row?.inspectionMethod,
criteria: row?.judgmentCriteria,
images: parseImages(row?.images),
remark: row?.remark,
inspectionTime: row?.inspectionTime,
createTime: row?.createTime
}
if (!groups.has(groupKey)) {
groups.set(groupKey, { key: groupKey, time, operator, items: [item] })
} else {
groups.get(groupKey)!.items.push(item)
}
}
return Array.from(groups.values()).sort((a, b) => String(b.time).localeCompare(String(a.time)))
}
const inspectionStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(inspectionHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['inspectionItemName', 'name'],
resultFieldCandidates: ['inspectionResult']
})
})
const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(maintainHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['maintainItemName', 'inspectionItemName', 'name'],
resultFieldCandidates: ['maintainResult', 'inspectionResult']
})
})
type RepairHistoryRow = {
repairId?: any
subjectCode?: any
subjectName?: any
subjectContent?: any
subjectStandard?: any
malfunction?: any
repairDes?: any
remark?: any
createTime?: any
}
const repairHistoryView = computed<RepairHistoryRow[]>(() => {
const data: any = detailData.value
const raw = data?.repairList
if (!raw) return []
if (Array.isArray(raw)) {
return raw as RepairHistoryRow[]
}
if (typeof raw === 'object') {
const result: RepairHistoryRow[] = []
Object.values(raw as Record<string, any>).forEach((rows: any) => {
if (Array.isArray(rows)) {
result.push(...(rows as RepairHistoryRow[]))
}
})
return result
}
return []
})
const openDetail = async (id: number) => {
detailVisible.value = true
detailActiveTab.value = 'check'
detailLoading.value = true
try {
detailData.value = await MoldBrandApi.getMold(id)
} finally {
detailLoading.value = false
}
}
</script>
<style scoped>
.mold-detail-desc {
margin-bottom: 16px;
}
.mold-history-table {
margin-top: 8px;
}
.mold-detail-body {
max-height: 70vh;
}
.mold-detail-tabs {
max-height: 50vh;
overflow-y: auto;
padding-right: 4px;
}
.device-ledger-history-steps {
padding: 8px 8px 0;
}
.device-ledger-history-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 13px;
}
.device-ledger-history-time {
font-weight: 600;
}
.device-ledger-history-operator {
color: var(--el-text-color-secondary);
}
.device-ledger-history-items {
display: flex;
flex-direction: column;
gap: 6px;
margin-top: 8px;
}
.device-ledger-history-item {
display: flex;
flex-direction: column;
gap: 8px;
padding: 10px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
background: var(--el-fill-color-blank);
}
.device-ledger-history-item-head {
display: flex;
align-items: center;
gap: 10px;
}
.device-ledger-history-item-body {
display: flex;
flex-direction: column;
gap: 6px;
width: 100%;
}
.device-ledger-history-item-row {
display: flex;
gap: 10px;
}
.device-ledger-history-item-label {
width: 70px;
flex: 0 0 70px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-value {
flex: 1;
color: var(--el-text-color-regular);
word-break: break-word;
}
.device-ledger-history-item-images {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 4px;
}
.device-ledger-history-item-image {
width: 76px;
height: 76px;
border-radius: 6px;
overflow: hidden;
}
.device-ledger-history-image-error {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
color: var(--el-text-color-secondary);
background: var(--el-fill-color);
}
.device-ledger-history-item-text {
color: var(--el-text-color-regular);
}
</style>

@ -211,8 +211,8 @@ const ensureDeviceOptionsLoaded = async () => {
if (deviceOptionsLoaded.value) return
deviceLoading.value = true
try {
const data = await DeviceLedgerApi.getDeviceLedgerPage({})
const rows = (data?.list ?? []) as DeviceLedgerVO[]
const data = await DeviceLedgerApi.getDeviceLedgerList({})
const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as DeviceLedgerVO[]
deviceOptions.value = rows
.filter((r) => typeof r?.id === 'number')
.map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r }))

@ -2,7 +2,8 @@
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="表名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入表名称" clearable @keyup.enter="handleQuery"
<el-input
v-model="queryParams.name" placeholder="请输入表名称" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
@ -13,7 +14,8 @@
</el-form-item>
<el-form-item label="时间范围" prop="timeRange">
<el-date-picker v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH"
<el-date-picker
v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH" start-placeholder="请选择开始时间" end-placeholder="请选择结束时间"
:default-time="[new Date('2000-01-01 00:00:00'), new Date('2000-01-01 23:00:00')]"
:disabled-time="getDisabledTime" class="!w-360px " popper-class="energydevicecheckPicker"
@ -33,13 +35,15 @@
</el-form-item>
</el-form>
<el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
<el-table
ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
:expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style="margin-top: 20px; min-height: 50vh"
@row-click="handleRowClick" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column type="expand" width="52">
<template #default="scope">
<el-table v-if="getPointDetailsRows(scope.row).length" :data="getPointDetailsRows(scope.row)"
<el-table
v-if="getPointDetailsRows(scope.row).length" :data="getPointDetailsRows(scope.row)"
:show-overflow-tooltip="true" size="small" border>
<el-table-column label="参数名称" prop="pointName" min-width="140" />
<el-table-column label="最早采集值" prop="earliestValue" min-width="120" />
@ -76,7 +80,8 @@
</el-table-column>
</el-table>
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
<Pagination
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</template>
@ -108,12 +113,27 @@ const getDisabledTime = () => {
}
}
const buildDefaultTimeRange = () => {
const pad = (n: number) => (n < 10 ? `0${n}` : String(n))
const end = new Date()
end.setMinutes(0, 0, 0)
const start = new Date(end.getTime() - 7 * 24 * 60 * 60 * 1000)
const format = (d: Date) => {
const y = d.getFullYear()
const m = pad(d.getMonth() + 1)
const day = pad(d.getDate())
const h = pad(d.getHours())
return `${y}-${m}-${day} ${h}:00:00`
}
return [format(start), format(end)] as string[]
}
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined as string | undefined,
orgId: undefined as string | number | undefined,
timeRange: [] as string[],
timeRange: buildDefaultTimeRange(),
startTime: undefined as string | undefined,
endTime: undefined as string | undefined
})
@ -187,7 +207,7 @@ const handleQuery = () => {
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
queryParams.timeRange = []
queryParams.timeRange = buildDefaultTimeRange()
handleQuery()
}

@ -64,13 +64,6 @@
<el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" />
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="enabled">
<el-radio-group v-model="formData.enabled">
<el-radio v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="String(dict.value)" :label="dict.value">
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
@ -127,11 +120,11 @@ const toCommaSeparatedIds = (value: any): string | undefined => {
const ensureOptionsLoaded = async () => {
const [deviceRes, planRes, userRes] = await Promise.all([
DeviceLedgerApi.getDeviceLedgerPage({}),
DeviceLedgerApi.getDeviceLedgerList({}),
PlanMaintenanceApi.getPlanMaintenancePage({ pageNo: 1, pageSize: 100 }),
getSimpleUserList()
])
deviceOptions.value = (deviceRes?.list ?? []) as DeviceOption[]
deviceOptions.value = (Array.isArray(deviceRes) ? deviceRes : deviceRes?.list ?? deviceRes?.data ?? []) as DeviceOption[]
planOptions.value = (planRes?.list ?? []) as PlanOption[]
users.value = userRes ?? []
}

@ -78,9 +78,12 @@
<el-table-column label="开始日期" align="center" prop="startDate" :formatter="dateFormatter2" width="120" />
<el-table-column label="结束日期" align="center" prop="endDate" :formatter="dateFormatter2" width="120" />
<el-table-column label="cron 表达式" align="center" prop="cronExpression" min-width="180" />
<el-table-column label="启用" align="center" prop="enabled" width="90">
<el-table-column label="启用" align="center" prop="enabled" width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />
<el-switch
:model-value="scope.row.enabled === true || scope.row.enabled === 'true'"
@change="(val) => handleEnabledChange(scope.row, val)"
/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="creator" width="120" />
@ -244,6 +247,19 @@ const handleCreateTicket = async (id?: number) => {
}
}
const handleEnabledChange = async (row: TaskManagementVO, value: boolean) => {
if (!row.id) return
const oldEnabled = row.enabled
row.enabled = value
try {
await TaskManagementApi.updateTaskManagementEnabled(String(row.id), value ? 'true' : 'false')
message.success('更新启用状态成功')
} catch {
row.enabled = oldEnabled
message.error('更新启用状态失败')
}
}
const handleExport = async () => {
try {
await message.exportConfirm()

@ -59,6 +59,7 @@ import { TicketManagementApi, TicketResultVO } from '@/api/mes/ticketManagement'
defineOptions({ name: 'TicketResultDialog' })
const emit = defineEmits(['success'])
const message = useMessage()
const dialogVisible = ref(false)
@ -140,6 +141,7 @@ const handleSave = async () => {
try {
await TicketManagementApi.batchUpdateTicketResults(payload)
message.success('更新成功')
emit('success')
dialogVisible.value = false
} catch {
message.error('更新失败')

@ -82,7 +82,7 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
@pagination="getList" />
</ContentWrap>
<TicketResultDialog ref="resultDialogRef" />
<TicketResultDialog ref="resultDialogRef" @success="getList" />
</template>
<script setup lang="ts">

@ -215,6 +215,7 @@ watch(
)
const formRules = reactive({
repairCode: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
repairName: [{ required: true, message: '维修单不能为空', trigger: 'blur' }],
moldId: [{ required: true, message: '模具不能为空', trigger: 'change' }],
})
const formRef = ref()

@ -21,7 +21,8 @@
</el-select>
</el-form-item>
<el-form-item label="起止日期" prop="dateRange">
<el-date-picker v-model="formData.dateRange" value-format="YYYY-MM-DD" type="daterange" start-placeholder=""
<el-date-picker
v-model="formData.dateRange" value-format="YYYY-MM-DD" type="daterange" start-placeholder="开始日期"
end-placeholder="结束日期" class="!w-320px" />
</el-form-item>
<el-form-item label="cron 表达式" prop="cronExpression">
@ -34,7 +35,8 @@
</el-form-item>
<el-form-item label="是否启用" prop="enabled">
<el-radio-group v-model="formData.enabled">
<el-radio v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="String(dict.value)"
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="String(dict.value)"
:label="dict.value">
{{ dict.label }}
</el-radio>

Loading…
Cancel
Save