kkk-ops 4 months ago
commit a229aefdff

@ -83,7 +83,7 @@ export const MoldBrandApi = {
}, },
getMoldPageWithoutPaging: async () => { 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) => { createMold: async (data) => {

@ -45,6 +45,10 @@ export const DeviceLedgerApi = {
return await request.get({ url: `/mes/device-ledger/page`, params }) 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) => { getDeviceLedger: async (id: number) => {
return await request.get({ url: `/mes/device-ledger/get?id=` + id }) return await request.get({ url: `/mes/device-ledger/get?id=` + id })

@ -43,5 +43,10 @@ export const TaskManagementApi = {
exportTaskManagement: async (params: any) => { exportTaskManagement: async (params: any) => {
return await request.download({ url: `/mes/task-management/export-excel`, params }) 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

@ -1,146 +1,244 @@
<template> <template>
<div> <div class="home-page">
<el-card shadow="never"> <div class="home-welcome">
<el-skeleton :loading="loading" animated> <div class="home-welcome-left">
<el-row :gutter="16" justify="space-between"> <div class="home-welcome-title text-white!">欢迎使用您的云上数字工厂</div>
<el-col :xl="8" :lg="8" :md="12" :sm="24" :xs="24"> <div class="home-welcome-desc text-white! opacity-80">
<div class="flex items-center"> 云上数字工厂可以整合您工厂所有设备自动化信息化的教据帮助您对工厂和生产进行建模管理统一主教报及应用集成打造您工厂的教字中心和业务中心并且与产业链相关系统协同不断提升您的智能制造能力
<el-avatar :src="avatar" :size="70" class="mr-16px">
<img src="@/assets/imgs/profile.jpg" alt="" />
</el-avatar>
<div>
<div class="text-20px">
{{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
</div>
<div v-if="weatherEnable" class="mt-10px text-14px text-gray-500">
<span style="color: #2bb673">{{ weatherCity }}</span>: 白天{{ todayWeather.dayweather }}晚上{{ todayWeather.nightweather }}
</div> </div>
<div v-if="weatherEnable" class="mt-10px text-14px text-gray-500">
气温<span style="color: #e1820a">{{ todayWeather.daytemp }}°C~{{ todayWeather.nighttemp }}°C</span>
{{ todayWeather.daywind }}{{ todayWeather.daypower }}
</div> </div>
<div class="home-welcome-right">
<el-image
alt="banner" :src="bannerImg" fit="contain" class="home-welcome-image"
style="height: 180px;margin-right:100px" />
</div> </div>
</div> </div>
</el-col> <el-card shadow="never" class="home-section">
<el-col :xl="8" :lg="8" :md="12" :sm="24" :xs="24"> <div class="section-header">
<div class="flex items-center"> <div class="section-title">整体生产概况</div>
<el-col v-for="item in weatherList.slice(1, 4)" :key="item.date" :xl="12" :lg="12" :md="12" :sm="12" :xs="12">
<div> <div>
<div class="text-16px"> <el-date-picker
{{ item.date }} v-model="productionOverviewRange" type="daterange" unlink-panels value-format="YYYY-MM-DD"
start-placeholder="开始日期" end-placeholder="结束日期" size="small" />
</div> </div>
<div class="mt-10px text-14px text-gray-500">
白天{{ item.dayweather }}晚上{{ item.nightweather }}气温
<span style="color: #e1820a">{{ item.daytemp }}°C~{{ item.nighttemp }}°C</span>
{{ item.daywind }}{{ item.daypower }}
</div> </div>
<el-row class="production-overview-row" :gutter="0">
<el-col :span="10" class="production-overview-group production-overview-group-left">
<div v-for="item in productionOverviewLeft" :key="item.key" class="production-overview-item">
<div class="production-overview-label">{{ item.label }}</div>
<div class="production-overview-value">{{ item.value }}</div>
</div> </div>
</el-col> </el-col>
<el-col :span="10" class="production-overview-group production-overview-group-center">
<div v-for="item in productionOverviewCenter" :key="item.key" class="production-overview-item">
<div class="production-overview-label">{{ item.label }}</div>
<div class="production-overview-value production-overview-value-primary">{{ item.value }}</div>
</div> </div>
</el-col> </el-col>
<el-col :xl="8" :lg="8" :md="12" :sm="24" :xs="24"> <el-col :span="4" class="production-overview-group production-overview-group-right">
<div> <div v-for="item in productionOverviewRight" :key="item.key" class="production-overview-item">
<div class="production-overview-label">{{ item.label }}</div>
<div class="production-overview-value">{{ item.value }}</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-skeleton>
</el-card> </el-card>
<el-card shadow="never" class="home-section">
<div class="section-header">
<div class="section-title">实时生产进度</div>
</div>
<el-carousel height="190px" arrow="always" indicator-position="none" :interval="15000" class="progress-carousel">
<el-carousel-item v-for="(group, index) in productionProgressGroups" :key="index">
<el-row :gutter="16">
<el-col v-for="item in group" :key="item.id" :xl="8" :lg="8" :md="8" :sm="12" :xs="24">
<div class="progress-card">
<div class="progress-card-header">生产工单 {{ item.orderNo }}</div>
<div class="progress-card-body">
<div class="progress-col">
<div class="progress-row">
<span class="progress-label">产品名称</span>
<span class="progress-value">{{ item.productName }}</span>
</div>
<div class="progress-row">
<span class="progress-label">任务数量</span>
<span class="progress-value">-</span>
</div>
<div class="progress-row">
<span class="progress-label">客户简称</span>
<span class="progress-value">-</span>
</div>
<div class="progress-row">
<span class="progress-label">交货时间</span>
<span class="progress-value">{{ item.planEndTime }}</span>
</div>
<div class="progress-row">
<span class="progress-label">投产时间</span>
<span class="progress-value">{{ item.planStartTime }}</span>
</div> </div>
<div>
<img alt="" src="@/assets/imgs/workflow.png" />
</div> </div>
<el-row class="mt-8px" :gutter="8" justify="space-between"> <div class="progress-col">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px"> <div class="progress-row">
<span class="progress-label">产品型号</span>
<span class="progress-value">-</span>
</div>
<div class="progress-row">
<span class="progress-label">完成数量</span>
<span class="progress-value">-</span>
</div>
<div class="progress-row">
<span class="progress-label">完成进度</span>
<span class="progress-value">{{ item.completeRate }}%</span>
</div>
<div class="progress-row">
<span class="progress-label">工单状态</span>
<span class="progress-value">{{ item.statusText }}</span>
</div>
<div class="progress-row">
<span class="progress-label">完工时间</span>
<span class="progress-value">-</span>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
</el-carousel-item>
</el-carousel>
</el-card>
<el-row :gutter="16" class="home-section">
<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
<el-card shadow="never"> <el-card shadow="never">
<template #header> <div class="section-header">
<div class="h-3 flex justify-between"> <div class="section-title">设备</div>
<span>生产进度</span> <div class="section-actions">
<el-link <el-button type="default">查看文档</el-button>
type="primary" <el-button type="primary">添加设备</el-button>
:underline="false"
href="https://github.com/yudaocode"
target="_blank"
>
{{ t('action.more') }}
</el-link>
</div> </div>
</template>
<div>
<div class="demo-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="70" />
<el-progress
:text-inside="true"
:stroke-width="24"
:percentage="100"
status="success"
/>
<el-progress
:text-inside="true"
:stroke-width="22"
:percentage="80"
status="warning"
/>
<el-progress
:text-inside="true"
:stroke-width="20"
:percentage="50"
status="exception"
/>
</div> </div>
<el-row :gutter="12" class="mt-16px">
<el-col v-for="item in deviceStatusCards" :key="item.key" :span="8">
<div class="mini-card" :class="item.level">
<div class="mini-label">{{ item.label }}</div>
<div class="mini-value">{{ item.value }}</div>
</div> </div>
</el-col>
</el-row>
</el-card> </el-card>
</el-col>
<el-card shadow="never" class="mt-8px"> <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24" class="mt-16px xl:mt-0 lg:mt-0">
<el-skeleton :loading="loading" animated> <el-card shadow="never">
<el-row :gutter="20" justify="space-between"> <div class="section-header">
<el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24"> <div class="section-title">告警</div>
<el-card shadow="hover" class="mb-8px"> </div>
<el-skeleton :loading="loading" animated> <el-row :gutter="12" class="mt-16px">
<Echart :options="pieOptionsData" :height="280" /> <el-col v-for="item in alarmStatusCards" :key="item.key" :span="8">
</el-skeleton> <div class="mini-card" :class="item.level">
<div class="mini-label">{{ item.label }}</div>
<div class="mini-value">{{ item.value }}</div>
</div>
</el-col>
</el-row>
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24"> </el-row>
<el-card shadow="hover" class="mb-8px"> <el-card shadow="never" class="home-section">
<el-skeleton :loading="loading" animated> <div class="section-header">
<Echart :options="barOptionsData" :height="280" /> <div class="section-title">设备整体情况</div>
</el-skeleton> <div>
<el-date-picker
v-model="deviceOverviewRange" type="daterange" unlink-panels value-format="YYYY-MM-DD"
start-placeholder="开始日期" end-placeholder="结束日期" size="small" />
</div>
</div>
<el-row class="device-overview-row" :gutter="0">
<el-col v-for="item in deviceOverviewTop" :key="item.key" :span="2">
<div class="device-overview-item">
<div class="production-overview-label">{{ item.label }}</div>
<div class="production-overview-value production-overview-value-primary">{{ item.value }}</div>
</div>
</el-col>
<el-col v-for="item in deviceOverviewBottom" :key="item.key" :span="2">
<div class="device-overview-item">
<div class="production-overview-label">{{ item.label }}</div>
<div class="production-overview-value production-overview-value-primary">{{ item.value }}</div>
</div>
</el-col>
</el-row>
</el-card> </el-card>
<el-card shadow="never" class="home-section">
<div class="section-header">
<div class="section-title">待办任务</div>
</div>
<el-carousel height="160px" arrow="always" indicator-position="none" class="todo-carousel" :interval="15000">
<el-carousel-item v-for="(group, index) in todoTaskGroups" :key="index">
<el-row :gutter="16">
<el-col v-for="item in group" :key="item.id" :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
<div class="todo-card">
<div class="todo-title">{{ item.name }}</div>
<div class="todo-sub">任务编号{{ item.id }}</div>
<div class="todo-sub">任务类型{{ item.type }}优先级{{ item.priority }}</div>
<div class="todo-sub">计划时间{{ item.planTime }}</div>
<div class="todo-sub">责任部门{{ item.owner }}</div>
</div>
</el-col> </el-col>
</el-row> </el-row>
</el-skeleton> </el-carousel-item>
</el-carousel>
</el-card>
<el-row :gutter="16" class="home-section">
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-16px">
<el-card shadow="never">
<template #header>
<div class="h-3 flex justify-between">
<span>设备维修数量统计</span>
</div>
</template>
<Echart :options="deviceRepairLineOptionsData" :height="260" />
</el-card> </el-card>
</el-col> </el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px"> <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-16px">
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<div class="h-3 flex justify-between"> <div class="h-3 flex justify-between">
<span>{{ t('workplace.shortcutOperation') }}</span> <span>设备分类统计</span>
</div> </div>
</template> </template>
<el-skeleton :loading="loading" animated> <Echart :options="deviceCategoryPieOptionsData" :height="260" />
<el-row> </el-card>
<el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px"> </el-col>
<div class="flex items-center" @click="navigateToRoute(item.url)"> <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-16px">
<Icon :icon="item.icon" class="mr-8px" /> <el-card shadow="never">
<el-link type="default" :underline="false" @click="setWatermark(item.name)"> <template #header>
{{ item.name }} <div class="h-3 flex justify-between">
</el-link> <span>设备分布统计</span>
</div> </div>
</template>
<Echart :options="deviceDistributionBarOptionsData" :height="260" />
</el-card>
</el-col> </el-col>
</el-row> </el-row>
</el-skeleton> <el-row :gutter="16" class="home-section" justify="space-between">
</el-card> <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-16px">
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<div class="h-3 flex justify-between"> <div class="h-3 flex justify-between">
<span>大屏看板</span> <span>每周用户活跃量</span>
</div>
</template>
<Echart :options="barOptionsData" :height="260" />
</el-card>
</el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24">
<el-card shadow="never" class="mb-16px">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.shortcutOperation') }}</span>
</div> </div>
</template> </template>
<el-skeleton :loading="loading" animated> <el-skeleton :loading="loading" animated>
<el-row> <el-row>
<el-col v-for="item in kanban" :key="`team-${item.name}`" :span="8" class="mb-8px"> <el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">
<div class="flex items-center" @click="jumpToRoute(item.url)"> <div class="flex items-center" @click="navigateToRoute(item.url)">
<Icon :icon="item.icon" class="mr-8px" /> <Icon :icon="item.icon" class="mr-8px" />
<el-link type="default" :underline="false" @click="setWatermark(item.name)"> <el-link type="default" :underline="false" @click="setWatermark(item.name)">
{{ item.name }} {{ item.name }}
@ -150,7 +248,7 @@
</el-row> </el-row>
</el-skeleton> </el-skeleton>
</el-card> </el-card>
<el-card shadow="never" class="mt-8px"> <el-card shadow="never">
<template #header> <template #header>
<div class="h-3 flex justify-between"> <div class="h-3 flex justify-between">
<span>{{ t('workplace.notice') }}</span> <span>{{ t('workplace.notice') }}</span>
@ -180,6 +278,8 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- 旧首页布局保留已通过新模块替代展示 -->
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { set } from 'lodash-es' import { set } from 'lodash-es'
@ -187,10 +287,34 @@ import { EChartsOption } from 'echarts'
import { formatTime } from '@/utils' import { formatTime } from '@/utils'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark' import { useWatermark } from '@/hooks/web/useWatermark'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types' import type {
import { pieOptions, barOptions } from './echarts-data' WorkplaceTotal,
import {HomeApi} from "@/api/home/info"; Project,
import { WeatherVO } from "@/api/home/info"; Notice,
Shortcut,
ProductionOverview,
ProductionProgressItem,
DeviceStatusSummary,
AlarmStatusSummary,
DeviceOverview,
TodoTask
} from './types'
import {
pieOptions,
barOptions,
deviceRepairLineOptions,
deviceCategoryPieOptions,
deviceDistributionBarOptions,
productionOverviewMock,
productionProgressMock,
deviceStatusMock,
alarmStatusMock,
deviceOverviewMock,
todoTasksMock
} from './echarts-data'
import { HomeApi } from '@/api/home/info'
import { WeatherVO } from '@/api/home/info'
import bannerImg from '@/assets/imgs/banner.png'
defineOptions({ name: 'Home' }) defineOptions({ name: 'Home' })
@ -201,6 +325,201 @@ const loading = ref(true)
const avatar = userStore.getUser.avatar const avatar = userStore.getUser.avatar
const username = userStore.getUser.nickname const username = userStore.getUser.nickname
const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
const deviceRepairLineOptionsData = reactive<EChartsOption>(
deviceRepairLineOptions
) as EChartsOption
const deviceCategoryPieOptionsData = reactive<EChartsOption>(
deviceCategoryPieOptions
) as EChartsOption
const deviceDistributionBarOptionsData = reactive<EChartsOption>(
deviceDistributionBarOptions
) as EChartsOption
const productionOverview = ref<ProductionOverview>(productionOverviewMock)
const productionOverviewRange = ref<string[]>([])
const deviceOverview = ref<DeviceOverview>(deviceOverviewMock)
const deviceOverviewRange = ref<string[]>([])
const productionProgressTab = ref('all')
const productionProgressList = ref<ProductionProgressItem[]>(productionProgressMock)
const todoTaskList = ref<TodoTask[]>(todoTasksMock)
const deviceStatus = ref<DeviceStatusSummary>(deviceStatusMock)
const alarmStatus = ref<AlarmStatusSummary>(alarmStatusMock)
const filteredProductionProgressList = computed(() => {
return productionProgressList.value
})
const formatPercent = (value: number | undefined | null) => {
if (value === null || value === undefined) return '0%'
if (Number.isNaN(value)) return '0%'
return `${value}%`
}
const productionOverviewLeft = computed(() => [
{
key: 'orderCount',
label: '生产订单数',
value: productionOverview.value.orderCount
},
{
key: 'runningOrderCount',
label: '生产工单数',
value: productionOverview.value.runningOrderCount
},
{
key: 'startedOrderCount',
label: '开工工单数',
value: productionOverview.value.startedOrderCount
},
{
key: 'shutdownOrderCount',
label: '完工工单数',
value: productionOverview.value.shutdownOrderCount
}
])
const productionOverviewCenter = computed(() => [
{
key: 'plannedOutput',
label: '计划生产数量',
value: productionOverview.value.plannedOutput?.toLocaleString()
},
{
key: 'completedOutput',
label: '完成生产数量',
value: productionOverview.value.completedOutput?.toLocaleString()
},
{
key: 'completionRate',
label: '完工率',
value: formatPercent(productionOverview.value.qualifiedRate)
},
{
key: 'qualifiedRate',
label: '合格率',
value: formatPercent(productionOverview.value.alarmRate)
}
])
const productionOverviewRight = computed(() => [
{
key: 'attendanceCount',
label: '出勤人数',
value: productionOverview.value.onTimeRate ?? 0
},
{
key: 'attendanceRate',
label: '出勤率',
value: formatPercent(productionOverview.value.onTimeRate)
}
])
const deviceOverviewTop = computed(() => [
{
key: 'deviceTotal',
label: '总设备数',
value: deviceOverview.value.deviceTotal?.toLocaleString()
},
{
key: 'realtimeAlarm',
label: '实时告警',
value: deviceOverview.value.needRepair ?? 0
},
{
key: 'running',
label: '运行',
value: deviceOverview.value.running ?? 0
},
{
key: 'stop',
label: '停机',
value: deviceOverview.value.stop ?? 0
},
{
key: 'standby',
label: '待机',
value: 0
},
{
key: 'utilization',
label: '利用率',
value: formatPercent(deviceOverview.value.utilization)
},
{
key: 'faultRate',
label: '故障率',
value: formatPercent(deviceOverview.value.alarmRate)
}
])
const deviceOverviewBottom = computed(() => [
{
key: 'faultCount',
label: '设备故障台数',
value: deviceOverview.value.needRepair ?? 0
},
{
key: 'faultTime',
label: '设备故障时间',
value: 0
},
{
key: 'mtbf',
label: '平均故障间隔时间',
value: 0
},
{
key: 'mttr',
label: '平均故障时间',
value: 0
}
])
const deviceStatusCards = computed(() => [
{
key: 'inactive',
label: '非活动',
value: deviceStatus.value.inactive,
level: 'mini-danger'
},
{
key: 'active',
label: '活动',
value: deviceStatus.value.active,
level: 'mini-normal'
},
{
key: 'total',
label: '总数',
value: deviceStatus.value.total,
level: 'mini-total'
}
])
const alarmStatusCards = computed(() => [
{
key: 'serious',
label: '严重',
value: alarmStatus.value.serious,
level: 'mini-danger'
},
{
key: 'assignedToMe',
label: '分配给我',
value: alarmStatus.value.assignedToMe,
level: 'mini-normal'
},
{
key: 'total',
label: '总数',
value: alarmStatus.value.total,
level: 'mini-total'
}
])
const groupBySize = <T,>(list: T[], size: number) => {
const result: T[][] = []
for (let i = 0; i < list.length; i += size) {
result.push(list.slice(i, i + size))
}
return result
}
const productionProgressGroups = computed(() => groupBySize(filteredProductionProgressList.value, 3))
const todoTaskGroups = computed(() => groupBySize(todoTaskList.value, 4))
// //
let totalSate = reactive<WorkplaceTotal>({ let totalSate = reactive<WorkplaceTotal>({
project: 0, project: 0,
@ -460,15 +779,283 @@ const getKanban = async () => {
getAllApi() getAllApi()
</script> </script>
<style scoped> <style scoped>
.demo-progress .el-progress--line { .home-page {
max-width: 600px; display: flex;
margin-bottom: 15px; flex-direction: column;
gap: 16px;
} }
img{ .home-section {
width: 100%; margin-bottom: 16px;
height: 100%; }
object-fit: cover;
.home-welcome {
min-height: 240px;
display: flex;
justify-content: space-between;
align-items: center;
background: linear-gradient(90deg, #3a6bc5 0%, #2a5298 100%);
padding: 0 24px;
border-radius: 4px;
}
.home-welcome-left {
max-width: 60%;
}
.home-welcome-title {
font-size: 32px;
font-weight: 500;
margin-bottom: 8px;
}
.home-welcome-desc {
font-size: 14px;
color: #909399;
}
.home-welcome-right img {
width: 360px;
height: auto;
}
.section-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.section-title {
font-size: 16px;
font-weight: 600;
}
.section-actions {
display: flex;
gap: 8px;
}
.home-welcome-right {
display: flex;
align-items: flex-end;
}
.home-welcome-image {
max-height: 180px;
width: auto;
}
.production-overview-row {
margin-top: 16px;
display: flex;
align-items: stretch;
gap: 48px;
}
.production-overview-group {
display: flex;
flex: 1;
justify-content: space-between;
gap: 32px;
}
.production-overview-group-center {
border-left: 1px solid var(--el-border-color-lighter);
border-right: 1px solid var(--el-border-color-lighter);
padding: 0 48px;
}
.production-overview-item {
display: flex;
flex-direction: column;
align-items: flex-start;
}
.production-overview-label {
font-size: 13px;
color: var(--el-text-color-secondary);
}
.production-overview-value {
margin-top: 8px;
font-size: 20px;
font-weight: 600;
color: var(--el-text-color-primary);
}
.production-overview-value-primary {
color: #409eff;
}
.device-overview-row {
margin-top: 12px;
}
.device-overview-row-bottom {
margin-top: 4px;
}
.device-overview-item {
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0 16px;
}
:deep(.device-overview-row .el-col:not(:last-child) .device-overview-item) {
border-right: 1px solid var(--el-border-color-lighter);
}
.stat-card {
padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa;
}
.stat-label {
font-size: 13px;
color: #909399;
}
.stat-value {
margin-top: 8px;
font-size: 20px;
font-weight: 600;
}
.stat-primary {
color: #409eff;
}
.stat-danger {
color: #f56c6c;
}
.progress-carousel,
.todo-carousel {
margin-top: 16px;
}
.progress-carousel :deep(.el-carousel__arrow) {
top: 50%;
transform: translateY(-50%);
}
.progress-carousel :deep(.el-carousel__arrow--left) {
left: -8px;
}
.progress-carousel :deep(.el-carousel__arrow--right) {
right: -8px;
}
.progress-card {
padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa;
height: 180px;
display: flex;
flex-direction: column;
}
.progress-card-header {
font-size: 14px;
font-weight: 600;
margin-bottom: 8px;
}
.progress-card-body {
display: flex;
gap: 40px;
} }
.progress-col {
flex: 1;
display: flex;
flex-direction: column;
gap: 4px;
}
.progress-row {
display: flex;
font-size: 12px;
}
.progress-label {
width: 80px;
flex-shrink: 0;
color: #909399;
}
.progress-value {
flex: 1;
color: #303133;
word-break: break-word;
}
.mini-card {
padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa;
}
.mini-label {
font-size: 13px;
color: #909399;
}
.mini-value {
margin-top: 8px;
font-size: 18px;
font-weight: 600;
}
.mini-danger {
background-color: #fde2e2;
}
.mini-normal {
background-color: #f5f7fa;
}
.mini-total {
background-color: #e9f5ff;
}
.todo-card {
padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa;
height: 150px;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.todo-title {
font-size: 14px;
font-weight: 600;
}
.todo-sub {
margin-top: 4px;
font-size: 12px;
color: #909399;
}
@media (max-width: 768px) {
.home-welcome {
flex-direction: column;
align-items: flex-start;
}
.home-welcome-left {
max-width: 100%;
margin-bottom: 12px;
}
.home-welcome-right img {
width: 100%;
}
}
</style> </style>

@ -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 = { export const radarOption: EChartsOption = {
legend: { legend: {
data: [t('workplace.personal'), t('workplace.team')] data: [t('workplace.personal'), t('workplace.team')]

@ -53,3 +53,55 @@ export type MonthlySales = {
estimate: number estimate: number
actual: 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,12 +1,7 @@
<template> <template>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-button <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:mold-brand:create']">
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['erp:mold-brand:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
@ -15,12 +10,7 @@
<!-- <el-table-column label="单位" align="center" prop="unitName" /> --> <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
<el-table-column label="使用次数/次" align="center" prop="useTime" /> <el-table-column label="使用次数/次" align="center" prop="useTime" />
<el-table-column <el-table-column label="入库时间" align="center" prop="inTime" :formatter="dateFormatter" />
label="入库时间"
align="center"
prop="inTime"
:formatter="dateFormatter"
/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
@ -35,15 +25,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
label="创建时间" <el-table-column label="操作" align="center" fixed="right" width="200px">
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" fixed="right" width="150px">
<template #default="scope"> <template #default="scope">
<el-button link @click="openDetail(scope.row.id)">
详情
</el-button>
<!-- <el-button <!-- <el-button
link link
type="success" type="success"
@ -53,19 +40,11 @@
维保 维保
</el-button> --> </el-button> -->
<el-button <el-button
link link type="primary" @click="openForm('update', scope.row.id)"
type="primary" v-hasPermi="['erp:mold-brand:update']">
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:mold-brand:update']"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:mold-brand:delete']">
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['erp:mold-brand:delete']"
>
删除 删除
</el-button> </el-button>
</template> </template>
@ -73,22 +52,231 @@
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination
:total="total" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNo" @pagination="getList" />
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap> </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" /> <MoldRecordForm ref="recordFormRef" @success="getList" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict' import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter, formatDate } from '@/utils/formatTime'
import { MoldBrandApi } from '@/api/erp/mold' import { MoldBrandApi, type MoldVO } from '@/api/erp/mold'
import MoldForm from './MoldForm.vue' import MoldForm from './MoldForm.vue'
import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue"; import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue";
@ -167,4 +355,290 @@ const openRecordForm = (type: string, id?: number, brandId?:number) => {
recordFormRef.value.open(type, id, brandId) 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> </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 if (deviceOptionsLoaded.value) return
deviceLoading.value = true deviceLoading.value = true
try { try {
const data = await DeviceLedgerApi.getDeviceLedgerPage({}) const data = await DeviceLedgerApi.getDeviceLedgerList({})
const rows = (data?.list ?? []) as DeviceLedgerVO[] const rows = (Array.isArray(data) ? data : data?.list ?? data?.data ?? []) as DeviceLedgerVO[]
deviceOptions.value = rows deviceOptions.value = rows
.filter((r) => typeof r?.id === 'number') .filter((r) => typeof r?.id === 'number')
.map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r })) .map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r }))

@ -2,7 +2,8 @@
<ContentWrap> <ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="表名称" prop="name"> <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" /> class="!w-240px" />
</el-form-item> </el-form-item>
@ -13,7 +14,8 @@
</el-form-item> </el-form-item>
<el-form-item label="时间范围" prop="timeRange"> <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="请选择结束时间" 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')]" :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" :disabled-time="getDisabledTime" class="!w-360px " popper-class="energydevicecheckPicker"
@ -33,13 +35,15 @@
</el-form-item> </el-form-item>
</el-form> </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" :expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style="margin-top: 20px; min-height: 50vh"
@row-click="handleRowClick" @selection-change="handleSelectionChange"> @row-click="handleRowClick" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column type="expand" width="52"> <el-table-column type="expand" width="52">
<template #default="scope"> <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> :show-overflow-tooltip="true" size="small" border>
<el-table-column label="参数名称" prop="pointName" min-width="140" /> <el-table-column label="参数名称" prop="pointName" min-width="140" />
<el-table-column label="最早采集值" prop="earliestValue" min-width="120" /> <el-table-column label="最早采集值" prop="earliestValue" min-width="120" />
@ -76,7 +80,8 @@
</el-table-column> </el-table-column>
</el-table> </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" /> @pagination="getList" />
</ContentWrap> </ContentWrap>
</template> </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({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
name: undefined as string | undefined, name: undefined as string | undefined,
orgId: undefined as string | number | undefined, orgId: undefined as string | number | undefined,
timeRange: [] as string[], timeRange: buildDefaultTimeRange(),
startTime: undefined as string | undefined, startTime: undefined as string | undefined,
endTime: undefined as string | undefined endTime: undefined as string | undefined
}) })
@ -187,7 +207,7 @@ const handleQuery = () => {
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
queryParams.timeRange = [] queryParams.timeRange = buildDefaultTimeRange()
handleQuery() handleQuery()
} }

@ -64,13 +64,6 @@
<el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" /> <el-option v-for="item in users" :key="String(item.id)" :label="item.nickname" :value="String(item.id)" />
</el-select> </el-select>
</el-form-item> </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> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
@ -127,11 +120,11 @@ const toCommaSeparatedIds = (value: any): string | undefined => {
const ensureOptionsLoaded = async () => { const ensureOptionsLoaded = async () => {
const [deviceRes, planRes, userRes] = await Promise.all([ const [deviceRes, planRes, userRes] = await Promise.all([
DeviceLedgerApi.getDeviceLedgerPage({}), DeviceLedgerApi.getDeviceLedgerList({}),
PlanMaintenanceApi.getPlanMaintenancePage({ pageNo: 1, pageSize: 100 }), PlanMaintenanceApi.getPlanMaintenancePage({ pageNo: 1, pageSize: 100 }),
getSimpleUserList() 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[] planOptions.value = (planRes?.list ?? []) as PlanOption[]
users.value = userRes ?? [] 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="startDate" :formatter="dateFormatter2" width="120" />
<el-table-column label="结束日期" align="center" prop="endDate" :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="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"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="creator" width="120" /> <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 () => { const handleExport = async () => {
try { try {
await message.exportConfirm() await message.exportConfirm()

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

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

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

@ -21,7 +21,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起止日期" prop="dateRange"> <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" /> end-placeholder="结束日期" class="!w-320px" />
</el-form-item> </el-form-item>
<el-form-item label="cron 表达式" prop="cronExpression"> <el-form-item label="cron 表达式" prop="cronExpression">
@ -34,7 +35,8 @@
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="enabled"> <el-form-item label="是否启用" prop="enabled">
<el-radio-group v-model="formData.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"> :label="dict.value">
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>

Loading…
Cancel
Save