Browse Source

vnaRawData.html添加图表显示

erp、
RonNurKe 1 year ago
parent
commit
106e59a281
  1. 5
      log.path_IS_UNDEFINED/sys-user.log
  2. 6
      ruoyi-activiti/pom.xml
  3. 36
      ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html
  4. 12
      smart-erp.iml

5
log.path_IS_UNDEFINED/sys-user.log

@ -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] - ====关闭缓存====

6
ruoyi-activiti/pom.xml

@ -62,6 +62,12 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.6</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.ruoyi</groupId>--> <!-- <groupId>com.ruoyi</groupId>-->
<!-- <artifactId>ruoyi-system</artifactId>--> <!-- <artifactId>ruoyi-system</artifactId>-->

36
ruoyi-admin/src/main/resources/templates/rfMsg/vnaRawData/vnaRawData.html

@ -2,6 +2,9 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('rf测试历史结果列表')" /> <th:block th:include="include :: header('rf测试历史结果列表')" />
<script src="
https://cdn.jsdelivr.net/npm/echarts@5.4.2/dist/echarts.min.js
"></script>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
@ -176,10 +179,43 @@
// + "</td></tr>"; // + "</td></tr>";
// } // }
//将动态生成的table添加的事先隐藏的div中. //将动态生成的table添加的事先隐藏的div中.
var chartsInfo ="";
chartsInfo+="<tr><td colspan='"+listValue.length+"'>" +
"<div id='charts"+id+"' style='height: 55vh;width: 90vw'></div>" +
"" +
"</td></tr>"
tableTbody+=chartsInfo
$("#tbody_"+id).html(tableTbody); $("#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);
}
</script> </script>
</body> </body>
</html> </html>

12
smart-erp.iml

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Loading…
Cancel
Save