From 03eca275f9c02c442e7c841f43d8d93fb1c767ec Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期五, 10 三月 2023 15:43:13 +0800
Subject: [PATCH] 读取双脚文件
---
read_com/css/style.css | 2
read_com/index.html | 8 ++-
read_com/js/function.js | 66 ++++++++++++++++++++++++++-------
3 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/read_com/css/style.css b/read_com/css/style.css
index a2f6601..2b6c0ca 100644
--- a/read_com/css/style.css
+++ b/read_com/css/style.css
@@ -559,7 +559,7 @@
border: 1px solid black;
}
-#chart-container {
+#chart-container,#chart-container2 {
position: relative;
height: 1500px;
width: 1500px;
diff --git a/read_com/index.html b/read_com/index.html
index c7198d6..ddec229 100644
--- a/read_com/index.html
+++ b/read_com/index.html
@@ -31,7 +31,8 @@
<button class="last" disabled="disabled">涓婁竴甯�</button>
<button class="next" disabled="disabled">涓嬩竴甯�</button>
<button class="download" disabled="disabled">淇濆瓨鏂囦欢</button>
- <input type="file" id="excel-file">
+ <label>宸﹁剼锛�<input type="file" id="excel-file-left"></label>
+ <label>鍙宠剼锛�<input type="file" id="excel-file-right"></label>
</div>
</div>
@@ -400,13 +401,14 @@
<div id="chart-container"></div>
+
</div>
<script src="./js/3d_data.js"></script>
<script src="./js/echarts.min.js"></script>
<script src="./js/echarts.gl.min.js"></script>
<script src="./js/charts.js"></script>
<script src="./js/region.js"></script>
-<!-- <script src="./js/function.js"></script> -->
-<script src="./js/function2.js"></script>
+<script src="./js/function.js"></script>
+<!-- <script src="./js/function2.js"></script> -->
</body>
</html>
diff --git a/read_com/js/function.js b/read_com/js/function.js
index 3fdca19..1b1b973 100644
--- a/read_com/js/function.js
+++ b/read_com/js/function.js
@@ -776,8 +776,6 @@
data_map2.data[i].value = parseInt(data_end_right[i])
data_map2.data[i].radius = parseInt(data_end_right[i])<10?0:50
}
- heatmapInstance.setData(data_map);
- heatmapInstance2.setData(data_map2);
}else if(arr_arr.length == 0&&arr_arr2.length!=0){
step = 0
step2 == arr_arr2.length-1?arr_arr2.length-1:step2++
@@ -785,17 +783,17 @@
data_map.data[i].value = data_end_left[i]
data_map.data[i].radius = data_end_left[i]<10?0:50
}
- heatmapInstance.setData(data_map);
}else if(arr_arr2.length == 0&&arr_arr.length!=0){
step2 = 0
step == arr_arr.length-1?arr_arr.length-1:step++
for(let i=0;i<data_map2.data?.length;i++){
data_map2.data[i].value = data_end_right[i]
data_map2.data[i].radius = data_end_right[i]<10?0:50
- heatmapInstance2.setData(data_map2);
+
}
}
-
+ heatmapInstance.setData(data_map);
+ heatmapInstance2.setData(data_map2);
for(let i=0;i<arr_arr[step]?.data.length;i++){
for(let x=0;x<arr_arr[step].data[i].length;x++){
let id_end = trueID(i)
@@ -978,21 +976,20 @@
data_map2.data[i].value = data_end_right[i]
data_map2.data[i].radius = data_end_right[i]<10?0:50
}
- heatmapInstance.setData(data_map);
- heatmapInstance2.setData(data_map2);
+
}else if(arr_arr.length == 0&&arr_arr2.length!=0){
for(let i=0;i<data_map.data?.length;i++){
data_map.data[i].value = data_end_left[i]
data_map.data[i].radius = data_end_left[i]<10?0:50
}
- heatmapInstance.setData(data_map);
}else if(arr_arr2.length == 0&&arr_arr.length!=0){
for(let i=0;i<data_map2.data?.length;i++){
data_map2.data[i].value = data_end_right[i]
data_map2.data[i].radius = data_end_right[i]<10?0:50
- heatmapInstance2.setData(data_map2);
}
}
+ heatmapInstance.setData(data_map);
+ heatmapInstance2.setData(data_map2);
for(let i=0;i<arr_arr[step]?.data.length;i++){
for(let x=0;x<arr_arr[step].data[i].length;x++){
let id_end = trueID(i)
@@ -1152,8 +1149,6 @@
data_map2.data[i].value = data_end_right[i]
data_map2.data[i].radius = data_end_right[i]<10?0:50
}
- heatmapInstance.setData(data_map);
- heatmapInstance2.setData(data_map2);
}else if(arr_arr.length == 0&&arr_arr2.length!=0){
step = 0
step2 == arr_arr2.length-1?arr_arr2.length-1:step2++
@@ -1161,16 +1156,16 @@
data_map.data[i].value = data_end_left[i]
data_map.data[i].radius = data_end_left[i]<10?0:50
}
- heatmapInstance.setData(data_map);
}else if(arr_arr2.length == 0&&arr_arr.length!=0){
step2 = 0
step == arr_arr.length-1?arr_arr.length-1:step++
for(let i=0;i<data_map2.data?.length;i++){
data_map2.data[i].value = data_end_right[i]
data_map2.data[i].radius = data_end_right[i]<10?0:50
- heatmapInstance2.setData(data_map2);
}
}
+ heatmapInstance.setData(data_map);
+ heatmapInstance2.setData(data_map2);
for(let i=0;i<arr_arr[step]?.data.length;i++){
for(let x=0;x<arr_arr[step].data[i].length;x++){
let id_end = trueID(i)
@@ -1328,7 +1323,49 @@
//缁檌nput鏍囩缁戝畾change浜嬩欢锛屼竴涓婁紶閫変腑鐨�.xls鏂囦欢灏变細瑙﹀彂璇ュ嚱鏁�
- $('#excel-file').change(function(e) {
+ $('#excel-file-left').change(function(e) {
+ read_file = false
+ arr_arr2 = []
+ var files2 = e.target.files;
+ var fileReader2 = new FileReader();
+ fileReader2.onload = function(ev) {
+ try {
+ var data2 = ev.target.result
+ var workbook2 = XLSX.read(data2, {
+ type: 'binary'
+ }) // 浠ヤ簩杩涘埗娴佹柟寮忚鍙栧緱鍒版暣浠絜xcel琛ㄦ牸瀵硅薄
+ var persons2 = []; // 瀛樺偍鑾峰彇鍒扮殑鏁版嵁
+ } catch (e) {
+ console.log('鏂囦欢绫诲瀷涓嶆纭�',e);
+ return;
+ }
+
+ // 琛ㄦ牸鐨勮〃鏍艰寖鍥达紝鍙敤浜庡垽鏂〃澶存槸鍚︽暟閲忔槸鍚︽纭�
+ var fromTo2 = '';
+ // 閬嶅巻姣忓紶琛ㄨ鍙�
+ for (var sheet2 in workbook2.Sheets) {
+ if (workbook2.Sheets.hasOwnProperty(sheet2)) {
+ fromTo2 = workbook2.Sheets[sheet2]['!ref'];//璇诲彇鐨勫叏閮ㄦ暟鎹� A1:AN203
+ persons2 = persons2.concat(XLSX.utils.sheet_to_json(workbook2.Sheets[sheet2], {header:1,defval:''}));//鍚堝苟鏁版嵁
+ // break; // 濡傛灉鍙彇绗竴寮犺〃锛屽氨鍙栨秷娉ㄩ噴杩欒
+ }
+ }
+ //鍦ㄦ帶鍒跺彴鎵撳嵃鍑烘潵琛ㄦ牸涓殑鏁版嵁
+ for(let i=0;i<persons2.length;i++){
+ persons2[i].length = 112
+ let data_ee = fun(persons2[i],28)
+ arr_arr2.push({"data":data_ee})
+ }
+ $('.last').attr('disabled',false)
+ $('.next').attr('disabled',false)
+ $('.back').attr('disabled',false) //寮�鍚洖鏀惧姛鑳�
+ $('.download').attr('disabled',true)
+ text=persons2;//璁粌鏁版嵁闆唗ext
+ };
+ // 浠ヤ簩杩涘埗鏂瑰紡鎵撳紑鏂囦欢
+ fileReader2.readAsBinaryString(files2[0]);
+ });
+ $('#excel-file-right').change(function(e) {
read_file = false
arr_arr = []
var files = e.target.files;
@@ -1370,3 +1407,4 @@
// 浠ヤ簩杩涘埗鏂瑰紡鎵撳紑鏂囦欢
fileReader.readAsBinaryString(files[0]);
});
+
--
Gitblit v1.9.1