From dab7284a985531920662e24c4bb7db05d30a2d42 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 26 三月 2025 13:45:15 +0800
Subject: [PATCH] 设备台账页面打印设备铭牌功能调试完成
---
package-lock.json | 220 +++++++++++++++++++++++++++++++++++++++++++
src/views/eam/equipment/modules/NameplateModal.vue | 22 ++--
package.json | 3
src/views/eam/equipment/EamEquipmentList.vue | 2
4 files changed, 234 insertions(+), 13 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 8c3e438..50670c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5244,6 +5244,33 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
+ "bpmn-js": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmmirror.com/bpmn-js/-/bpmn-js-7.5.0.tgz",
+ "integrity": "sha512-0ANaE6Bikg1GmkcvO7RK0MQPX+EKYKBc+q7OWk39/16NcCdNZ/4UiRcCr9n0u1VUCIDsSU/jJ79TIZFnV5CNjw==",
+ "requires": {
+ "bpmn-moddle": "^7.0.4",
+ "css.escape": "^1.5.1",
+ "diagram-js": "^6.8.2",
+ "diagram-js-direct-editing": "^1.6.1",
+ "ids": "^1.0.0",
+ "inherits": "^2.0.4",
+ "min-dash": "^3.5.2",
+ "min-dom": "^3.1.3",
+ "object-refs": "^0.3.0",
+ "tiny-svg": "^2.2.2"
+ }
+ },
+ "bpmn-moddle": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmmirror.com/bpmn-moddle/-/bpmn-moddle-7.1.3.tgz",
+ "integrity": "sha512-ZcBfw0NSOdYTSXFKEn7MOXHItz7VfLZTrFYKO8cK6V8ZzGjCcdiLIOiw7Lctw1PJsihhLiZQS8Htj2xKf+NwCg==",
+ "requires": {
+ "min-dash": "^3.5.2",
+ "moddle": "^5.0.2",
+ "moddle-xml": "^9.0.6"
+ }
+ },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6222,6 +6249,11 @@
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
},
+ "component-event": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmmirror.com/component-event/-/component-event-0.1.4.tgz",
+ "integrity": "sha512-GMwOG8MnUHP1l8DZx1ztFO0SJTFnIzZnBDkXAj8RM2ntV2A6ALlDxgbMY1Fvxlg6WPQ+5IM/a6vg4PEYbjg/Rw=="
+ },
"component-indexof": {
"version": "0.0.3",
"resolved": "https://registry.npmmirror.com/component-indexof/-/component-indexof-0.0.3.tgz",
@@ -6931,6 +6963,11 @@
"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
"integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
"dev": true
+ },
+ "css.escape": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmmirror.com/css.escape/-/css.escape-1.5.1.tgz",
+ "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="
},
"cssesc": {
"version": "3.0.0",
@@ -7850,8 +7887,7 @@
"deepmerge": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
- "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
- "dev": true
+ "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
},
"default-gateway": {
"version": "5.0.5",
@@ -8103,6 +8139,36 @@
"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
},
+ "diagram-js": {
+ "version": "6.8.2",
+ "resolved": "https://registry.npmmirror.com/diagram-js/-/diagram-js-6.8.2.tgz",
+ "integrity": "sha512-5EKYHjW2mmGsn9/jSenSkm8cScK5sO9eETBRQNIIzgZjxBDJn6eX964L2d7/vrAW9SeuijGUsztL9+NUinSsNg==",
+ "requires": {
+ "css.escape": "^1.5.1",
+ "didi": "^4.0.0",
+ "hammerjs": "^2.0.1",
+ "inherits": "^2.0.1",
+ "min-dash": "^3.5.0",
+ "min-dom": "^3.1.2",
+ "object-refs": "^0.3.0",
+ "path-intersection": "^2.2.0",
+ "tiny-svg": "^2.2.1"
+ }
+ },
+ "diagram-js-direct-editing": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmmirror.com/diagram-js-direct-editing/-/diagram-js-direct-editing-1.8.0.tgz",
+ "integrity": "sha512-B4Xj+PJfgBjbPEzT3uZQEkZI5xHFB0Izc+7BhDFuHidzrEMzQKZrFGdA3PqfWhReHf3dp+iB6Tt11G9eGNjKMw==",
+ "requires": {
+ "min-dash": "^3.5.2",
+ "min-dom": "^3.1.3"
+ }
+ },
+ "didi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/didi/-/didi-4.0.0.tgz",
+ "integrity": "sha512-AzMElh8mCHOPWPCWfGjoJRla31fMXUT6+287W5ef3IPmtuBcyG9+MkFS7uPP6v3t2Cl086KwWfRB9mESa0OsHQ=="
+ },
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmmirror.com/diff/-/diff-3.5.0.tgz",
@@ -8270,6 +8336,11 @@
"domelementtype": "1"
}
},
+ "domify": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmmirror.com/domify/-/domify-1.4.2.tgz",
+ "integrity": "sha512-m4yreHcUWHBncGVV7U+yQzc12vIlq0jMrtHZ5mW6dQMiL/7skSYNVX9wqKwOtyO9SGCgevrAFEgOCAHmamHTUA=="
+ },
"domutils": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
@@ -8405,6 +8476,29 @@
"version": "1.3.495",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.495.tgz",
"integrity": "sha512-cIPX+4Y3RH/+SoqYd168Rx//CnjsZSdF3XTUhwMf3dwYuTfvWIgmmy6s1ipptGaOA+scH2Vj57Mc9fqp/ho22Q=="
+ },
+ "element-ui": {
+ "version": "2.15.14",
+ "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
+ "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
+ "requires": {
+ "async-validator": "~1.8.1",
+ "babel-helper-vue-jsx-merge-props": "^2.0.0",
+ "deepmerge": "^1.2.0",
+ "normalize-wheel": "^1.0.1",
+ "resize-observer-polyfill": "^1.5.0",
+ "throttle-debounce": "^1.0.1"
+ },
+ "dependencies": {
+ "async-validator": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
+ "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+ "requires": {
+ "babel-runtime": "6.x"
+ }
+ }
+ }
},
"elliptic": {
"version": "6.5.3",
@@ -10118,6 +10212,11 @@
}
}
},
+ "hammerjs": {
+ "version": "2.0.8",
+ "resolved": "https://registry.npmmirror.com/hammerjs/-/hammerjs-2.0.8.tgz",
+ "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="
+ },
"handle-thing": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -10682,6 +10781,11 @@
}
}
},
+ "ids": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmmirror.com/ids/-/ids-1.0.5.tgz",
+ "integrity": "sha512-XQ0yom/4KWTL29sLG+tyuycy7UmeaM/79GRtSJq6IG9cJGIPeBz5kwDCguie3TwxaMNIc3WtPi0cTa1XYHicpw=="
+ },
"ieee754": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -10780,6 +10884,11 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+ },
+ "indexof": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmmirror.com/indexof/-/indexof-0.0.1.tgz",
+ "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
},
"infer-owner": {
"version": "1.0.4",
@@ -11678,6 +11787,11 @@
"resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
},
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
+ },
"lodash.defaults": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -11735,6 +11849,11 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+ },
+ "lodash.merge": {
+ "version": "4.6.2",
+ "resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz",
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
},
"lodash.pick": {
"version": "4.4.0",
@@ -11864,6 +11983,11 @@
"requires": {
"object-visit": "^1.0.0"
}
+ },
+ "matches-selector": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmmirror.com/matches-selector/-/matches-selector-1.2.0.tgz",
+ "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA=="
},
"math-expression-evaluator": {
"version": "1.2.22",
@@ -12198,6 +12322,23 @@
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
},
+ "min-dash": {
+ "version": "3.8.1",
+ "resolved": "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz",
+ "integrity": "sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg=="
+ },
+ "min-dom": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz",
+ "integrity": "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA==",
+ "requires": {
+ "component-event": "^0.1.4",
+ "domify": "^1.3.1",
+ "indexof": "0.0.1",
+ "matches-selector": "^1.2.0",
+ "min-dash": "^3.8.1"
+ }
+ },
"mini-css-extract-plugin": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz",
@@ -12333,6 +12474,24 @@
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
"requires": {
"minimist": "^1.2.5"
+ }
+ },
+ "moddle": {
+ "version": "5.0.4",
+ "resolved": "https://registry.npmmirror.com/moddle/-/moddle-5.0.4.tgz",
+ "integrity": "sha512-Kjb+hjuzO+YlojNGxEUXvdhLYTHTtAABDlDcJTtTcn5MbJF9Zkv4I1Fyvp3Ypmfgg1EfHDZ3PsCQTuML9JD6wg==",
+ "requires": {
+ "min-dash": "^3.0.0"
+ }
+ },
+ "moddle-xml": {
+ "version": "9.0.6",
+ "resolved": "https://registry.npmmirror.com/moddle-xml/-/moddle-xml-9.0.6.tgz",
+ "integrity": "sha512-tl0reHpsY/aKlLGhXeFlQWlYAQHFxTkFqC8tq8jXRYpQSnLVw13T6swMaourLd7EXqHdWsc+5ggsB+fEep6xZQ==",
+ "requires": {
+ "min-dash": "^3.5.2",
+ "moddle": "^5.0.2",
+ "saxen": "^8.1.2"
}
},
"moment": {
@@ -12600,6 +12759,11 @@
"sort-keys": "^1.0.0"
}
},
+ "normalize-wheel": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+ "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
+ },
"npm-run-path": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -12692,6 +12856,11 @@
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
"integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
+ },
+ "object-refs": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmmirror.com/object-refs/-/object-refs-0.3.0.tgz",
+ "integrity": "sha512-eP0ywuoWOaDoiake/6kTJlPJhs+k0qNm4nYRzXLNHj6vh+5M3i9R1epJTdxIPGlhWc4fNRQ7a6XJNCX+/L4FOQ=="
},
"object-visit": {
"version": "1.0.1",
@@ -13093,6 +13262,11 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+ },
+ "path-intersection": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmmirror.com/path-intersection/-/path-intersection-2.2.1.tgz",
+ "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA=="
},
"path-is-absolute": {
"version": "1.0.1",
@@ -14969,6 +15143,11 @@
}
}
},
+ "qrcode.vue": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
+ "integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g=="
+ },
"qs": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -15620,6 +15799,11 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+ },
+ "saxen": {
+ "version": "8.1.2",
+ "resolved": "https://registry.npmmirror.com/saxen/-/saxen-8.1.2.tgz",
+ "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw=="
},
"schema-utils": {
"version": "0.3.0",
@@ -16836,6 +17020,11 @@
"neo-async": "^2.6.0"
}
},
+ "throttle-debounce": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+ "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+ },
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -16879,6 +17068,11 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+ },
+ "tiny-svg": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmmirror.com/tiny-svg/-/tiny-svg-2.2.4.tgz",
+ "integrity": "sha512-NOi39lBknf4UdDEahNkbEAJnzhu1ZcN2j75IS2vLRmIhsfxdZpTChfLKBcN1ShplVmPIXJAIafk6YY5/Aa80lQ=="
},
"tinycolor2": {
"version": "1.6.0",
@@ -18523,6 +18717,17 @@
"errno": "~0.1.7"
}
},
+ "workflow-bpmn-modeler": {
+ "version": "0.2.8",
+ "resolved": "https://registry.npmmirror.com/workflow-bpmn-modeler/-/workflow-bpmn-modeler-0.2.8.tgz",
+ "integrity": "sha512-7Y2+YMx5mFDrpDAMoEK2EMVp5Z4585tYBLuqOxcbB5cdY6Vt1VjE1OBhzcwlFU6MWfpeisMGKbYtlPSHAOzsGg==",
+ "requires": {
+ "bpmn-js": "^7.2.1",
+ "element-ui": "^2.12.0",
+ "vue": "^2.6.10",
+ "xcrud": "0.4.1"
+ }
+ },
"wrap-ansi": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -18568,6 +18773,17 @@
"async-limiter": "~1.0.0"
}
},
+ "xcrud": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmmirror.com/xcrud/-/xcrud-0.4.1.tgz",
+ "integrity": "sha512-aUbZZDARyNhbdBqT5nrHsXkYMM3Bo0i8EFvVgEyq444cxvYkqz4I71XWN2bPVhK/axfX4RawmIHjOQTz2v/apw==",
+ "requires": {
+ "element-ui": "^2.13.2",
+ "lodash.clonedeep": "^4.5.0",
+ "lodash.merge": "^4.6.2",
+ "vue": "^2.6.11"
+ }
+ },
"xe-utils": {
"version": "2.4.8",
"resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-2.4.8.tgz",
diff --git a/package.json b/package.json
index ee25293..760f186 100644
--- a/package.json
+++ b/package.json
@@ -18,13 +18,13 @@
"ant-design-vue": "^1.7.2",
"axios": "^0.18.0",
"china-area-data": "^5.0.1",
- "element-ui": "^2.15.14",
"clipboard": "^2.0.4",
"codemirror": "^5.46.0",
"cron-parser": "^2.10.0",
"dayjs": "^1.8.0",
"dom-align": "1.12.0",
"echarts": "^5.5.0",
+ "element-ui": "^2.15.14",
"enquire.js": "^2.1.6",
"jquery": "^3.7.1",
"js-cookie": "^2.2.0",
@@ -33,6 +33,7 @@
"md5": "^2.2.1",
"nprogress": "^0.2.0",
"qiankun": "^2.5.1",
+ "qrcode.vue": "^1.7.0",
"tinymce": "5.4.1",
"viser-vue": "^2.4.8",
"vue": "^2.6.10",
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index da0b8cd..4073dd0 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -441,7 +441,9 @@
*/
handleOpenNameplateModal(record) {
this.$refs.nameplateModalRef.model = Object.assign({}, record)
+ this.$refs.nameplateModalRef.httpUrl = 'http://www.baidu.com'
this.$refs.nameplateModalRef.visible = true
+
}
}
}
diff --git a/src/views/eam/equipment/modules/NameplateModal.vue b/src/views/eam/equipment/modules/NameplateModal.vue
index df25901..4ed53ff 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>
@@ -40,7 +39,9 @@
</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