wngur6076 il y a 1 mois
Parent
commit
66307bee54

+ 4 - 4
public/js/dashboard/bars.js

@@ -40,7 +40,7 @@ var DashboardBars = function() {
             // Main variables
             var d3Container = d3.select(element),
                 width = d3Container.node().getBoundingClientRect().width;
-            
+
 
 
             // Construct scales
@@ -201,9 +201,9 @@ var DashboardBars = function() {
             sidebarToggle && sidebarToggle.addEventListener('click', barsResize);
 
             // Resize function
-            // 
+            //
             // Since D3 doesn't support SVG resize by default,
-            // we need to manually specify parts of the graph that need to 
+            // we need to manually specify parts of the graph that need to
             // be updated on window resize
             function barsResize() {
 
@@ -246,7 +246,7 @@ var DashboardBars = function() {
         init: function() {
             _BarChart('#hours-available-bars', 24, 40, true, 'elastic', 1200, 50, '#EC407A', 'hours');
             _BarChart('#goal-bars', 24, 40, true, 'elastic', 1200, 50, '#5C6BC0', 'goal');
-            _BarChart('#members-online', 24, 50, true, 'elastic', 1200, 50, 'rgba(255,255,255,0.5)', 'members');
+            // _BarChart('#members-online', 24, 50, true, 'elastic', 1200, 50, 'rgba(255,255,255,0.5)', 'members');
         }
     }
 }();

+ 1 - 1
public/js/dashboard/sparklines.js

@@ -254,7 +254,7 @@ var DashboardSparklines = function() {
             _chartSparkline('#new-visitors', 'line', 30, 35, 'basis', 750, 2000, '#26A69A');
             _chartSparkline('#new-sessions', 'line', 30, 35, 'basis', 750, 2000, '#FF7043');
             _chartSparkline('#total-online', 'line', 30, 35, 'basis', 750, 2000, '#5C6BC0');
-            _chartSparkline('#server-load', 'area', 30, 50, 'basis', 750, 2000, 'rgba(255,255,255,0.5)');
+            // _chartSparkline('#server-load', 'area', 30, 50, 'basis', 750, 2000, 'rgba(255,255,255,0.5)');
         }
     }
 }();

+ 7 - 7
public/js/main/sparklines.js

@@ -63,7 +63,7 @@ var DashboardSparklines = function() {
 
             // Vertical
             y.domain([0, qty])
-                
+
 
 
             // Construct chart layout
@@ -78,12 +78,12 @@ var DashboardSparklines = function() {
             // Area
             var area = d3.svg.area()
                 .interpolate(interpolation)
-                .x(function(d, i) { 
-                    return x(i); 
+                .x(function(d, i) {
+                    return x(i);
                 })
                 .y0(height)
-                .y1(function(d) { 
-                    return y(d); 
+                .y1(function(d) {
+                    return y(d);
                 });
 
 
@@ -206,9 +206,9 @@ var DashboardSparklines = function() {
             sidebarToggle && sidebarToggle.addEventListener('click', resizeSparklines);
 
             // Resize function
-            // 
+            //
             // Since D3 doesn't support SVG resize by default,
-            // we need to manually specify parts of the graph that need to 
+            // we need to manually specify parts of the graph that need to
             // be updated on window resize
             function resizeSparklines() {
 

+ 1 - 1
resources/views/pages/generic_dash.blade.php

@@ -9,7 +9,7 @@
 
 
     <script src="{{ csset('/js/dashboard/echarts.min.js') }}"></script>
-    {{-- <script src="/js/dashboard/dashboard.js"></script> --}}
+     <script src="{{ csset('/js/dashboard/dashboard.js') }}"></script>
     <script src="{{ csset('/js/dashboard/streamgraph.js') }}"></script>
     <script src="{{ csset('/js/dashboard/sparklines.js') }}"></script>
     <script src="{{ csset('/js/dashboard/lines.js') }}"></script>

+ 1 - 1
resources/views/pages/shop_dash.blade.php

@@ -82,7 +82,7 @@
                                     <div class="font-size-sm opacity-75">교환 요청: {{ $listType1Book['Book'][2]['Page'][0]['C3'] }} 건</div>
                                 </div>
                             </div>
-                            <div id="today-revenue"></div>
+{{--                            <div id="today-revenue"></div>--}}
                         </div>
                     </div>
                     <!--// 취소반품 끝 -->