From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_iOS/Resources/echartsNew.html | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_iOS/Resources/echartsNew.html b/HDL-ON_iOS/Resources/echartsNew.html
index 0dbcf65..836cbaf 100644
--- a/HDL-ON_iOS/Resources/echartsNew.html
+++ b/HDL-ON_iOS/Resources/echartsNew.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+锘�<!DOCTYPE html>
<html style="height: 100%">
<head>
<meta charset="utf-8">
@@ -12,7 +12,7 @@
<script src="js/dataTool.min.js"></script>
<script src="js/china.js"></script>
<script src="js/world.js"></script>
- <script src="js/20190126"></script>
+ <script src="js/20190126.js"></script>
<script src="js/bmap.min.js"></script>
<script type="text/javascript">
var dom = document.getElementById("container");
@@ -53,16 +53,24 @@
return obj;
}
}
+
/**
* 鏋勫缓鍔ㄦ�佸浘琛�
*/
function loadEcharts(echartJson) {
-
option = preTask(echartJson);
//alert('option:'+ option);
myChart.setOption(option, true);
}
+ /**
+ * 鏋勫缓鍔ㄦ�佸浘琛∟ew
+ */
+ function loadEchartsNew(optionString) {
+ option = optionString;
+ //alert('option:'+ option);
+ myChart.setOption(option, true);
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.8.0