Browse Source

fixed: 修复

liuyao 2 weeks ago
parent
commit
45f2eb3ad7

+ 2 - 2
src/main/resources/static/js/demo/echarts-demo.js

@@ -279,8 +279,8 @@ function classificationChart(dateArray) {
                         data: [0, 0, 0, 0, 0, 0, 0],
                         markPoint: {
                             data: [
-                                {name: '年最高', value: 0, xAxis: 0, yAxis: 0,},
-                                {name: '年最低', value: 0, xAxis: 2, yAxis: 0}
+                                {type: 'max', name: '最大值'},
+                                {type: 'min', name: '最小值'}
                             ]
                         },
                         /*markLine: {

+ 10 - 10
src/main/resources/templates/dashboard/dashboard-1.html

@@ -107,11 +107,11 @@
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>核心数据</h5>
-                    <div class="ibox-tools" onclick="page('/datas/data/dataInfoNoPerms?type=核心数据','核心数据','1','核心数据')">
-                        <a href="javascript:void(0)" >
-                            <i class="">更多</i>
-                        </a>
-                    </div>
+<!--                    <div class="ibox-tools" onclick="page('/datas/data/dataInfoNoPerms?type=核心数据','核心数据','1','核心数据')">-->
+<!--                        <a href="javascript:void(0)" >-->
+<!--                            <i class="">更多</i>-->
+<!--                        </a>-->
+<!--                    </div>-->
                 </div>
                 <div class="ibox-content-tables">
                     <div class="echarts" style="overflow: auto;">
@@ -126,11 +126,11 @@
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>重要数据</h5>
-                    <div class="ibox-tools">
-                        <a href="javascript:void(0)" onclick="page('/datas/data/dataInfoNoPerms?type=重要数据','重要数据','1','重要数据')">
-                            <i class="">更多</i>
-                        </a>
-                    </div>
+<!--                    <div class="ibox-tools">-->
+<!--                        <a href="javascript:void(0)" onclick="page('/datas/data/dataInfoNoPerms?type=重要数据','重要数据','1','重要数据')">-->
+<!--                            <i class="">更多</i>-->
+<!--                        </a>-->
+<!--                    </div>-->
                 </div>
                 <div class="ibox-content-tables">
                     <div class="echarts" style="overflow: auto;">