前端二维码导出问题修改

src/views/base/bracelet/index.vue

@@ -740,6 +740,7 @@
                     <!--        <img src="" alt="">-->
                 </div>
                 <div class="shboxCodeTemp">手环箱编号：{{ rowObj.shboxCode }}</div>
+                <div class="deviceName">手环箱名称：{{ rowObj.shboxName }}</div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
                 <el-button type="primary" @click="downloadCode"

src/views/base/device/index.vue

@@ -364,7 +364,9 @@
                     <div id="qrcode" class="qrcode" ref="codeItem"></div>
                     <!--        <img src="" alt="">-->
                 </div>
+               
                 <div class="deviceCode">设备编号：{{ rowObj.deviceCode }}</div>
+                <div class="deviceName">设备名称：{{ rowObj.deviceName }}</div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
                 <el-button type="primary" @click="downloadCode"

src/views/components/qrCodeUpload.vue

@@ -62,10 +62,10 @@ export default {
         async handleQrCodeExport() {
             this.codeId = true;
             console.log('checkboxModel', this.checkboxModel)
+            if(this.checkboxModel.length>0){
                 const msg = this.$modal.loading('批量生成中，请稍候...')
                 let that = this
                 try {
-                
                     let captureId = document.getElementsByClassName('captureId')
                     for (let i = 0; i < this.checkboxModel.length; i++) {
                         const element = this.checkboxModel[i]
@@ -87,13 +87,13 @@ export default {
                             colorLight: '#fff',
                         })
                         let canvas = document.createElement('canvas'),
-                        scale = 1.2
+                            scale = 0.9
                         canvas.width = width * scale
                         canvas.height = height * scale
                         canvas.style.width =
-                        (shareContent.clientWidth * scale) / 100 + 'rem'
+                            (shareContent.clientWidth * scale) / 100 + 'px'
                         canvas.style.height =
-                        (shareContent.clientHeight * scale) / 100 + 'rem'
+                            (shareContent.clientHeight * scale) / 100 + 'px'
                         canvas.getContext('2d').scale(scale, scale)
                         let opts = {
                             scale: scale,
@@ -122,7 +122,7 @@ export default {
                                 that.$modal.closeLoading()
                             })
                     }
-                await new Promise((resolve) => setTimeout(resolve, 1000))
+                    await new Promise((resolve) => setTimeout(resolve, 2000))
                     that.packageImages()
                     setTimeout(msg, 1000)
                     that.$modal.closeLoading()
@@ -132,6 +132,10 @@ export default {
                     this.$emit('clearCheck')
                     that.$modal.closeLoading()
                 }
+            }else{
+                this.$modal.msgError("请先选择导出设备");
+            }
+            
         },
         //打包压缩
         packageImages() {