From 6db39c1dfb1dca966983652e4360672cb58a96f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期日, 31 三月 2024 12:40:45 +0800
Subject: [PATCH] 代码更新
---
Albania_Mes-ui/src/views/home/index.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 76e5c23..e8888ea 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -521,10 +521,10 @@
<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;">
<!--鐜荤拑鍥� #81b337-->
<div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:auto auto;position:absolute;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
- {{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
+ +(this.LastQueue.glasswidth==null?0:(this.LastQueue.glasswidth / 25 * 7)) + 'px;height:'
+ + (this.LastQueue.glassheight==null?0:(this.LastQueue.glassheight / 25 * 7)) + 'px;line-height: '
+ + (this.LastQueue.glassheight==null?0:(this.LastQueue.glassheight / 25 * 7)) + 'px;background-color: #93d2f3;text-align: center;'">
+ {{(this.LastQueue.glasswidth==null?0: this.LastQueue.glasswidth) }}*{{ (this.LastQueue.glassheight==null?0:this.LastQueue.glassheight) }}
</div>
</div>
@@ -1071,13 +1071,16 @@
})
},
Change(event) {
+
// 鑾峰彇鍒版枃浠跺す
let fileList = event.target.files;
// 濡傛灉鏁版嵁涓嶄负绌�
if (fileList) {
+
// FileReader鏄竴绉嶅紓姝ユ枃浠惰鍙栨満鍒讹紝缁撳悎input:file鍙互寰堟柟渚跨殑璇诲彇鏈湴鏂囦欢銆�
let reader = new FileReader();
let file = fileList[0]; //鎷垮埌绗竴鏉℃暟鎹�
+
reader.readAsBinaryString(file)// 灏嗘枃浠朵互浜岃繘鍒跺舰寮忚鍏ラ〉闈�
let _this = this //鎶奷ata閲岀殑鏁版嵁璧嬪�肩粰鏂扮殑鍙橀噺
// wb:wordbook 宸ヤ綔琛�
@@ -1088,13 +1091,15 @@
let sheetName = wb.SheetNames[0]; //鏄幏鍙朣heets涓涓�涓猄heet鐨勫悕瀛�
let sheets = wb.Sheets[sheetName];
let dataList2 = JSON.stringify(XLSX.utils.sheet_to_json(sheets));
+ //alert(dataList2);
let dataList3 = (JSON.parse(dataList2));
_this.dataList = dataList3;//璧嬪��
//console.log(dataList2);
- console.log(dataList3);
+ //console.log(dataList3);
})
}
+
},
Add() {
--
Gitblit v1.8.0