diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log
deleted file mode 100644
index 98392e9a..00000000
--- a/log.path_IS_UNDEFINED/sys-user.log
+++ /dev/null
@@ -1,5 +0,0 @@
-11:47:36.657 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-15:56:03.944 [schedule-pool-12] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-16:12:42.082 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-16:12:42.088 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:12:42.089 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
diff --git a/ruoyi-activiti/pom.xml b/ruoyi-activiti/pom.xml
index 694e875c..3d8e1309 100644
--- a/ruoyi-activiti/pom.xml
+++ b/ruoyi-activiti/pom.xml
@@ -62,7 +62,13 @@
junit
test
-
+
+ org.mybatis
+ mybatis
+ 3.5.6
+ compile
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html
index 5f6f5466..68bf78c4 100644
--- a/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html
+++ b/ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html
@@ -2,6 +2,9 @@
+
@@ -176,10 +179,43 @@
// + "";
// }
//将动态生成的table添加的事先隐藏的div中.
+ var chartsInfo ="";
+ chartsInfo+="
" +
+ "" +
+ "" +
+ " |
"
+ tableTbody+=chartsInfo
$("#tbody_"+id).html(tableTbody);
+ initEcharts(listKey,listValue,id)
}
})
}
+
+
+ function initEcharts(listKey ,listValue,id){
+ var chartDom = document.getElementById('charts'+id);
+ var myChart = echarts.init(chartDom);
+ var option;
+
+ option = {
+ xAxis: {
+ type: 'category',
+ data: listKey
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: listValue,
+ type: 'line',
+ smooth: true
+ }
+ ]
+ };
+
+ option && myChart.setOption(option);
+ }
\ No newline at end of file
diff --git a/smart-erp.iml b/smart-erp.iml
deleted file mode 100644
index f409c0ea..00000000
--- a/smart-erp.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file