From 286619b69e4004c6bcaff4cb19a40b77b053453d Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:33 +0800
Subject: [PATCH] feat: 前端补齐排产约束、风险监测与招投标比价界面
---
src/views/mes/dv/repair/index.vue | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index 8d9995d..8ebe49b 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -1,19 +1,76 @@
锘�<script lang="ts" setup>
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesDvRepairApi } from '#/api/mes/dv/repair';
+import type { MesCollectApi } from '#/api/mes/dv/collect';
+
+import { onBeforeUnmount, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { MesDvRepairStatusEnum } from '@vben/constants';
import { downloadFileFromBlobPart } from '@vben/utils';
-import { Button, message } from 'ant-design-vue';
+import { Alert, Button, Descriptions, message, Modal, Table } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteRepair, exportRepair, getRepairPage } from '#/api/mes/dv/repair';
+import { getCollectAlarmPage, getCollectDeviceList } from '#/api/mes/dv/collect';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
+
+const diagnosisOpen = ref(false);
+const diagnosisLoading = ref(false);
+const diagnosisError = ref('');
+const diagnosisRow = ref<MesDvRepairApi.Repair>();
+const diagnosisDevice = ref<MesCollectApi.CollectDevice>();
+const diagnosisAlarms = ref<MesCollectApi.CollectAlarm[]>([]);
+let diagnosisSequence = 0;
+let diagnosisTimer: ReturnType<typeof setInterval> | undefined;
+
+async function refreshDiagnosis() {
+ const row = diagnosisRow.value;
+ if (!diagnosisOpen.value || !row?.machineryId || diagnosisLoading.value) return;
+ const sequence = ++diagnosisSequence;
+ diagnosisLoading.value = true;
+ diagnosisError.value = '';
+ try {
+ const devices = await getCollectDeviceList();
+ const device = devices.find((item) => item.machineryId === row.machineryId);
+ const alarms = device?.collectDeviceCode
+ ? await getCollectAlarmPage({ pageNo: 1, pageSize: 20, deviceCode: device.collectDeviceCode } as any)
+ : undefined;
+ if (sequence !== diagnosisSequence) return;
+ diagnosisDevice.value = device;
+ diagnosisAlarms.value = alarms?.list || [];
+ } catch {
+ if (sequence === diagnosisSequence) {
+ diagnosisDevice.value = undefined;
+ diagnosisAlarms.value = [];
+ diagnosisError.value = '璁惧鏁伴噰鎴栧憡璀︽暟鎹姞杞藉け璐ワ紝璇锋鏌ユ潈闄愬拰鏁伴噰鏈嶅姟銆�';
+ }
+ } finally {
+ if (sequence === diagnosisSequence) diagnosisLoading.value = false;
+ }
+}
+function openDiagnosis(row: MesDvRepairApi.Repair) {
+ diagnosisSequence++;
+ diagnosisLoading.value = false;
+ diagnosisRow.value = row;
+ diagnosisDevice.value = undefined;
+ diagnosisAlarms.value = [];
+ diagnosisOpen.value = true;
+ void refreshDiagnosis();
+ if (diagnosisTimer) clearInterval(diagnosisTimer);
+ diagnosisTimer = setInterval(() => void refreshDiagnosis(), 30000);
+}
+function closeDiagnosis() {
+ diagnosisSequence++;
+ diagnosisLoading.value = false;
+ if (diagnosisTimer) clearInterval(diagnosisTimer);
+ diagnosisTimer = undefined;
+}
+onBeforeUnmount(closeDiagnosis);
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
@@ -170,9 +227,33 @@
auth: ['mes:dv-repair:query'],
onClick: handleDetail.bind(null, row),
},
+ {
+ label: '鏁伴噰璇婃柇',
+ type: 'link',
+ auth: ['mes:collect:query'],
+ onClick: openDiagnosis.bind(null, row),
+ },
]"
/>
</template>
</Grid>
+ <Modal v-model:open="diagnosisOpen" title="璁惧鏁伴噰璇婃柇" :footer="null" width="800px" @cancel="closeDiagnosis">
+ <Alert class="mb-4" type="info" show-icon message="鏄剧ず鏈�杩戦噰闆嗘暟鎹拰鍛婅锛�30 绉掑埛鏂颁竴娆★紱閫氫俊绂荤嚎涓嶇瓑鍚屼簬鏈烘鏁呴殰銆�" />
+ <Alert v-if="diagnosisError" class="mb-4" type="error" show-icon :message="diagnosisError" />
+ <template v-else-if="diagnosisDevice">
+ <Descriptions bordered size="small" :column="2">
+ <Descriptions.Item label="璁惧">{{ diagnosisDevice.machineryName || diagnosisRow?.machineryName || '-' }}</Descriptions.Item>
+ <Descriptions.Item label="鍦ㄧ嚎鐘舵��">{{ diagnosisDevice.online == null ? '鏈煡' : diagnosisDevice.online ? '鍦ㄧ嚎' : '绂荤嚎' }}</Descriptions.Item>
+ <Descriptions.Item label="杩愯鐘舵��">{{ diagnosisDevice.stsName || '鏈笂鎶�' }}</Descriptions.Item>
+ <Descriptions.Item label="鏈�杩戦噰闆�">{{ diagnosisDevice.lastCollectTime || '鏆傛棤鏁版嵁' }}</Descriptions.Item>
+ <Descriptions.Item label="鏈秷闄ゅ憡璀�">{{ diagnosisDevice.activeAlarmCount ?? '鏈煡' }}</Descriptions.Item>
+ <Descriptions.Item label="缃戝叧鍘熷鍊�">{{ diagnosisDevice.dataJson || '鏆傛棤鏁版嵁' }}</Descriptions.Item>
+ </Descriptions>
+ <Table class="mt-4" :loading="diagnosisLoading" :data-source="diagnosisAlarms" :pagination="false" row-key="id" size="small"
+ :columns="[{ title: '鍛婅鏃堕棿', dataIndex: 'wmTime' }, { title: '鍛婅鍐呭', dataIndex: 'wmMsg' }, { title: '鐘舵��', dataIndex: 'status' }]" />
+ </template>
+ <Alert v-else-if="!diagnosisLoading" type="warning" show-icon message="璁惧鏈叧鑱旀暟閲囨垨娌℃湁瀵瑰簲閲囬泦鏁版嵁锛屾棤娉曡繘琛岃繙绋嬫暟鎹瘖鏂��" />
+ <Button class="mt-4" :loading="diagnosisLoading" @click="refreshDiagnosis">鍒锋柊</Button>
+ </Modal>
</Page>
</template>
--
Gitblit v1.9.3