调整报表设计预览

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportManage/Preview.cshtml

@@ -20,41 +20,29 @@
     </div>
 </div>
 
-<script src="/Content/echarts/echarts.js"></script>
-<script src="/Content/echarts/extension/echarts-gl.min.js"></script>
+<script src="~/Content/echarts/echarts.min.js"></script>
+<script src="~/Content/echarts/charts_comm.js"></script>
+
+@*<script src="/Content/echarts/extension/echarts-gl.min.js"></script>
 <script src="/Content/echarts/extension/ecStat.min.js"></script>
 <script src="/Content/echarts/extension/dataTool.min.js"></script>
-
 <script src="/Content/echarts/extension/world.js"></script>
 <script src="/Content/echarts/extension/bmap.min.js"></script>
 <script src="/Content/echarts/extension/simplex.js"></script>
-
-<script src="/Content/echarts/extension/simplex.js"></script>
-
-
-<script src="/Content/static/js/citymap.js"></script>
-<script src="/Content/echarts/charts_comm.js"></script>
+<script src="/Content/static/js/citymap.js"></script>*@
 
 @Html.AppendJsFile("/Views/LR_Content/script/lr-chartshelper.js")
 
 
-
-
-
 <script>
-
     $(document).ready(function () {
         if (request('type') == "preview") {
             $("#moduleURL").html("/LR_ReportModule/ReportManage/Preview?reportId=" + request('reportId') + "&queryJson=" + request('queryJson')).show();
         }
-
-
         $.LoadReport({
             url: top.$.rootUrl + "/LR_ReportModule/ReportManage/GetReportData?reportId=" + request('reportId') + "&queryJson=" + request('queryJson'),
             element: $("#report-pane")
 
         });
-
-
     });
 </script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-chartshelper.js

@@ -1,6 +1,9 @@
 $.LoadReport = function (options) {
-   
-    $.extend(defaults);
+    var defaults = {
+        url: "",
+        element: "",
+    };
+    var options = $.extend(defaults, options);
     $.ajax({
         url: options.url,
         cache: false,
@@ -16,7 +19,7 @@
                 }
             } else if (data.tempStyle == 2) {
                 if (data.chartData.length > 0) {
-                    $echart = $('<div id="echart" style="width: 100%; height: 800px;"></div>');
+                    $echart = $('<div id="echart" style="width: 100%; height: 400px;"></div>');
                     options.element.append($echart);
                     switch (data.chartType) {
                         case 'pie':
@@ -28,7 +31,6 @@
                         case 'line':
                             DrawLine(data.chartData, $echart[0]);
                             break;
-                        
                         default:
                     }
 
@@ -87,8 +89,4 @@
             isAutoHeight: true
         });
     }
-
-
-    
-
 }