style:物联设备-统计展示调整

main
黄伟杰 1 day ago
parent ae6a87281d
commit c2c4835c3a

@ -5552,7 +5552,7 @@ export default {
statisticsTotal: 'Total', statisticsTotal: 'Total',
statisticsRunning: 'Running', statisticsRunning: 'Running',
statisticsStandby: 'Standby', statisticsStandby: 'Standby',
statisticsFault: 'Alarms', statisticsFault: 'Faults',
statisticsOffline: 'Offline', statisticsOffline: 'Offline',
operatingStatusLabels: { operatingStatusLabels: {
running: 'Running', running: 'Running',

@ -5447,7 +5447,7 @@ export default {
statisticsTotal: '总数', statisticsTotal: '总数',
statisticsRunning: '运行数', statisticsRunning: '运行数',
statisticsStandby: '待机数', statisticsStandby: '待机数',
statisticsFault: '报警数', statisticsFault: '故障数',
statisticsOffline: '离线数', statisticsOffline: '离线数',
operatingStatusLabels: { operatingStatusLabels: {
running: '运行', running: '运行',

@ -965,11 +965,12 @@ const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // const exportLoading = ref(false) //
type DeviceOperatingStatusKey = 'running' | 'standby' | 'fault' | 'alarm' | 'offline' type DeviceOperatingStatusKey = 'running' | 'standby' | 'fault' | 'alarm' | 'offline'
type DeviceStatisticKey = 'total' | 'running' | 'standby' | 'alarm' | 'offline' type DeviceStatisticKey = 'total' | 'running' | 'standby' | 'fault' | 'alarm' | 'offline'
const deviceStatistics = reactive<Record<DeviceStatisticKey, number>>({ const deviceStatistics = reactive<Record<DeviceStatisticKey, number>>({
total: 0, total: 0,
running: 0, running: 0,
standby: 0, standby: 0,
fault: 0,
alarm: 0, alarm: 0,
offline: 0 offline: 0
}) })
@ -978,7 +979,7 @@ const deviceStatisticsItems = computed(() => [
{ key: 'running', label: t('DataCollection.Device.statisticsRunning'), value: deviceStatistics.running }, { key: 'running', label: t('DataCollection.Device.statisticsRunning'), value: deviceStatistics.running },
{ key: 'standby', label: t('DataCollection.Device.statisticsStandby'), value: deviceStatistics.standby }, { key: 'standby', label: t('DataCollection.Device.statisticsStandby'), value: deviceStatistics.standby },
{ key: 'fault', label: t('DataCollection.Device.statisticsFault'), value: deviceStatistics.fault }, { key: 'fault', label: t('DataCollection.Device.statisticsFault'), value: deviceStatistics.fault },
/*{ key: 'alarm', label: '报警数', value: deviceStatistics.alarm },*/ { key: 'alarm', label: '报警数', value: deviceStatistics.alarm },
{ key: 'offline', label: t('DataCollection.Device.statisticsOffline'), value: deviceStatistics.offline } { key: 'offline', label: t('DataCollection.Device.statisticsOffline'), value: deviceStatistics.offline }
]) ])
@ -987,7 +988,7 @@ const normalizeDeviceOperatingStatus = (value: string | number | undefined): Dev
if (['运行', '运行中', 'running', 'run', '1'].includes(text)) return 'running' if (['运行', '运行中', 'running', 'run', '1'].includes(text)) return 'running'
if (['待机', '待机中', 'standby', 'idle', '2'].includes(text)) return 'standby' if (['待机', '待机中', 'standby', 'idle', '2'].includes(text)) return 'standby'
if (['故障', '故障中', 'fault', 'error', '3'].includes(text)) return 'fault' if (['故障', '故障中', 'fault', 'error', '3'].includes(text)) return 'fault'
/* if (['报警', '报警中', 'alarm', 'warning', '4', '5'].includes(text)) return 'alarm'*/ if (['报警', '报警中', 'alarm', 'warning', '4', '5'].includes(text)) return 'alarm'
return 'offline' return 'offline'
} }
@ -1009,6 +1010,7 @@ const getDeviceStatistics = async () => {
total: Number(data?.totalCount ?? 0), total: Number(data?.totalCount ?? 0),
running: Number(data?.runningCount ?? 0), running: Number(data?.runningCount ?? 0),
standby: Number(data?.standbyCount ?? 0), standby: Number(data?.standbyCount ?? 0),
fault: Number(data?.faultCount ?? 0),
alarm: Number(data?.alarmCount ?? 0), alarm: Number(data?.alarmCount ?? 0),
offline: Number(data?.offlineCount ?? 0) offline: Number(data?.offlineCount ?? 0)
}) })
@ -1017,6 +1019,7 @@ const getDeviceStatistics = async () => {
total: 0, total: 0,
running: 0, running: 0,
standby: 0, standby: 0,
fault: 0,
alarm: 0, alarm: 0,
offline: 0 offline: 0
}) })
@ -2056,7 +2059,7 @@ const handleShowDeviceAlarmHistory = async () => {
<style lang="scss" scoped> <style lang="scss" scoped>
.device-statistics { .device-statistics {
display: grid; display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr)); grid-template-columns: repeat(6, minmax(0, 1fr));
gap: 10px; gap: 10px;
margin-bottom: 16px; margin-bottom: 16px;
} }
@ -2095,7 +2098,7 @@ const handleShowDeviceAlarmHistory = async () => {
} }
.device-statistics__item--alarm .device-statistics__value { .device-statistics__item--alarm .device-statistics__value {
color: #f56c6c; color: #e6a23c;
} }
.device-statistics__item--offline .device-statistics__value, .device-statistics__item--offline .device-statistics__value,

@ -405,7 +405,7 @@
clearable clearable
class="!w-220px" class="!w-220px"
> >
<el-option :label="t('MoldManagement.MoldBrandPage.standby')" :value="1" /> <el-option :label="t('MoldManagement.MoldBrandPage.inStock')" :value="4" />
<el-option :label="t('MoldManagement.MoldBrandPage.repairing')" :value="2" /> <el-option :label="t('MoldManagement.MoldBrandPage.repairing')" :value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -601,7 +601,7 @@ const moldDialogQueryParams = reactive({
pageSize: 10, pageSize: 10,
code: undefined as string | undefined, code: undefined as string | undefined,
name: undefined as string | undefined, name: undefined as string | undefined,
status: 1 as number | undefined status: 4 as number | undefined
}) })
const users = ref<UserVO[]>([]) const users = ref<UserVO[]>([])
@ -671,7 +671,7 @@ const openMoldDialog = async () => {
moldDialogQueryParams.pageNo = 1 moldDialogQueryParams.pageNo = 1
moldDialogQueryParams.code = undefined moldDialogQueryParams.code = undefined
moldDialogQueryParams.name = undefined moldDialogQueryParams.name = undefined
moldDialogQueryParams.status = 1 moldDialogQueryParams.status = 4
await getMoldDialogList() await getMoldDialogList()
} }
@ -682,7 +682,7 @@ const handleMoldDialogQuery = () => {
const resetMoldDialogQuery = () => { const resetMoldDialogQuery = () => {
moldDialogQueryFormRef.value?.resetFields?.() moldDialogQueryFormRef.value?.resetFields?.()
moldDialogQueryParams.status = 1 moldDialogQueryParams.status = 4
handleMoldDialogQuery() handleMoldDialogQuery()
} }

Loading…
Cancel
Save