From b3f2a8eada63deec3c920de15725491a2c508677 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 18 六月 2025 16:33:52 +0800
Subject: [PATCH] 1、设备TEEP页面新增故障率、故障时间以及加工时间（去除故障时间）字段的展示与筛选查询 2、设备管理页面新增设备与配送小组关联用于配送小组利用率图表页面
---
src/views/eam/equipment/modules/NameplateModal.vue | 191 ++++++++++++++++++++++++++++-------------------
1 files changed, 115 insertions(+), 76 deletions(-)
diff --git a/src/views/eam/equipment/modules/NameplateModal.vue b/src/views/eam/equipment/modules/NameplateModal.vue
index af606bf..f36442b 100644
--- a/src/views/eam/equipment/modules/NameplateModal.vue
+++ b/src/views/eam/equipment/modules/NameplateModal.vue
@@ -6,62 +6,70 @@
@cancel="handleCancel"
:maskClosable="false"
>
- <table id="nameplateTable" border="1" cellpadding="12" cellspacing="0" align="center" width="80%">
- <thead>
- <tr>
- <th colspan="3">璁惧绠＄悊鐗�</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td rowspan="3">
- <QrcodeVue :value="httpUrl"/>
- </td>
- <td>璁惧缂栧彿</td>
- <td>{{ model.equipmentCode }}</td>
- </tr>
+ <div id="nameplateTable">
+ <table border="1" cellpadding="12" cellspacing="0" align="center" width="80%" v-for="item in printedRows"
+ :key="item.id">
+ <thead>
+ <tr>
+ <th colspan="3">璁惧绠＄悊鐗�</th>
+ </tr>
+ </thead>
- <tr>
- <td>璁惧鍚嶇О</td>
- <td>{{ model.equipmentName }}</td>
- </tr>
+ <tbody>
+ <tr>
+ <td rowspan="3" align="center">
+ <div style="height: 80%;width: 50%">
+ <QrcodeVue :value="httpUrl+item.id" :size="50"/>
+ </div>
+ </td>
+ <td>璁惧缂栧彿</td>
+ <td>{{ item.equipmentCode }}</td>
+ </tr>
- <tr>
- <td>璁惧鍨嬪彿</td>
- <td>{{ model.equipmentModel }}</td>
- </tr>
+ <tr>
+ <td>璁惧鍚嶇О</td>
+ <td>{{ item.equipmentName }}</td>
+ </tr>
- <tr>
- <td>璁惧绠＄悊</td>
- <td>浣跨敤杞﹂棿</td>
- <td>{{ model.orgId_dictText }}</td>
- </tr>
+ <tr>
+ <td>璁惧鍨嬪彿</td>
+ <td>{{ item.equipmentModel }}</td>
+ </tr>
- <tr>
- <td rowspan="3">
- <QrcodeVue :value="model.equipmentCode"/>
- </td>
- <td>鍑哄巶缂栧彿</td>
- <td>{{ model.factoryNumber }}</td>
- </tr>
+ <tr>
+ <td>璁惧绠＄悊</td>
+ <td>浣跨敤杞﹂棿</td>
+ <td>{{ item.orgId_dictText }}</td>
+ </tr>
- <tr>
- <td>璁惧绠＄悊鍛�</td>
- <td>{{ model.equipmentManager_dictText }}</td>
- </tr>
+ <tr>
+ <td rowspan="3" align="center">
+ <div style="height: 80%;width: 50%">
+ <QrcodeVue :value="item.equipmentCode" :size="50"/>
+ </div>
+ </td>
+ <td>鍑哄巶缂栧彿</td>
+ <td>{{ item.factoryNumber }}</td>
+ </tr>
- <tr>
- <td>瀹夎浣嶇疆</td>
- <td>{{ model.installationPosition }}</td>
- </tr>
+ <tr>
+ <td>璁惧绠＄悊鍛�</td>
+ <td>{{ item.equipmentManager_dictText }}</td>
+ </tr>
- <tr>
- <td>MES</td>
- <td colspan="2" style="color: #f00;font-weight: bold;letter-spacing: 1px">闈炵鐞嗗憳鍕垮姩姝ら摥鐗�</td>
- </tr>
- </tbody>
- </table>
+ <tr>
+ <td>瀹夎浣嶇疆</td>
+ <td>{{ item.installationPosition }}</td>
+ </tr>
+
+ <tr>
+ <td>MES</td>
+ <td colspan="2" style="color: #f00;font-weight: bold;letter-spacing: 1px">闈炵鐞嗗憳鍕垮姩姝ら摥鐗�</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<template slot="footer">
<a-button @click="handleCancel">鍏抽棴</a-button>
@@ -71,42 +79,73 @@
</template>
<script>
-import QrcodeVue from 'qrcode.vue'
+ import QrcodeVue from 'qrcode.vue'
-export default {
- name: 'NameplateModal',
- components: { QrcodeVue },
- data() {
- return {
- title: '閾墝',
- visible: false,
- model: {},
- httpUrl: ''
- }
- },
- methods: {
- handleCancel() {
- this.visible = false
+ export default {
+ name: 'NameplateModal',
+ components: { QrcodeVue },
+ props: {
+ printedRows: {
+ type: Array
+ }
+ },
+ data() {
+ return {
+ title: '閾墝',
+ visible: false,
+ httpUrl: ''
+ }
+ },
+ methods: {
+ handleCancel() {
+ this.visible = false
+ }
}
}
-}
</script>
<style lang="less" scoped>
-table {
- font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "寰蒋闆呴粦", Arial, sans-serif;
- color: #000;
- text-align: center;
+ /deep/ .ant-modal {
+ height: 75%;
+ overflow: hidden;
- th {
- font-size: 28px;
- letter-spacing: 3px;
- padding: 20px;
+ .ant-modal-content {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+
+ ::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+ }
+
+ .ant-modal-body {
+ flex: 1;
+ overflow: auto;
+ }
+ }
}
- td {
- font-size: 18px;
- width: 33%;
+ table {
+ font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "寰蒋闆呴粦", Arial, sans-serif;
+ color: #000;
+ text-align: center;
+
+ &:not(:last-child) {
+ margin-bottom: 10px;
+ }
+
+ th {
+ font-size: 24px;
+ letter-spacing: 3px;
+ padding: 12px;
+ }
+
+ td {
+ font-size: 14px;
+ width: 33%;
+ padding: 6px;
+ }
}
-}
</style>
\ No newline at end of file
--
Gitblit v1.9.3