From 725b0706937306c6341e5dddbcc4fd8de7b8f002 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 01 四月 2025 10:13:18 +0800
Subject: [PATCH] 1、mdc模块实现各利用率图表页面功能并与后端进行联调 2、删除用户修改密码时的输入校验 3、删除用户管理冗余查询字段 4、调整DNC模块获取权限配置功能时调用的获取所有用户列表接口(原先接口有分页参数导致获取不完整)

---
 src/views/eam/equipment/modules/NameplateModal.vue |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/equipment/modules/NameplateModal.vue b/src/views/eam/equipment/modules/NameplateModal.vue
index df25901..af606bf 100644
--- a/src/views/eam/equipment/modules/NameplateModal.vue
+++ b/src/views/eam/equipment/modules/NameplateModal.vue
@@ -3,8 +3,7 @@
     title="閾墝"
     :width="750"
     :visible="visible"
-    @ok="handleOk"
-    @cancel="visible=false"
+    @cancel="handleCancel"
     :maskClosable="false"
   >
     <table id="nameplateTable" border="1" cellpadding="12" cellspacing="0" align="center" width="80%">
@@ -17,7 +16,7 @@
       <tbody>
       <tr>
         <td rowspan="3">
-
+          <QrcodeVue :value="httpUrl"/>
         </td>
         <td>璁惧缂栧彿</td>
         <td>{{ model.equipmentCode }}</td>
@@ -35,12 +34,14 @@
 
       <tr>
         <td>璁惧绠$悊</td>
-        <td>浣跨敤閮ㄩ棬</td>
+        <td>浣跨敤杞﹂棿</td>
         <td>{{ model.orgId_dictText }}</td>
       </tr>
 
       <tr>
-        <td rowspan="3">123123123123</td>
+        <td rowspan="3">
+          <QrcodeVue :value="model.equipmentCode"/>
+        </td>
         <td>鍑哄巶缂栧彿</td>
         <td>{{ model.factoryNumber }}</td>
       </tr>
@@ -63,28 +64,29 @@
     </table>
 
     <template slot="footer">
-      <a-button>鍏抽棴</a-button>
+      <a-button @click="handleCancel">鍏抽棴</a-button>
       <a-button type="primary" v-print="'#nameplateTable'">鎵撳嵃</a-button>
     </template>
   </j-modal>
 </template>
 
 <script>
+import QrcodeVue from 'qrcode.vue'
+
 export default {
   name: 'NameplateModal',
-  components: {  },
+  components: { QrcodeVue },
   data() {
     return {
       title: '閾墝',
       visible: false,
-      disableSubmit: false,
       model: {},
-      url: {}
+      httpUrl: ''
     }
   },
   methods: {
-    handleOk() {
-
+    handleCancel() {
+      this.visible = false
     }
   }
 }

--
Gitblit v1.9.3